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
TimDaubenschuetz
662b837d5d
Merged in AD-1071-naked-domain-is-not-requesting-t (pull request #85 )
...
Write generic function for extracting subdomain and implement troughout whole app
2015-09-30 11:10:05 +02:00
Tim Daubenschütz
90cf137c2c
Integrate error page in app + whitelabel pages
2015-09-29 16:00:58 +02:00
diminator
f64fb73aa6
cc fixes in licenses, collection and details
2015-09-29 15:58:24 +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
Tim Daubenschütz
e1ac3ca4c6
Add multi level ACLs for loan piece detail loan button
2015-09-28 17:39:58 +02:00
diminator
2dda22d848
fix: ikonotv redirect to collection if logged in
2015-09-28 16:57:46 +02:00
diminator
19f94110b7
fix: ikonotv redirect to collection if logged in
2015-09-28 16:57:35 +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
b2cbe2c674
merged
2015-09-25 15:35:36 +02:00
diminator
e6a6c2c2a3
set collapsible default show=true
2015-09-25 15:33:01 +02:00
TimDaubenschuetz
a4975e8137
Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79 )
...
Ad 1036 put contracts in his own menu
2015-09-25 15:29:21 +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
16e7a54b27
add coa_verify route to wallet_routes to avoid crash
2015-09-25 11:51:03 +02:00
Tim Daubenschütz
7d3c14d1cc
Conditional header for + NEW WORK
2015-09-25 10:10:27 +02:00
Tim Daubenschütz
81aa052a8a
Fix load piece method in WalletPieceContainer
2015-09-25 09:53:52 +02:00
Tim Daubenschütz
2a4bc2af89
separate contract settings from account settings
2015-09-23 15:16:46 +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
24b7031c72
Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields
2015-09-22 17:23:37 +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
52903c6982
Fix labels for buttons
2015-09-22 16:49:01 +02:00
Tim Daubenschütz
1320b5c965
cleanup form_loan and contract_agreement_list_actions
2015-09-22 16:45:24 +02:00
Tim Daubenschütz
bd5aa266b1
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-22 13:38:31 +02:00
Tim Daubenschütz
4bbc4afd61
Increase robustness by excluding meta data for pieces that have been loaned before actual launch
2015-09-22 13:37:31 +02:00
Tim Daubenschütz
878a716262
Remove 'learn more' from contract form
2015-09-22 13:20:55 +02:00
diminator
54a1049b48
Merged in AD-1029-add-filter-for-submitted-accepte (pull request #71 )
...
filter for submitted and accepted on ikonotv
2015-09-22 13:14:28 +02:00
diminator
5f98f65842
filter in frontend
2015-09-22 12:20:14 +02:00
Tim Daubenschütz
a8c436c40b
Change detail text in loan process
2015-09-22 11:56:30 +02:00
Tim Daubenschütz
aaa27550af
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
2015-09-22 11:43:53 +02:00
Tim Daubenschütz
a0ff5af62b
Make style changes
2015-09-22 11:33:59 +02:00
Tim Daubenschütz
b0b44718da
Changes to landing page text according to Elisabeth
2015-09-22 10:29:23 +02:00
diminator
b4c7b864fd
check if piece exists in props in wallet details
2015-09-22 09:20:10 +02:00
diminator
904793269b
refactored detail page for wallets
2015-09-21 18:04:15 +02:00
diminator
c837890895
Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields
2015-09-21 16:51:28 +02:00
diminator
a4fe0417c3
refactored and adapted for cyland
2015-09-21 16:47:29 +02:00
Tim Daubenschütz
bd99adf4c9
add componentWillReceiveProps in ikono piece detail again
2015-09-21 16:25:28 +02:00
vrde
865c21557c
Add style for buttons
2015-09-21 16:23:18 +02:00
diminator
fdbae0316f
filter for submitted and accepted on ikonotv
...
MIGRATE AND
./manage.py loaddata whitelabel/fixtures/settings.json
2015-09-21 16:14:39 +02:00
Tim Daubenschütz
6102ed3bb4
update react textarea autosize
2015-09-21 16:10:25 +02:00
Tim Daubenschütz
04e331f4e5
hide additional files when not defined and already loaned to whitelabel customer
2015-09-21 15:57:27 +02:00
Tim Daubenschütz
6c2bb041f9
finalize whitelabel custom fields
2015-09-21 15:46:24 +02:00
Tim Daubenschütz
c756024702
Add whitelabel tailored extra_data forms to piece detail
2015-09-21 15:08:24 +02:00
Tim Daubenschütz
652df66cb3
Fix some issues with smelly code
2015-09-21 14:22:52 +02:00
Tim Daubenschütz
8a6674509c
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
2015-09-21 12:05:53 +02:00
Tim Daubenschütz
c00e003aeb
refactor input textarea to use disabled instead of editable
2015-09-21 12:05:42 +02:00
diminator
92f543490e
buttonlink style
2015-09-21 11:26:36 +02:00
diminator
a8976ca54a
Merge remote-tracking branch 'remotes/origin/AD-996-add-action-buttons-to-piece-detai' into AD-943-add-custom-additional-fields
2015-09-21 11:08:05 +02:00
Tim Daubenschütz
0819724a10
probably fix dispatch.dispatch error + showing wrong piece data bug
2015-09-21 10:57:10 +02:00
diminator
9bfd50e3bc
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
...
Conflicts:
js/components/signup_container.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
2015-09-21 10:21:44 +02:00
Tim Daubenschütz
7482c3f448
add user endpoint to cyland
2015-09-18 15:51:15 +02:00
vrde
7be3c8b469
Add style for signup and login
2015-09-18 15:36:01 +02:00
TimDaubenschuetz
26321571cb
Merged in AD-984-disable-contracts-for-regular-asc (pull request #64 )
...
acl on contract settings
2015-09-18 15:20:08 +02:00
TimDaubenschuetz
4f55c63cf5
Merged in AD-997-prepare-landing-page (pull request #67 )
...
Finish styling for landing page
2015-09-18 14:54:11 +02:00
vrde
03803ca61a
Add active routes as css classes
2015-09-18 14:25:31 +02:00
Tim Daubenschütz
2cbf7d0095
Implement PR Feedback
2015-09-18 14:12:50 +02:00
vrde
b76ffcde73
Finish styling for landing page
2015-09-18 13:46:15 +02:00
diminator
c67c87f17b
WARNING: Based upon D-943, which hasnt been approved/merged yet
...
after AD-943 has been approved, merge it in this branch and do PR
actions + buttons in ikono piece detail
2015-09-18 10:11:35 +02:00
diminator
6146a5f6f4
Merge remote-tracking branch 'remotes/origin/AD-943-add-custom-additional-fields' into AD-996-add-action-buttons-to-piece-detai
2015-09-18 09:55:07 +02:00
diminator
7bccb26d82
acl on contract settings
2015-09-18 09:46:37 +02:00
diminator
ff163df61e
PR update
2015-09-17 14:20:46 +02:00
diminator
63fffc2132
PR comments fix
2015-09-17 11:39:55 +02:00
Tim Daubenschütz
67e0b34640
integrate filtering into IkonoTv and Cyland whitelabel
2015-09-17 10:06:47 +02:00
diminator
5c2ec3ffb0
bug fix signup query
...
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
2015-09-16 23:27:38 +02:00
diminator
08405dd310
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 20:46:52 +02:00
diminator
a85447e94c
bug fix user token on signup/login
2015-09-16 19:00:59 +02:00
Tim Daubenschütz
a36cc9d782
minor correction
2015-09-16 18:32:34 +02:00
Tim Daubenschütz
5c49fd6f14
implement ikonotv landing page according to mockups
2015-09-16 18:31:46 +02:00
diminator
b24d4608dd
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 15:59:07 +02:00
diminator
d6bd4b4ac1
bug fix acl button
...
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
2015-09-16 14:07:13 +02:00
Cevo
dceb087f20
q
...
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-15 14:06:44 +02:00
Cevo
8294016ebb
main.scss edited
2015-09-15 14:04:16 +02:00
Tim Daubenschütz
497a330e1a
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:56:31 +02:00
diminator
430ac59f7b
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:56:11 +02:00
Tim Daubenschütz
891b2eee9e
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:53:29 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
diminator
d4799318a8
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:49:18 +02:00
Tim Daubenschütz
fbbbd1de89
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
...
Fix merge conflicts
Conflicts:
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00
diminator
4ae137ee9e
Merged in AD-924-apply-contractagreements-to-loan- (pull request #57 )
...
Ad 924 apply contractagreements to loan
2015-09-15 13:43:21 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
diminator
b29bf38f13
ikono slides
2015-09-15 13:15:29 +02:00
diminator
9085a2bafe
cyland loanform
2015-09-15 09:12:30 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +02:00
diminator
7fd5516b79
contract, contractagreement migration
...
contractagreement added to loanpiece
2015-09-14 14:16:53 +02:00
Tim Daubenschütz
f42f4a02f8
Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading
...
Resolve merge conflicts with master for easier PR.
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-14 11:14:02 +02:00
diminator
b45c68b2dc
Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-
...
Conflicts:
ownership/serializers.py
2015-09-10 18:54:25 +02:00
diminator
1106cebf98
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-885-convert-roles-to-acls
2015-09-10 18:10:06 +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
82b9b68338
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-10 16:14:02 +02:00
Tim Daubenschütz
b5e5102ea4
replace in keyword with dot notation checking
2015-09-10 14:00:59 +02:00
diminator
1c5b0c7172
only one agreement pending
...
agreement notifications per subdomain (only by whitelabel owner)
2015-09-09 19:29:58 +02:00
Tim Daubenschütz
3307e282e4
remove header title
2015-09-09 17:27:23 +02:00
diminator
ecb51ca5e7
added appendix
2015-09-09 14:15:00 +02:00
diminator
ec2ae39e15
contractagreement with PUT instead of PATCH
2015-09-09 13:53:03 +02:00
Tim Daubenschütz
cb6c4aaf0e
integrate acl into navrouteslist + little refactor on those components
2015-09-08 14:20:06 +02:00
diminator
9409af4e1e
acls on user level for ikonotv
2015-09-08 11:35:34 +02:00
diminator
22aa0139ae
terms and conditions page with accept/deny
...
Needed: copyright societies in backend
2015-09-07 12:03:59 +02:00
diminator
1611a75036
Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col
...
Conflicts:
ownership/serializers.py
2015-09-04 16:48:00 +02:00
Tim Daubenschütz
8e98a7bff7
show overall progress
2015-09-04 14:54:39 +02:00
diminator
4bdab3410e
contractagreementserializer with contract fully expanded
2015-09-04 14:48:10 +02:00
diminator
9b7a69bc20
contract agreement notifications
2015-09-04 11:49:55 +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
Tim Daubenschütz
a8610fa108
change ikono contract
2015-09-02 15:56:27 +02:00
diminator
19726560ba
bitbucket test
2015-09-02 14:39:32 +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
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +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
Tim Daubenschütz
d9f3f2a9d7
rename contract_form to form_contract
2015-08-28 15:55:39 +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
ddfc8b9621
minor fixes
2015-08-28 14:27:02 +02:00
Tim Daubenschütz
8e7aeab3a6
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-08-28 14:08:45 +02:00
Tim Daubenschütz
52ae348e57
dynamic acl for acl_submit
2015-08-28 14:07:29 +02:00
diminator
02e105d2b8
text refactor
2015-08-28 14:00:50 +02:00
diminator
1b730573c7
ikonotv acl_submitted + refactor
2015-08-28 13:58:24 +02:00
diminator
680cc8572f
ikonotv acl_submit
2015-08-28 13:52:58 +02:00
Tim Daubenschütz
d40b671b45
remove ikonotv boilerplate landing page
2015-08-28 12:48:48 +02:00
Tim Daubenschütz
5219dd5cf7
fix bug + enable contract
2015-08-28 12:40:00 +02:00
Tim Daubenschütz
e9d0311f58
custom ikonotv piece page
2015-08-28 12:33:00 +02:00
Tim Daubenschütz
2c26aab8cc
add exception for loaning a piece for ikonotv
2015-08-28 12:20:36 +02:00
Tim Daubenschütz
89f68abcec
add: Loan form for Ikonotv
2015-08-28 12:11:29 +02:00
Tim Daubenschütz
86efb66663
add collapsible appendix to send contract form
2015-08-27 17:33:51 +02:00
Tim Daubenschütz
65148e24de
remove contract form from ikonotv codebase and integrate it into ascribe-core
2015-08-27 14:56:49 +02:00
Tim Daubenschütz
64d23f82df
refactoring of the general architecture
2015-08-27 14:47:33 +02:00
Tim Daubenschütz
9d7a9bd028
add router/navigation integration into whole project
2015-08-27 14:34:15 +02:00
Tim Daubenschütz
b67466d196
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-08-27 14:05:21 +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
Tim Daubenschütz
cd49a9c402
Create generic links in nav using routes
2015-08-25 16:33:26 +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
2d10887e1b
reset cyland additional data form
2015-08-25 10:49:49 +02:00
diminator
15bcd4ba14
average rating
...
cyland bug fix
2015-08-25 10:47:38 +02:00
diminator
1b335e31a4
Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
2015-08-24 16:45:03 +02:00
diminator
70c39794b4
sluice judge + average WIP
2015-08-24 15:33:36 +02:00
Tim Daubenschütz
18634ffe50
fix additional files button bug
2015-08-24 14:16:13 +02:00
diminator
440dcd9785
Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page
2015-08-24 11:36:30 +02:00
diminator
54ec829588
notes in cyland
2015-08-24 11:35:35 +02:00
Tim Daubenschütz
d05662b879
fix PR issues
2015-08-24 11:22:44 +02:00
Tim Daubenschütz
116cb9c2fc
fix disappearing fineuploader in additional data
2015-08-21 14:07:10 +02:00
Tim Daubenschütz
5acce27df2
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
2015-08-21 11:35:00 +02:00
Tim Daubenschütz
09c0451c86
Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
2015-08-21 11:34:47 +02:00
Tim Daubenschütz
3b46dbb9f5
add upload busy function to fineuploader
2015-08-21 11:11:31 +02:00
Tim Daubenschütz
30d57a943f
fix lock form
2015-08-21 11:01:13 +02:00
diminator
433703a470
moved terms
2015-08-21 10:54:57 +02:00
diminator
5c6b753acb
piece loan history
2015-08-20 15:50:30 +02:00
diminator
60db83c626
cyland detail subheader
2015-08-20 14:18:01 +02:00
diminator
ffdb4847db
piece bitcoin id
2015-08-20 14:01:02 +02:00
diminator
7afb3d68b8
Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
2015-08-20 11:32:27 +02:00
diminator
5b2ab6c1e2
bug fix acls
...
otherdata frontend
MIGRATE + loaddate whitelabel
2015-08-20 11:32:11 +02:00
diminator
1f1a8b7761
bug fix piece loan acl
...
bug fix piece edit acl
DOUBLE MIGRATE
2015-08-19 19:12:30 +02:00
Tim Daubenschütz
689796b115
slidecontainer: display lock on progress
2015-08-19 18:23:04 +02:00
Tim Daubenschütz
495f5600af
implement form locking for cyland
2015-08-19 17:39:25 +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
b66fdc332d
Merge branch 'tmp2' into AD-613-cyland-white-label-page
2015-08-19 16:46:07 +02:00
Tim Daubenschütz
d5e8181855
make cyland submission stateful
2015-08-19 16:02:10 +02:00
Tim Daubenschütz
0b4b3fa727
fix slideContainer broken functionality
2015-08-19 15:54:13 +02:00
Tim Daubenschütz
8a88f978c6
add start_from parameter to slide container
2015-08-19 15:30:48 +02:00
diminator
b1703b6284
cyland landing
2015-08-19 14:48:22 +02:00
Tim Daubenschütz
406cee5bd3
refactor breadcrumbs to attributes
2015-08-19 14:11:03 +02:00
diminator
6d8d318e8d
Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra
2015-08-19 13:58:55 +02:00
Tim Daubenschütz
6dab66ec61
restructure cyland submit button
2015-08-19 13:56:43 +02:00
diminator
b7e81fb0dd
cyland landing
2015-08-19 13:54:45 +02:00
diminator
188cca4834
ikono register
2015-08-19 09:31:36 +02:00
diminator
e933b334c2
loan contract form
2015-08-18 16:24:36 +02:00
Tim Daubenschütz
e88612704f
cyland loan form for accordion list
2015-08-18 13:39:06 +02:00
Tim Daubenschütz
ad8be7e34a
separate pre-sending form submission functionality
2015-08-18 13:15:22 +02:00
diminator
e862fa39a9
Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
web/settings.py
2015-08-18 12:36:38 +02:00
diminator
8ae7edaa1c
ikonotv initial setup
2015-08-18 12:08:01 +02:00
Tim Daubenschütz
eb54e6fff6
refresh piece list after loan
2015-08-18 10:53:50 +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
0be3e249bb
breadcrumb style fix
2015-08-17 13:46:04 +02:00
diminator
cf86e352e4
slide breadcrumbs
2015-08-17 12:18:40 +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
Tim Daubenschütz
88423e6757
fix scroll overflow
2015-08-12 16:26:24 +02:00
Tim Daubenschütz
0cf5815f42
add functionality to make a forwarded process slide container
2015-08-12 16:11:15 +02:00
Tim Daubenschütz
d3bf990ca5
adjust props
2015-08-12 14:40:44 +02:00
Tim Daubenschütz
1620437c86
add defaultValue to inputdate
2015-08-12 13:53:17 +02:00
Tim Daubenschütz
d5dc164810
boilerplate for loan process
2015-08-12 13:34:41 +02:00
diminator
c25de71b4b
notes and bug fixes
2015-08-12 13:21:05 +02:00
Tim Daubenschütz
9630d043db
first slide cyland archive submission
2015-08-12 09:52:51 +02:00
Tim Daubenschütz
8612f73e96
separate cc register form
2015-08-12 09:30:24 +02:00
Tim Daubenschütz
ac45283968
first iteration: whitelabel pages depending on customer
2015-08-11 17:40:26 +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
Tim Daubenschütz
f086bece71
add boilerplate code for wallet application
2015-08-11 13:10:15 +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