Tim Daubenschütz
|
fbc9ae1fe7
|
Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
Conflicts:
js/third_party/notifications.js
|
2015-10-06 16:50:51 +02:00 |
|
Tim Daubenschütz
|
000719e14d
|
Move third party actions/stores to separate dispatcher
|
2015-10-06 16:47:59 +02:00 |
|
Tim Daubenschütz
|
8ba6f11dfe
|
Fix AccordionListTable item links and missing location propagation
|
2015-10-01 14:54:56 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|
Tim Daubenschütz
|
17fd470e6b
|
Upgrade react-router-bootstrap
|
2015-10-01 14:00:56 +02:00 |
|
Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +02:00 |
|
Tim Daubenschütz
|
8cd4377a58
|
Change links in app to new react-router@1.0rc1 syntax
|
2015-09-30 18:30:50 +02:00 |
|
Tim Daubenschütz
|
eebe936023
|
Change: router rendering, router location, route configs, notFound routes, redirect routes,
|
2015-09-30 17:09:46 +02:00 |
|
TimDaubenschuetz
|
ad7f088081
|
Merged in AD-605-when-an-edition-or-piece-is-not-d (pull request #90)
Ad 605 when an edition or piece is not d
|
2015-09-30 11:15:22 +02:00 |
|
Tim Daubenschütz
|
90cf137c2c
|
Integrate error page in app + whitelabel pages
|
2015-09-29 16:00:58 +02:00 |
|
Tim Daubenschütz
|
d50d0faabe
|
Write generic function for extracting subdomain and implement troughout whole app
|
2015-09-29 14:58:56 +02:00 |
|
diminator
|
db1ef91965
|
bug fix filterParams=null on sluice
|
2015-09-28 16:29:50 +02:00 |
|
Tim Daubenschütz
|
cfab59c027
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-25 16:23:22 +02:00 |
|
Tim Daubenschütz
|
f2b4c23bd7
|
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
js/routes.js
|
2015-09-25 16:23:01 +02:00 |
|
diminator
|
e6a6c2c2a3
|
set collapsible default show=true
|
2015-09-25 15:33:01 +02:00 |
|
Tim Daubenschütz
|
e20e378533
|
Remove PrizeDashboard from codebase, add coa_verify to prize app
|
2015-09-25 11:54:12 +02:00 |
|
Tim Daubenschütz
|
90d6ec20f6
|
Revert "Revert "acls on 3 levels""
This reverts commit c02d1ea3ac.
|
2015-09-22 17:38:25 +02:00 |
|
Tim Daubenschütz
|
c02d1ea3ac
|
Revert "acls on 3 levels"
This reverts commit f1bc400faf.
|
2015-09-22 17:29:07 +02:00 |
|
diminator
|
f1bc400faf
|
acls on 3 levels
whitelabel
user
piece
the higher on the list, the more power (whitelabel overrides user and piece)
|
2015-09-22 17:23:19 +02:00 |
|
Tim Daubenschütz
|
c00e003aeb
|
refactor input textarea to use disabled instead of editable
|
2015-09-21 12:05:42 +02:00 |
|
vrde
|
b76ffcde73
|
Finish styling for landing page
|
2015-09-18 13:46:15 +02:00 |
|
diminator
|
6013303bd6
|
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
|
2015-09-10 17:45:51 +02:00 |
|
Tim Daubenschütz
|
b5e5102ea4
|
replace in keyword with dot notation checking
|
2015-09-10 14:00:59 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
diminator
|
92971a9f62
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
sass/ascribe_accordion_list.scss
|
2015-09-02 10:50:33 +02:00 |
|
Tim Daubenschütz
|
b5b1e36109
|
nested collapsible paragraphs
|
2015-09-01 14:00:06 +02:00 |
|
Tim Daubenschütz
|
56cdcdb5c6
|
Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-01 13:30:04 +02:00 |
|
vrde
|
d2adc7a388
|
Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss
Conflicts:
sass/main.scss
|
2015-08-31 19:09:09 +02:00 |
|
Tim Daubenschütz
|
7e1815bb1f
|
refactor account settings into multiple files
|
2015-08-31 16:36:24 +02:00 |
|
vrde
|
3f34fc680e
|
Get rid of ascribe-btn-gray
|
2015-08-28 16:40:54 +02:00 |
|
diminator
|
762c3f89b9
|
Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col
|
2015-08-28 15:25:43 +02:00 |
|
diminator
|
d3cc6a5007
|
request actions first cut
|
2015-08-28 15:24:32 +02:00 |
|
Tim Daubenschütz
|
9d7a9bd028
|
add router/navigation integration into whole project
|
2015-08-27 14:34:15 +02:00 |
|
diminator
|
bc28f3d8f5
|
loan request actions for multiple actions
|
2015-08-27 13:43:26 +02:00 |
|
diminator
|
8406272187
|
review comments
|
2015-08-27 10:18:50 +02:00 |
|
diminator
|
33d5480f2f
|
review comments
|
2015-08-27 10:10:39 +02:00 |
|
diminator
|
1f95ae3a41
|
show email of user registered on select
|
2015-08-27 09:21:48 +02:00 |
|
diminator
|
65571848fb
|
ordering by selected
|
2015-08-26 17:41:36 +02:00 |
|
diminator
|
19c882f3b4
|
reveal name on shortlist in list
|
2015-08-26 16:55:12 +02:00 |
|
diminator
|
ab97fa420c
|
loan request with moment
shortlist on accordeonlist OK
|
2015-08-26 15:46:27 +02:00 |
|
diminator
|
bcd6400a78
|
bug fix promises and notifications
|
2015-08-26 14:50:16 +02:00 |
|
diminator
|
e3b85bf808
|
removed loadPieceList from shortlist in detail
|
2015-08-26 12:51:25 +02:00 |
|
diminator
|
ad7e86108e
|
prize piece serializer with DB rating stats
|
2015-08-26 12:33:06 +02:00 |
|
diminator
|
b2fed6426f
|
loan request up till accept
|
2015-08-26 09:50:38 +02:00 |
|
diminator
|
5fcee39ed3
|
shortlisting enabled up till loan request
|
2015-08-25 15:19:10 +02:00 |
|
diminator
|
a07b4cc35c
|
reset cyland register form
"no votes yet" for judge
|
2015-08-25 11:11:22 +02:00 |
|
diminator
|
15bcd4ba14
|
average rating
cyland bug fix
|
2015-08-25 10:47:38 +02:00 |
|
diminator
|
70c39794b4
|
sluice judge + average WIP
|
2015-08-24 15:33:36 +02:00 |
|
Tim Daubenschütz
|
d05662b879
|
fix PR issues
|
2015-08-24 11:22:44 +02:00 |
|
diminator
|
ffdb4847db
|
piece bitcoin id
|
2015-08-20 14:01:02 +02:00 |
|
diminator
|
7e9e187c18
|
bug fix breadcrumbs
bug fix sluice landing page
bug fix sluice register_piece
bug fix ownershiphistory pending
|
2015-08-19 17:18:32 +02:00 |
|
diminator
|
f77f1d1d5d
|
cyland submit button and form WIP
cyland footers
|
2015-08-18 09:42:28 +02:00 |
|
diminator
|
fc82c866fb
|
cyland refactor
whitelabel + cyland app
|
2015-08-17 20:52:36 +02:00 |
|
diminator
|
12dde0458c
|
Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page
|
2015-08-17 09:56:55 +02:00 |
|
diminator
|
5b2e90a03c
|
sorting acl and styling
|
2015-08-14 15:38:30 +02:00 |
|
diminator
|
e843e2fa52
|
order by rating
|
2015-08-14 14:58:23 +02:00 |
|
diminator
|
247cca3ee2
|
piece rating + navigation OK
close prize
|
2015-08-13 13:28:09 +02:00 |
|
Tim Daubenschütz
|
81ff4641c7
|
fix prev and next button for navigationheader
|
2015-08-12 17:30:39 +02:00 |
|
diminator
|
7c0e2312a1
|
revert piece navigation and bug fix in navigation serializer
|
2015-08-12 17:09:48 +02:00 |
|
diminator
|
97c298e304
|
piece navigation prev next WIP
|
2015-08-12 16:47:16 +02:00 |
|
diminator
|
c25de71b4b
|
notes and bug fixes
|
2015-08-12 13:21:05 +02:00 |
|
diminator
|
22727c2703
|
refactored piece container and detail
|
2015-08-11 17:12:12 +02:00 |
|
Tim Daubenschütz
|
eb6e3cb20a
|
finishing boilerplate for wallet app + prefixing whitelabel specific files
|
2015-08-11 14:47:28 +02:00 |
|
diminator
|
d5efd79d14
|
refactored accordion list item:
accordion-list-item
accordion-list-item-piece < accordion-list-item
accordion-list-item-wallet < accordion-list-item-piece
accordion-list-item-prize < accordion-list-item-piece
|
2015-08-11 12:06:01 +02:00 |
|
diminator
|
f5b34222a9
|
remove ratings from master branch
|
2015-08-10 17:45:49 +02:00 |
|
diminator
|
a6e257bd27
|
Merged in AD-545-add-rating-support-for-the-pieces (pull request #36)
Ad 545 add rating support for the pieces
|
2015-08-10 17:08:11 +02:00 |
|
diminator
|
bdeef598eb
|
Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r'
Conflicts:
js/components/settings_container.js
|
2015-08-10 17:07:15 +02:00 |
|
diminator
|
36ca2004ff
|
rating create and fetch
|
2015-08-10 17:02:10 +02:00 |
|
diminator
|
a27415eb86
|
jury dashboard + rating WIP
|
2015-08-10 15:23:13 +02:00 |
|
Tim Daubenschütz
|
3ff401904b
|
fix submit to prize button
|
2015-08-10 10:10:43 +02:00 |
|
Tim Daubenschütz
|
a55efc1692
|
fix large buttons on sluice landing page
|
2015-08-10 09:39:32 +02:00 |
|
Tim Daubenschütz
|
b70eb23dc0
|
refactor action panel: mostly css and layout
|
2015-08-10 09:22:39 +02:00 |
|
diminator
|
8275a8d626
|
prize: permission refactor
email: moved cc folders
bug fix email: encode email in queryparams
|
2015-08-07 15:10:39 +02:00 |
|
Tim Daubenschütz
|
3afb036f24
|
rename apiUrls to ApiUrls
|
2015-08-07 15:08:02 +02:00 |
|
Tim Daubenschütz
|
f73001a5b8
|
remove form property header and replace class name definition
|
2015-08-07 14:31:37 +02:00 |
|
diminator
|
67f70357a5
|
jury invitation, revoke, resend
MIGRATE!
|
2015-08-07 11:27:44 +02:00 |
|
diminator
|
99ea0e1af8
|
action-panel WIP
|
2015-08-06 13:56:37 +02:00 |
|
diminator
|
5108ca2fc6
|
merge conflict
|
2015-08-05 14:50:44 +02:00 |
|
diminator
|
bd52bc8136
|
Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
js/components/whitelabel/prize/constants/api_urls.js
|
2015-08-05 14:50:17 +02:00 |
|
diminator
|
6ab5bec8d3
|
WIP prize settings for admin
|
2015-08-05 14:40:26 +02:00 |
|
diminator
|
5ce549e533
|
disable submit prize with ACL
|
2015-08-04 13:15:38 +02:00 |
|
vrde
|
ac4a98fa16
|
Redirect from landing to collection if user is logged in
|
2015-08-03 11:32:52 +02:00 |
|
Tim Daubenschütz
|
84703779a9
|
rename prize endpoint to prizes
|
2015-07-31 13:44:57 +02:00 |
|
diminator
|
f5732661bd
|
subdomain-dependent localhashing
|
2015-07-29 15:22:30 +02:00 |
|
Tim Daubenschütz
|
1a1ba8bbb1
|
add ellipsis again
|
2015-07-27 18:19:55 +02:00 |
|
vrde
|
b536af29be
|
Logout is now a route
|
2015-07-17 15:02:44 +02:00 |
|
Tim Daubenschütz
|
d56286a472
|
fix scaling of button for sluice on mobile
|
2015-07-16 13:54:02 +02:00 |
|
vrde
|
28d6052d6f
|
Fix typo
|
2015-07-15 19:01:36 +02:00 |
|
diminator
|
44f0b36e73
|
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
|
2015-07-15 14:51:36 +02:00 |
|
diminator
|
049a5a6fcb
|
prize extra data form detail
|
2015-07-15 14:36:25 +02:00 |
|
Tim Daubenschütz
|
81aeb478b7
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 14:06:03 +02:00 |
|
diminator
|
9ba30f0938
|
acl_unshare false for prize
piece prize details
num_submissions
|
2015-07-15 12:23:02 +02:00 |
|
Tim Daubenschütz
|
92644c285e
|
change wording for landing page
|
2015-07-15 11:54:20 +02:00 |
|
Tim Daubenschütz
|
cc0301f5e5
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 11:43:10 +02:00 |
|
diminator
|
a86befb2d7
|
fixed signup serializer, acl_editions_view
piece container whitelabel
|
2015-07-15 11:39:08 +02:00 |
|
Tim Daubenschütz
|
e3e8f088c7
|
add licences for cc
|
2015-07-15 11:28:53 +02:00 |
|
Tim Daubenschütz
|
ea871f3d1d
|
acl for delete
|
2015-07-15 01:46:37 +02:00 |
|
Tim Daubenschütz
|
f1e90795f0
|
specify editions generically by whitelabel
|
2015-07-15 01:40:48 +02:00 |
|
Tim Daubenschütz
|
ebfd4339ab
|
change prize submission to new backend route
|
2015-07-15 00:57:31 +02:00 |
|
Tim Daubenschütz
|
56389a542e
|
override api_urls and fix wording
|
2015-07-15 00:14:17 +02:00 |
|
vrde
|
6405d08673
|
Merge branch 'AD-499-custom-api-url-mapping' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-14 22:42:10 +02:00 |
|
vrde
|
c5fd8aa28f
|
Add custom url mapping
|
2015-07-14 21:15:10 +02:00 |
|
Tim Daubenschütz
|
d2b2bdf7d5
|
add custom submit button to piece list
|
2015-07-14 21:13:15 +02:00 |
|
Tim Daubenschütz
|
b52d000ac7
|
made add work conditional
|
2015-07-14 21:06:11 +02:00 |
|
Tim Daubenschütz
|
18898b6f8a
|
start working on register piece for price - WIP
|
2015-07-14 20:07:55 +02:00 |
|
Tim Daubenschütz
|
e833dbf61a
|
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-14 18:56:00 +02:00 |
|
Tim Daubenschütz
|
97f8d416af
|
styling again
|
2015-07-14 18:55:34 +02:00 |
|
Tim Daubenschütz
|
e49b920318
|
more styling on the landing page
|
2015-07-14 18:34:46 +02:00 |
|
vrde
|
ce46f7c886
|
Fix bug in whitelabel landing page
|
2015-07-14 18:00:34 +02:00 |
|
Tim Daubenschütz
|
ff64734545
|
styling
|
2015-07-14 17:41:57 +02:00 |
|
vrde
|
695a195e55
|
Replace history for slider
|
2015-07-14 12:32:18 +02:00 |
|
Tim Daubenschütz
|
b238fbeeb1
|
fix piece list error
|
2015-07-13 23:29:07 +02:00 |
|
vrde
|
19f82b2bbd
|
work on register piece for for prize
|
2015-07-13 22:58:53 +02:00 |
|
vrde
|
5ea6095f6a
|
Redirect if no artworks are found
|
2015-07-13 22:05:16 +02:00 |
|
vrde
|
1aa2863b80
|
Declutter piece list if no pieces are found
|
2015-07-13 21:51:05 +02:00 |
|
vrde
|
69b3c8e3dd
|
Fix handler on sign up
|
2015-07-13 21:09:39 +02:00 |
|
vrde
|
7aea6669c9
|
Refactor login and signup
|
2015-07-13 20:47:43 +02:00 |
|
vrde
|
4af174dffb
|
Work on signup/login
|
2015-07-13 19:53:16 +02:00 |
|
vrde
|
8f07abc39b
|
WIP
|
2015-07-13 16:34:26 +02:00 |
|
vrde
|
3fbe60692e
|
Working on landing
|
2015-07-13 14:29:20 +02:00 |
|
vrde
|
33d599b923
|
Start to work on custom landing
|
2015-07-10 18:45:26 +02:00 |
|
vrde
|
df5295dffd
|
Cleanup and reorder routes
|
2015-07-10 18:21:42 +02:00 |
|
vrde
|
d5ea4e515d
|
Use distinct routers for different apps
|
2015-07-10 16:43:35 +02:00 |
|