ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-16 01:55:07 +01:00
Code Issues Releases Wiki Activity
1,921 Commits 115 Branches 0 Tags 13 MiB
8b3060d613
Commit Graph

1650 Commits

Author SHA1 Message Date
Tim Daubenschütz
280f3bc73a Add input filter for specific file extensions to react fineuploader 2015-09-15 10:15:56 +02:00
diminator
9085a2bafe cyland loanform 2015-09-15 09:12:30 +02:00
diminator
0ce298879b fixed tests 
refactored contractagreement actions
 2015-09-14 17:53:50 +02:00
Tim Daubenschütz
24f0d84fbc finalize contract settings layout 2015-09-14 17:38:26 +02:00
Tim Daubenschütz
209d141939 extend fileClassToUpload functionality and implement it in contract settings 2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff add fileclassToUpload to react fineuploader 2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec make contract creation implicit 2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544 rename fineuploader's submitKey method to submitFile 2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings 
Conflicts:
	js/components/ascribe_forms/property.js
 2015-09-14 14:23:36 +02:00
diminator
7fd5516b79 contract, contractagreement migration 
contractagreement added to loanpiece
 2015-09-14 14:16:53 +02:00
Tim Daubenschütz
e087e9f332 PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js 2015-09-14 11:36:24 +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
Tim Daubenschütz
20001d5c20 Merge remote-tracking branch 'origin/master' into AD-931-allow-to-reset-form-after-submit 2015-09-14 10:51:18 +02:00
Tim Daubenschütz
356483f9ca Fix bug for resetting non-native HTML inputs in form 2015-09-14 10:49:45 +02:00
diminator
ef22707680 create public agreement 2015-09-11 18:23:31 +02:00
Tim Daubenschütz
c8ece4c532 refactor contract creation form 2015-09-11 10:11:07 +02:00
diminator
23eb3a7fd9 Fetch contractagreements, order them and filter by accepted or pending 
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 20:20:42 +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
Tim Daubenschütz
535b2904b6 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-887-list-contracts-in-settings 2015-09-10 17:59:46 +02:00
diminator
01ebee87ec form loan edit 2015-09-10 17:46:50 +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
4101cd70ed minor fix 2015-09-10 16:20:14 +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
12e7c2c898 add download button to contract list 2015-09-10 15:47:27 +02:00
Tim Daubenschütz
b5e5102ea4 replace in keyword with dot notation checking 2015-09-10 14:00:59 +02:00
Tim Daubenschütz
5588f766c1 add reset functionality for InputDate and LoanForm 2015-09-10 13:24:32 +02:00
Tim Daubenschütz
9297f804fe reset method for property collapsible 2015-09-10 11:35:39 +02:00
Tim Daubenschütz
1d184973f4 reset method for react s3 fineuploader 2015-09-10 11:22:42 +02:00
Tim Daubenschütz
c3b71b5398 WIP: make fineuploader an input 2015-09-10 10:51:47 +02:00
Tim Daubenschütz
b4756be60a replace anonymous filter functions with util functions 2015-09-10 09:54:02 +02:00
Tim Daubenschütz
1fabea93ff refactor file size calculation 2015-09-10 09:30:04 +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
Tim Daubenschütz
2ba27d3847 add documentation for exception 2015-09-09 17:21:55 +02:00
Tim Daubenschütz
384e0e3e6f only show progress bar if files are greater than 10MB 2015-09-09 16:32:08 +02:00
Tim Daubenschütz
2cc4284118 minor cleanup 2015-09-09 16:22:20 +02:00
Tim Daubenschütz
8255c8dc6f style progress bar 2015-09-09 15:15:54 +02:00
diminator
ecb51ca5e7 added appendix 2015-09-09 14:15:00 +02:00
Tim Daubenschütz
801227cfee remove react-progress-bar for react-bootstrap progressbar 2015-09-09 14:11:52 +02:00
diminator
ec2ae39e15 contractagreement with PUT instead of PATCH 2015-09-09 13:53:03 +02:00
diminator
17f7be9257 contract list make public 2015-09-09 11:11:16 +02:00
diminator
a87879dd3d contractSerializer with readonly for update 2015-09-08 15:06:19 +02:00
diminator
2a92b38a9a Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-08 14:43:38 +02:00
diminator
e892becc50 contract settings update 2015-09-08 14:43:06 +02:00
diminator
9ad713f781 merge 456 2015-09-08 14:42:51 +02:00
Tim Daubenschütz
f850176b7c add documentation for nav routes links 2015-09-08 14:26:56 +02:00
Tim Daubenschütz
cb6c4aaf0e integrate acl into navrouteslist + little refactor on those components 2015-09-08 14:20:06 +02:00
Cevo
3e1b362cc0 remove debugged 204 no response comes as error, handled gracefully 2015-09-08 13:08:49 +02:00
Cevo
5b0cbc92ad create refresh added, conflicts resolved 2015-09-08 11:57:20 +02:00
Cevo
a8fce698a6 createcontract refresh added 2015-09-08 11:53:09 +02:00
Tim Daubenschütz
ba2ebe81fd code restructuring 2015-09-08 11:44:05 +02:00
diminator
9409af4e1e acls on user level for ikonotv 2015-09-08 11:35:34 +02:00
Tim Daubenschütz
2c1ad6dc46 fix bug in contract settings and expand actionpanel functionality 2015-09-08 11:19:11 +02:00
diminator
06ce603c44 list only is_active 2015-09-08 11:01:43 +02:00
Tim Daubenschütz
38b7dcd79f finalize contract styles 2015-09-08 10:15:26 +02:00
Tim Daubenschütz
2c9370e555 restyle contract settings list 2015-09-08 10:03:20 +02:00
Tim Daubenschütz
3197fad1b6 fix bug in progress method 2015-09-07 17:49:38 +02:00
Cevo
86306fc089 console.log remove from requests.js 2015-09-07 16:36:31 +02:00
Cevo
66cd4a1d7b git ignore removed 2015-09-07 16:33:21 +02:00
Cevo
632c04149d tabs inserted in jsx 2015-09-07 15:43:44 +02:00
Cevo
6b9bf03941 tabs inserted in jsx 2015-09-07 15:08:01 +02:00
Cevo
1dba9196e7 tabs inserted in jsx 2015-09-07 14:30:45 +02:00
diminator
22aa0139ae terms and conditions page with accept/deny 
Needed: copyright societies in backend
 2015-09-07 12:03:59 +02:00
Tim Daubenschütz
1c4bf9915c refactor setState actions to fix overriding values bug 2015-09-07 12:02:01 +02:00
Cevo
501d7ac7c0 now committing the remove contract 2015-09-07 11:38:23 +02:00
Cevo
ae21686f26 slash added to route 2015-09-07 10:23:39 +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
bf6b5e00a6 update fineuploader 2015-09-04 16:39:57 +02:00
Tim Daubenschütz
bb6deb3f68 refactor setStatus method of fineuploader 2015-09-04 15:13:38 +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
8a49006592 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-04 11:51:17 +02:00
diminator
9b7a69bc20 contract agreement notifications 2015-09-04 11:49:55 +02:00
Cevo
f312c94eeb if there is anything else 2015-09-04 11:31:53 +02:00
Cevo
eb4994b05e add more 2015-09-03 18:25:12 +02:00
Tim Daubenschütz
ac28ef4ee0 remove raven 2015-09-04 18:15:42 +02:00
Tim Daubenschütz
4374235c1b use log global again 2015-09-03 17:55:15 +02:00
Tim Daubenschütz
3b61ac5c6a remove mangle and fix bug in react-fineuploader 2015-09-04 17:31:58 +02:00
Tim Daubenschütz
ec1def31fb Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' into AD-914-fix-sentry-logging 2015-09-04 17:16:54 +02:00
Tim Daubenschütz
7dae23a265 remove fastly 2015-09-04 17:05:17 +02:00
Tim Daubenschütz
bc0ac05d2d Merge branch 'master' of bitbucket.org:ascribe/onion 2015-09-04 16:25:47 +02:00
diminator
6a1f58fdb4 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-03 17:37:40 +02:00
diminator
73ee0753c1 refactored notifications per detail 2015-09-03 17:25:22 +02:00
Cevo
57c4076c1e pushing the contract u[pdate on client side 2015-09-03 17:19:29 +02:00
Tim Daubenschütz
8a75e94413 fix bug 2015-09-04 16:24:29 +02:00
Tim Daubenschütz
85efa4b416 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-04 15:55:07 +02:00
Tim Daubenschütz
a4a0e9d149 catch error in onComplete for fineuploader 2015-09-04 15:54:49 +02:00
vrde
4a4d4ac737 Add support for long file names 2015-09-03 16:19:02 +02:00
Cevo
5265332901 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-03 15:53:22 +02:00
Cevo
d2f8b658af contract listing being done 2015-09-03 15:53:02 +02:00
diminator
9334251fd3 notifications on piece details (www, ikono, cyland) and edition details 2015-09-03 15:17:12 +02:00
diminator
edcd8e57a4 notification app 
notification refactor in onion - split by piece/edition
 2015-09-03 14:15:00 +02:00
vrde
2f5c70eceb Remove unused ButtonSubmitOrClose and styles 2015-09-02 17:36:01 +02:00
diminator
7f39c62130 create contract and agreement 2015-09-02 16:34:43 +02:00
diminator
2450dce642 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra 2015-09-02 16:34:28 +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
Cevo
6555c02f23 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-02 14:03:02 +02:00
Cevo
aa3c188509 contract list add 2015-09-02 14:02:23 +02:00
diminator
07ce180ff7 contract form POST 2015-09-02 13:57:41 +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
diminator
bf5d1de635 update notification on request action 2015-09-01 19:14:48 +02:00
diminator
71c438ee59 close notifications dropdown after click 2015-09-01 18:38:24 +02:00
diminator
7919521578 refactor of notifications 2015-09-01 18:11:18 +02:00
Tim Daubenschütz
9d7b5cbe2a advance create contract form 2015-09-01 16:57:12 +02:00
diminator
bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +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
TimDaubenschuetz
c33976ad37 Merged in AD-875-slidecontainer-add-vendor-prefixe (pull request #41) 
add vendor prefixes for slide container
 2015-09-01 09:49:57 +02:00
Tim Daubenschütz
f83300e597 incorporate pr feedback 2015-09-01 09:34:29 +02:00
Tim Daubenschütz
af7938dbc7 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 09:29:58 +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
96fdb598f7 change api endpoints to contractblobs 2015-08-31 17:29:43 +02:00
Tim Daubenschütz
55948bc9ba integrate unfilteredPieceListCount into piece list store and list 2015-08-31 16:57:16 +02:00
Tim Daubenschütz
7e1815bb1f refactor account settings into multiple files 2015-08-31 16:36:24 +02:00
Tim Daubenschütz
ea52927eec rename uploading routes 2015-08-31 11:33:44 +02:00
Tim Daubenschütz
90f89e4498 other loan contract to contract renaming 2015-08-31 11:05:33 +02:00
vrde
3f34fc680e Get rid of ascribe-btn-gray 2015-08-28 16:40:54 +02:00
diminator
9dddf0bf21 Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col 2015-08-28 16:25:57 +02:00
Tim Daubenschütz
dd20afff90 rename LoanContract to Contract 2015-08-28 16:18:10 +02:00
Tim Daubenschütz
d9f3f2a9d7 rename contract_form to form_contract 2015-08-28 15:55:39 +02:00
Tim Daubenschütz
02ed21fef5 fix nav links on logged out user 2015-08-28 15:31:12 +02:00
Tim Daubenschütz
848321a3f3 fix nav links on logged out user 2015-08-28 15:29:30 +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
8eec5d8f38 Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra 2015-08-28 12:44:02 +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
9a9aa68ca9 fix lazy evalutaion of loan form 2015-08-28 11:13:28 +02:00
Tim Daubenschütz
8e5c04140f add vendor prefixes for slide container 2015-08-27 18:11:47 +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
Tim Daubenschütz
4b2f48bc50 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-08-27 13:48:33 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
diminator
79106dd106 loan request + answer complete 2015-08-27 11:38:21 +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
144b823777 Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an 2015-08-27 09:22:08 +02:00
diminator
1f95ae3a41 show email of user registered on select 2015-08-27 09:21:48 +02:00
Tim Daubenschütz
8cc1f91a3a Merge branch 'AD-661-due-1208-implement-jury-rating-an' of bitbucket.org:ascribe/onion into AD-661-due-1208-implement-jury-rating-an 2015-08-26 18:05:22 +02:00
Tim Daubenschütz
b4f68f23e8 update react-datepicker DO NPM INSTALL 2015-08-26 18:03:58 +02:00
Tim Daubenschütz
6028812128 adjust loan form to disable dates 2015-08-26 18:01:50 +02:00
diminator
65571848fb ordering by selected 2015-08-26 17:41:36 +02:00
Tim Daubenschütz
e473b4c779 fix invariant violation 2015-08-26 17:32:42 +02:00
diminator
19c882f3b4 reveal name on shortlist in list 2015-08-26 16:55:12 +02:00
diminator
c64aae332d Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an 2015-08-26 16:54:41 +02:00
Tim Daubenschütz
6808c7c228 remove loan button from piece detail page 2015-08-26 16:44:24 +02:00
diminator
6530149971 problem with loanForm 2015-08-26 16:34:41 +02:00
diminator
ab97fa420c loan request with moment 
shortlist on accordeonlist OK
 2015-08-26 15:46:27 +02:00
Tim Daubenschütz
1f8c8a7d9e (hopefully) fix auto-fill bug for safari/chrome 2015-08-26 15:41:59 +02:00
Tim Daubenschütz
88b525f352 change link in accordionlist item dependent on domain 2015-08-26 15:18:05 +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
Tim Daubenschütz
f54d7bb85c fix validation method 2015-08-24 13:57:02 +02:00
Tim Daubenschütz
07ae8cc9bb Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 13:13:08 +02:00
Tim Daubenschütz
c14ab4dcd4 fix fineuploader notification bug 2015-08-24 13:12:59 +02:00
diminator
b76c752966 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an 
Conflicts:
	ownership/test/test_api.py
	piece/models.py
 2015-08-24 12:20:54 +02:00
diminator
411b7cb010 increase otherdata limit to 50MB 2015-08-24 12:11:07 +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
96fe1c69c6 Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 11:22:54 +02:00
Tim Daubenschütz
d05662b879 fix PR issues 2015-08-24 11:22:44 +02:00
diminator
0be6b7f118 bug fix loadPiece 2015-08-24 11:01:42 +02:00
diminator
3b27238adf request form on piece level 
bug fix cyland piece endpoint
bug fix otherDataUploader editable
 2015-08-24 10:48:40 +02:00
diminator
7a09b863b5 switch between request action and acl buttons on piece detail page 2015-08-21 16:49:04 +02:00
diminator
8b6c5e6e0f username boolean 2015-08-21 16:39:06 +02:00
diminator
33cd23d11e getlangtext 2015-08-21 16:38:18 +02:00
diminator
f564ce7959 Merge remote-tracking branch 'origin/AD-613-cyland-white-label-page' into AD-613-cyland-white-label-page 2015-08-21 16:24:22 +02:00
diminator
ea9fb306c4 add request action loan to piece 2015-08-21 16:22:08 +02:00
Tim Daubenschütz
4dcd66c05b Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-21 16:14:58 +02:00
Tim Daubenschütz
284919f3db fix bug 2015-08-21 16:14:15 +02:00
diminator
edec430109 public and private note in edition and piece 
connection in frontend
 2015-08-21 15:04:38 +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
e0b2f352df fix locked fields 2015-08-21 11:29:57 +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
Tim Daubenschütz
5d4762f942 fix lock functionality bug 2015-08-20 11:03:00 +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
12de8139c2 separate breadcrumb functionality into own component 2015-08-19 18:36:23 +02:00
Tim Daubenschütz
689796b115 slidecontainer: display lock on progress 2015-08-19 18:23:04 +02:00
Tim Daubenschütz
215f251845 enable overriding of editable prop for property 2015-08-19 18:09:37 +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
Tim Daubenschütz
862cd7986c add lock/disabled functionality to form 2015-08-19 17:06:14 +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
Tim Daubenschütz
6a0a1b1e35 Merge branch 'AD-777-fineuploader-needs-to-support-mul' into AD-613-cyland-white-label-page 2015-08-18 10:45:57 +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
d24b325062 bug fix loadPiece 2015-08-13 14:16:44 +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
Tim Daubenschütz
95e0b256b6 Merge branch 'master' into AD-613-cyland-white-label-page 
Conflicts:
	.gitignore
 2015-08-11 11:50:09 +02:00
Tim Daubenschütz
0cf63fa6c8 fix synchronization of files of fineuploader 2015-08-11 11:39:58 +02:00
Tim Daubenschütz
58c0ce4c3f fix wording for multiple uploads 2015-08-11 10:03:12 +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
9408370239 Merged in AD-707-add-https-to-embed (pull request #33) 
Add "s" to http
 2015-08-10 17:03:16 +02:00
diminator
36ca2004ff rating create and fetch 2015-08-10 17:02:10 +02:00
Tim Daubenschütz
8ff2dea4df refactor: acl buttons message functionality 2015-08-10 15:57:20 +02:00
diminator
a27415eb86 jury dashboard + rating WIP 2015-08-10 15:23:13 +02:00
Tim Daubenschütz
d12dc4dab2 remove deprecated collapsible mixin 2015-08-10 14:42:38 +02:00
Tim Daubenschütz
f6be11d530 remove alert mixin 2015-08-10 14:22:25 +02:00
Tim Daubenschütz
ada07e707e switch action wording 2015-08-10 14:20:26 +02:00
Tim Daubenschütz
5be771f6ac add inline property to form 2015-08-10 14:15:32 +02:00
Tim Daubenschütz
4b8987dc7c add urls 2015-08-10 14:07:23 +02:00
Tim Daubenschütz
3137583b0f adjust button choose logic 2015-08-10 14:06:01 +02:00
Tim Daubenschütz
e589925c9d delete form mixin 2015-08-10 14:05:35 +02:00
Tim Daubenschütz
d968f02b59 refactor request action form 2015-08-10 11:57:38 +02:00
Tim Daubenschütz
c8dc4fa12d adjust action panel usage for applications 2015-08-10 11:11:28 +02:00
diminator
d1edf898fc api tokens with panel instead of property 
Conflicts:
	js/components/settings_container.js
 2015-08-10 11:08:18 +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
36aa5b1891 api tokens with panel instead of property 2015-08-07 15:54:36 +02:00
diminator
4627a860b2 Merge remote-tracking branch 'remotes/origin/master' into AD-544-automatically-share-registered-pr 2015-08-07 15:17:12 +02:00
Tim Daubenschütz
5cef512c0d remove react flow type 2015-08-07 15:10:47 +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
be62ece14e Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 2015-08-07 14:54:11 +02:00
TimDaubenschuetz
a2b366a7bf Merged AD-391-add-filter-functions-to-pieces-an into master 2015-08-07 14:51:07 +02:00
Tim Daubenschütz
b56ae0e145 fix requestActions requests 2015-08-07 14:50:34 +02:00
Tim Daubenschütz
f73001a5b8 remove form property header and replace class name definition 2015-08-07 14:31:37 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
Tim Daubenschütz
8f9c699b69 Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 
Conflicts:
	js/components/ascribe_buttons/submit_to_prize_button.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
 2015-08-07 14:10:05 +02:00
Tim Daubenschütz
15c0ae6430 Merge branch 'AD-391-add-filter-functions-to-pieces-an' 2015-08-07 13:24:36 +02:00
Tim Daubenschütz
6fc7ac8b63 remove unneccesary action for edition list actions 2015-08-07 13:21:54 +02:00
Tim Daubenschütz
bbb0bb15b6 add documentation 2015-08-07 13:20:31 +02:00
Tim Daubenschütz
ada7df25a7 fix minor consistence bug 2015-08-07 13:18:33 +02:00
Tim Daubenschütz
b5448b0acb wording 2015-08-07 13:09:57 +02:00
Tim Daubenschütz
192f776bd8 Filter open edition tables correctly 2015-08-07 13:05:50 +02:00
diminator
aba30acb02 Merge remote-tracking branch 'origin/master' 2015-08-07 11:28:17 +02:00
diminator
67f70357a5 jury invitation, revoke, resend 
MIGRATE!
 2015-08-07 11:27:44 +02:00
Tim Daubenschütz
06f86b2a0e first cut: test queue inheritance 2015-08-06 18:03:13 +02:00
Tim Daubenschütz
158f91f3f2 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-08-06 15:15:19 +02:00
Tim Daubenschütz
dfbc7b75fe fix loan form 2015-08-06 15:14:50 +02:00
diminator
2d4f307dcb Merge remote-tracking branch 'origin/AD-544-automatically-share-registered-pr' into AD-544-automatically-share-registered-pr 2015-08-06 13:56:57 +02:00
diminator
99ea0e1af8 action-panel WIP 2015-08-06 13:56:37 +02:00
Tim Daubenschütz
e227db1b3b fix create editions for filter widget 2015-08-06 13:43:53 +02:00
Tim Daubenschütz
ee97e600ef fix bug in piece list filter widget 2015-08-06 13:15:52 +02:00
Tim Daubenschütz
04c406a288 minor changes 2015-08-06 10:58:09 +02:00
Tim Daubenschütz
3624ae874f refactor form_remove_piece_from_collection 2015-08-06 10:42:12 +02:00
Tim Daubenschütz
0eb10c6c4b refactor form_remove_editions_from_collection 2015-08-06 10:31:51 +02:00
Tim Daubenschütz
68f4decaad remove FormPropertyHeader 2015-08-06 10:23:01 +02:00
Tim Daubenschütz
a3bfda186a refactor form_delete_piece 2015-08-06 10:15:02 +02:00
Tim Daubenschütz
dbd0e14a64 add DELETE http support to form 2015-08-06 10:09:25 +02:00
diminator
18c7e2bc93 invite user with token and signup without email validation 2015-08-05 19:22:58 +02:00
Tim Daubenschütz
d66549478f WIP: Refactor delete editions form 2015-08-05 18:14:49 +02:00
Tim Daubenschütz
1ae77d5157 remove close button from modals 2015-08-05 18:00:44 +02:00
Tim Daubenschütz
4c88f88d56 first cut porting and using new react-bootstrap version 2015-08-05 17:32:35 +02:00
Tim Daubenschütz
f3e378f221 update react-bootstrap first cut 2015-08-05 16:49:25 +02:00
diminator
792325f71d acl_create_editions 2015-08-05 16:02:48 +02:00
diminator
36356dd5c5 Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 2015-08-05 14:52:18 +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
Tim Daubenschütz
f134ca29d6 fix property reset function 2015-08-05 13:42:53 +02:00
Tim Daubenschütz
23bbbb792a pr review: clear: operators precedence 2015-08-04 16:58:36 +02:00
Tim Daubenschütz
c4e372e72f pr review: fix indentation 2015-08-04 16:18:14 +02:00
Tim Daubenschütz
f31d576583 add styling for piece list filter widget 2015-08-04 15:58:39 +02:00
Tim Daubenschütz
fb10d9329b add labels for filter params 2015-08-04 15:39:20 +02:00
Tim Daubenschütz
fc0bccbff3 add filterBy to edition list action|store 2015-08-04 15:06:02 +02:00
Tim Daubenschütz
6f1c6a0168 add 'filter active' functionality to piece list filter widget 2015-08-04 13:28:44 +02:00
diminator
5ce549e533 disable submit prize with ACL 2015-08-04 13:15:38 +02:00
Tim Daubenschütz
17b991e06b adjust store calls to fetch list to new interface 2015-08-04 11:48:12 +02:00
diminator
2258968856 Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 
Conflicts:
	.gitignore
 2015-08-04 11:45:20 +02:00
Tim Daubenschütz
e3b46c69a5 implement piece list filter widget functionality 2015-08-04 11:39:33 +02:00
Tim Daubenschütz
7ee296c963 static styling of filter widget 2015-08-04 10:06:02 +02:00
Tim Daubenschütz
ae8bc674d2 add logging for complete as well 2015-08-03 18:50:14 +02:00
Tim Daubenschütz
4bf21e1afd Merge branch 'master' of bitbucket.org:ascribe/onion 2015-08-03 18:38:33 +02:00
Tim Daubenschütz
92d699a831 add chunk logging 2015-08-03 18:35:56 +02:00
Tim Daubenschütz
30d84af7fb add more logs 2015-08-03 18:02:21 +02:00
vrde
c31acd4317 Merge branch 'AD-700-redirect-landing-to-collection-if-logged-in' 2015-08-03 13:53:30 +02:00
vrde
72821001b7 Merge branch 'AD-601-in-piece_detail-longer-titles-are' 
Conflicts:
	.gitignore
 2015-08-03 13:44:53 +02:00
Tim Daubenschütz
5d92716726 add logging in fineuploader 2015-08-03 11:45:44 +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
6bf33f541a remove raven 2015-08-03 11:26:30 +02:00
Tim Daubenschütz
765969c5b3 log file list to sentry on error 2015-08-03 11:09:31 +02:00
Tim Daubenschütz
63b763dd25 remove onComplete call if there has been an error with fineuploader 2015-08-03 10:54:34 +02:00
Tim Daubenschütz
c9042a0934 delete password of user when submitting to sentry 2015-08-03 10:41:51 +02:00
Tim Daubenschütz
2c7c78af67 Merge remote-tracking branch 'origin/master' into AD-699-rename-prize-endpoint-to-prizes 2015-07-31 13:45:53 +02:00
Tim Daubenschütz
84703779a9 rename prize endpoint to prizes 2015-07-31 13:44:57 +02:00
diminator
950e63b6d0 content copy for hash_locally 2015-07-30 14:04:39 +02:00
Tim Daubenschütz
52f10f178f Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are 2015-07-30 11:49:48 +02:00
Tim Daubenschütz
79bef1e0a9 add ellipsis functionality to detail property 2015-07-30 11:48:47 +02:00
vrde
91078bfdd9 Fix comment 2015-07-29 18:24:54 +02:00
vrde
8f52d8bf87 Comment the solution 2015-07-29 18:19:04 +02:00
Tim Daubenschütz
4f2aa430f2 refactor ascribe table and add prizes dashboard boilerplate code 2015-07-29 18:03:49 +02:00
vrde
ef61470b5f First iteration 2015-07-29 18:00:49 +02:00
Tim Daubenschütz
277cd98549 fix cyland logo 2015-07-29 16:08:30 +02:00
Tim Daubenschütz
f0d6eaa950 update gitignore 2015-07-29 15:57:48 +02:00
diminator
bab29d6ffa Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do' 
Conflicts:
	js/components/ascribe_forms/form_loan.js
 2015-07-29 15:55:16 +02:00
Tim Daubenschütz
9ebc489c78 refresh piece list correctly after piece with edition creation 2015-07-29 15:24:30 +02:00
diminator
f5732661bd subdomain-dependent localhashing 2015-07-29 15:22:30 +02:00
Tim Daubenschütz
b0d3213816 add flushLoanContract logic 2015-07-29 15:03:15 +02:00
diminator
f4ccd417fc loan form styling 2015-07-29 14:49:36 +02:00
Tim Daubenschütz
8da71d0229 make term components unique in loan form 2015-07-29 14:46:33 +02:00
diminator
deebacd063 Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22) 
Ad 601 in piece_detail longer titles are
 2015-07-29 14:16:40 +02:00
Tim Daubenschütz
cb5b381e0b fix scaling issue for slides container 2015-07-29 11:23:25 +02:00
Tim Daubenschütz
76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do' 
Conflicts:
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_slides_container/slides_container.js
	js/components/ascribe_uploader/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-07-29 09:35:14 +02:00
Tim Daubenschütz
390e5d51e9 advanced error logging for register piece 2015-07-28 17:45:05 +02:00
TimDaubenschuetz
78049b448e Merged in AD-598-register-action-switches (pull request #14) 
Ad 598 register action switches
 2015-07-28 16:36:57 +02:00
Tim Daubenschütz
8868842817 react fineuploader remove multiple property 2015-07-28 16:30:50 +02:00
Tim Daubenschütz
0f658b9a71 add error reason to fineuploader raven 2015-07-28 16:24:18 +02:00
Tim Daubenschütz
4c99632616 remove form console.log 2015-07-28 15:49:08 +02:00
Tim Daubenschütz
bd28450619 add documentation for input checkbox 2015-07-28 15:46:55 +02:00
Tim Daubenschütz
bb11bbc6e4 Fix all instances of input checkbox 2015-07-28 15:33:47 +02:00
diminator
3142e00ea5 Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 12:13:40 +02:00
diminator
232991b566 removed signup terms default false 2015-07-28 12:13:19 +02:00
diminator
3031fcdbe1 Merge remote-tracking branch 'remotes/origin/AD-606-login-returns-this-field-may-not-' into AD-435-hash-locally-for-when-a-artist-do 
Conflicts:
	js/components/ascribe_forms/input_checkbox.js
	js/components/ascribe_forms/property.js
 2015-07-28 12:11:48 +02:00
Tim Daubenschütz
09ce4de29d refactor input checkbox 2015-07-28 12:03:45 +02:00
diminator
c5072164eb Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 11:32:31 +02:00
diminator
2cece3ce33 inputcheckbox defaultvalue WIP 2015-07-28 11:32:16 +02:00
vrde
5d1b7d3294 Merge branch 'AD-622-google-analytics-tracking' 2015-07-28 11:15:35 +02:00
Tim Daubenschütz
b530018dda remove unused components 2015-07-28 11:06:19 +02:00
Tim Daubenschütz
212038ae43 cosmetic changes + fix react warning for map fn 2015-07-28 10:09:54 +02:00
Tim Daubenschütz
828d24044b Integrate hashing setting in uploader 2015-07-28 10:05:31 +02:00
diminator
60ad72aabb Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 09:50:29 +02:00
diminator
6d71c20ea8 inputcheckbox for loan 
settings container with profile update
 2015-07-28 09:49:53 +02:00
Tim Daubenschütz
275f6c839e minor fixes 2015-07-27 18:24:21 +02:00
vrde
17ec6f34e0 Fix code after review 2015-07-27 18:21:20 +02:00
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +02:00
vrde
c2601f242f Comment events not yet implemented 2015-07-27 18:08:12 +02:00
vrde
4d93e076df Add third party modules to handle tracking without polluting the code 2015-07-27 18:06:02 +02:00
Tim Daubenschütz
21fc2cee28 convert cancel hashing action to anchor 2015-07-27 16:37:54 +02:00
Tim Daubenschütz
332366ec15 Integrate dropzone inactivity into user flow 2015-07-27 16:00:54 +02:00
Tim Daubenschütz
d52a89cd3e only display hashing toggle on user permissions 2015-07-27 15:34:45 +02:00
Tim Daubenschütz
a05698efc1 fix app crashing bug when transferring an edition 2015-07-27 14:59:49 +02:00
diminator
b105e77009 Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do 2015-07-27 14:39:42 +02:00
diminator
1504a5b20d inputcheckbox and terms checking 2015-07-27 14:39:19 +02:00
Tim Daubenschütz
2274efaed7 implement hashing toggle 2015-07-27 14:21:26 +02:00
Tim Daubenschütz
8f6b858f0a make form submittable after the files blob was successfully created 2015-07-27 09:33:31 +02:00
Tim Daubenschütz
5da577caca use standard promises instead of fineuploaders' 2015-07-27 09:28:50 +02:00
Tim Daubenschütz
d71111b6f1 fix wording for file drag and drop dialog 2015-07-27 09:23:01 +02:00
Tim Daubenschütz
d6968b40b5 Fix wording and add localization 2015-07-24 17:29:30 +02:00
Tim Daubenschütz
e53a45822b simplified error handling in progress routine 2015-07-24 16:29:57 +02:00
Tim Daubenschütz
a7a36589a7 Add abort hashing functionality 2015-07-24 16:17:27 +02:00
Tim Daubenschütz
38751ae612 add user interface feedback 2015-07-24 15:13:20 +02:00
Tim Daubenschütz
494ab209ca implement hashing progress functionality 2015-07-24 14:39:04 +02:00
Tim Daubenschütz
9dc811febb forgot one Q import 2015-07-24 13:49:16 +02:00
Tim Daubenschütz
a199fd08c1 replace es6-promise with Q 2015-07-24 13:44:28 +02:00
diminator
861f633476 concurrent upload of chunks 
fixed spool tests for bitcoin and blobs
 2015-07-23 18:14:17 +02:00
Tim Daubenschütz
01b34ec1fb add getLangText for reactfineuploader 2015-07-23 17:17:48 +02:00
Tim Daubenschütz
2f24ad8352 implement feedback for hashing functionalitxy 2015-07-23 17:05:52 +02:00
Tim Daubenschütz
4ec8f6b718 add file hashing functionality to react fine uploader 2015-07-23 16:47:32 +02:00
Tim Daubenschütz
80861813e9 documente and implement routine in react fine uploader 2015-07-23 15:57:25 +02:00
Tim Daubenschütz
33a179cfe2 converte computeHashOfFile to a promise based solution 2015-07-23 15:38:52 +02:00
diminator
5c3d57ff3a Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19) 
Ad 604 non owner cannot download pdfs an
 2015-07-23 15:33:54 +02:00
Tim Daubenschütz
71fcdff874 made react fine uploader error message more generic 2015-07-23 15:27:14 +02:00
diminator
c415e97e42 allow download for non-renderable files 2015-07-23 15:18:58 +02:00
vrde
21f3b4504e Fix height for audio and video embed 2015-07-23 15:04:02 +02:00
TimDaubenschuetz
90b0047eb8 Merged in AD-610-on-switching-edition-detail-coa-d (pull request #17) 
Flush store after unmounting coa component to force refresh on new user request
 2015-07-23 14:35:09 +02:00
diminator
0cc48a73e4 moved hashing to file_utils 2015-07-23 13:03:30 +02:00
diminator
1a1f14e04c add JS file hashing to fineuploader 
didnt instantiate it because needs UX
 2015-07-23 11:45:25 +02:00
Tim Daubenschütz
c2d76034af add flowtype functionality for piece list 2015-07-22 17:20:40 +02:00
diminator
1b7b344605 solves the issue for textarea_toggable 
couldnt reproduce login
 2015-07-22 17:12:46 +02:00
diminator
e060d39486 solves the issue for textarea_toggable 
couldnt reproduce login
 2015-07-22 17:12:00 +02:00
Tim Daubenschütz
370a3b43dd add font rendering logic 2015-07-22 16:12:52 +02:00
Tim Daubenschütz
c58227b443 first cut flowtype boilerplate 2015-07-22 15:59:05 +02:00
TimDaubenschuetz
61077de3de Merged in AD-591-finetune-build-process (pull request #13) 
Ad 591 finetune build process
 2015-07-22 15:19:35 +02:00
TimDaubenschuetz
da7be7bb06 Merged in AD-589-Form-Cancel-doesnt-reset (pull request #16) 
Form cancel doesnt reset property/form
 2015-07-22 15:19:25 +02:00
Tim Daubenschütz
c3a1b9b626 Flush store after unmounting coa component to force refresh on new user request 2015-07-22 15:16:56 +02:00
diminator
742c1bc6e0 coa fixes and bug report 2015-07-22 00:30:51 +02:00
diminator
6c3868616b Merged in AD-572-make-thumbnails-way-smaller (pull request #15) 
Ad 572 make thumbnails way smaller
 2015-07-21 21:14:52 +02:00
diminator
62bdf97a2f cleanup of SPOOL old code 2015-07-21 21:13:46 +02:00
vrde
3ceadeda32 Fix trailing slash on footer 2015-07-21 17:57:11 +02:00
diminator
35051bf67b fixed media player text 2015-07-21 17:29:58 +02:00
diminator
af59c70364 fixed media player text 2015-07-21 16:59:19 +02:00
Tim Daubenschütz
550a2d9e58 Property: 
- update initialValue when Property has been save successfully to enable consecutive cancel + save actions

Private Note:

- Made private note non-required
 2015-07-21 16:23:50 +02:00
diminator
e7d85d6eb8 updated thumbnails: 
- support multiformat
- runs in celery (way faster registration!)

updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code

!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
 2015-07-21 15:52:58 +02:00
Tim Daubenschütz
7daef3b082 small fix and more comments 2015-07-21 15:30:00 +02:00
Tim Daubenschütz
20a83167ab slide container works now with browser history 2015-07-21 15:05:42 +02:00
Tim Daubenschütz
23e6cc17b2 make dropzone inactive when user is logged out 2015-07-21 11:09:21 +02:00
diminator
11fb512763 s3 urls anonymous and refactored 
zencoder with multiple thumbnail sizes
 2015-07-20 18:59:32 +02:00
Tim Daubenschütz
68dba56a21 refactor some scss variables and include css source map only in debug 2015-07-20 10:52:12 +02:00
Tim Daubenschütz
44f63dace1 fix coa issue and hopefully header bug 2015-07-17 23:28:59 +02:00
Tim Daubenschütz
efd329c44c patch logout behavior 2015-07-17 18:53:04 +02:00
Tim Daubenschütz
28f875e90c Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-17 18:33:33 +02:00
Alberto Granzotto
658a4b3372 Merged in AD-586-implement-logging-for-whole-app (pull request #12) 
Ad 586 implement logging for whole app
 2015-07-17 18:25:56 +02:00
Tim Daubenschütz
55f00ea0ab also handle error.detail 2015-07-17 18:10:11 +02:00
vrde
cc8b295e96 Fix logout route 2015-07-17 18:01:22 +02:00
Tim Daubenschütz
55058b8b34 fix form error handling 2015-07-17 16:44:24 +02:00
Tim Daubenschütz
263a7b2676 fix error throwing in requests 2015-07-17 16:23:25 +02:00
Tim Daubenschütz
f215026f8b better error messages for API failures 2015-07-17 16:12:24 +02:00
Tim Daubenschütz
2ff47ede89 replace console logs with global logging 2015-07-17 15:52:53 +02:00
Tim Daubenschütz
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
vrde
d298486a6f cleanup header 2015-07-17 15:09:38 +02:00
vrde
b536af29be Logout is now a route 2015-07-17 15:02:44 +02:00
Tim Daubenschütz
18a37057e5 fix edition id that was breaking viewport on mobile 2015-07-17 10:36:42 +02:00
Tim Daubenschütz
8cad3b521b fix globals lint errors and edition creation - 0 editions - bug 2015-07-17 10:30:05 +02:00
Tim Daubenschütz
8e38e9e8de rename csrftoken 2015-07-16 19:16:26 +02:00
Tim Daubenschütz
13e151e83b add logging and responsive user navigation 2015-07-16 19:12:18 +02:00
Tim Daubenschütz
343ebcf741 warning instead of exception 2015-07-16 18:30:43 +02:00
Tim Daubenschütz
1d50fa36a2 new fix 2015-07-16 18:27:34 +02:00
Tim Daubenschütz
1b210bd10c fix extraction 2015-07-16 18:23:44 +02:00
Tim Daubenschütz
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +02:00
Tim Daubenschütz
7da2149e24 raven fix 2015-07-16 17:07:09 +02:00
Tim Daubenschütz
0ce2794608 disable raven 2015-07-16 17:06:25 +02:00
Tim Daubenschütz
f12d2273d5 fix csrftoken cookie issue 2015-07-16 17:04:37 +02:00
Tim Daubenschütz
d56286a472 fix scaling of button for sluice on mobile 2015-07-16 13:54:02 +02:00
Tim Daubenschütz
e9ea24aed3 add support for zero editions in piece list 2015-07-16 12:11:05 +02:00
Tim Daubenschütz
39ec4c5b91 fix wrong feedback for deleting an edition 2015-07-16 11:50:52 +02:00
Tim Daubenschütz
943c7503ea fix edition creation display bug on piece detail 2015-07-16 11:39:05 +02:00
vrde
28d6052d6f Fix typo 2015-07-15 19:01:36 +02:00
vrde
3a64f1b180 Remove console log 2015-07-15 18:55:02 +02:00
diminator
a0e6e0c5a4 Merge branch 'AD-419-decouple-piece-registration-from-' 2015-07-15 18:01:38 +02:00
vrde
0065c3d792 Fix bug in polling 2015-07-15 18:00:43 +02:00
Tim Daubenschütz
c2ce0b9d05 load fix 2015-07-15 17:57:28 +02:00
diminator
58294687f9 fix acl and editions 2015-07-15 17:51:09 +02:00
vrde
a31fe76926 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-15 17:36:32 +02:00
vrde
4e90c26b53 add subdomain to intercom 2015-07-15 17:36:20 +02:00
diminator
7c546edc2b fix acl and editions 2015-07-15 17:33:38 +02:00
Tim Daubenschütz
fb609afd28 loading feedback for edition button 2015-07-15 17:32:51 +02:00
Tim Daubenschütz
170bfcfe83 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-15 17:22:39 +02:00
Tim Daubenschütz
f3ea3460bb reload piece list after clicking on create editions 2015-07-15 17:22:28 +02:00
vrde
a70857e8d0 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-15 17:14:18 +02:00
vrde
e19a20a60f add polling to piece 2015-07-15 17:13:45 +02:00
Tim Daubenschütz
756480e4cf Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' 2015-07-15 17:03:26 +02:00
Tim Daubenschütz
fe91cc4f6a fix edition refresh after delete 2015-07-15 17:02:59 +02:00
vrde
d4bb23467e Fix link to terms 2015-07-15 16:57:41 +02:00
diminator
08137cdb09 Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from- 2015-07-15 16:56:38 +02:00
diminator
50d1f54051 edition loan 
piece delete
 2015-07-15 16:56:11 +02:00
Tim Daubenschütz
725e79bc4f Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 16:55:38 +02:00
Tim Daubenschütz
06c2e6205c Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 16:55:27 +02:00
Tim Daubenschütz
7d9d2ed6b5 fix edition creation 2015-07-15 16:55:04 +02:00
Tim Daubenschütz
cbfbde262f fix fineuploader bug when clicking the add files button in a form 2015-07-15 16:50:32 +02:00
diminator
5f7b7db00f Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 
Conflicts:
	bitcoin/models.py
	web/settings_env/live.py
 2015-07-15 15:54:37 +02:00
diminator
8953d0bfa7 Merge remote-tracking branches 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' and 'remotes/origin/AD-516-add-ga' into AD-419-decouple-piece-registration-from- 2015-07-15 15:04:18 +02:00
diminator
4edc728278 merged 2015-07-15 15:00:39 +02:00
vrde
48aa6caacf Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 14:52:23 +02:00
vrde
344fffad91 Add language support 2015-07-15 14:52:14 +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
Tim Daubenschütz
1509c520a4 finalizing loan form 2015-07-15 14:48:51 +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
Tim Daubenschütz
9cc12ab841 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 14:03:28 +02:00
Tim Daubenschütz
795a268184 loan form styling and loan contract store 2015-07-15 14:03:23 +02:00
diminator
d03f98af76 loan url 2015-07-15 14:02:33 +02:00
diminator
c54bbe231f width styling of forms 2015-07-15 13:20:34 +02:00
diminator
9ba30f0938 acl_unshare false for prize 
piece prize details
num_submissions
 2015-07-15 12:23:02 +02:00
vrde
3ad7763577 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 
Conflicts:
	js/components/ascribe_detail/media_container.js
 2015-07-15 12:21:31 +02:00
vrde
26e0957840 Fix progress bar for video encoding 2015-07-15 12:18:29 +02:00
Tim Daubenschütz
92644c285e change wording for landing page 2015-07-15 11:54:20 +02:00
Tim Daubenschütz
a8dd915ad7 basically reverting media player changes 2015-07-15 11:47:14 +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
Tim Daubenschütz
26fc2f14b3 make media container robust 2015-07-15 11:43:04 +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
vrde
9e7e9782d6 Add google analytics 2015-07-15 01:45:03 +02:00
Tim Daubenschütz
71d2d5b641 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 01:43:07 +02:00
Tim Daubenschütz
f1e90795f0 specify editions generically by whitelabel 2015-07-15 01:40:48 +02:00
diminator
d97b219c2d licenses 2015-07-15 01:35:12 +02:00
Tim Daubenschütz
e1af4c615f aclproxy for view editions 2015-07-15 01:02:53 +02:00
Tim Daubenschütz
0351b6fce4 remove id from submission 2015-07-15 00:59:22 +02:00
Tim Daubenschütz
ebfd4339ab change prize submission to new backend route 2015-07-15 00:57:31 +02:00
Tim Daubenschütz
07f4cdd2e1 advance prize submission form 2015-07-15 00:52:16 +02:00
Tim Daubenschütz
0b9383576c Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 00:41:04 +02:00
Tim Daubenschütz
5e90f3cac7 remove buggy close button 2015-07-15 00:40:51 +02:00
vrde
45a49cafe9 Fix bug with getLangText 2015-07-15 00:37:45 +02:00
Tim Daubenschütz
e65f052ffe rename prize_name to prize 2015-07-15 00:16:43 +02:00
Tim Daubenschütz
6385349846 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 00:14:52 +02:00
Tim Daubenschütz
56389a542e override api_urls and fix wording 2015-07-15 00:14:17 +02:00
Tim Daubenschütz
188f8ebf9c Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 23:54:00 +02:00
Tim Daubenschütz
07dce25fe7 add functionality for submit to prize button and fix delete button 2015-07-14 23:53:49 +02:00
vrde
d093fe013c Add awful hack to handle redirect on login and collection pages 2015-07-14 23:11:23 +02:00
diminator
73d3055329 Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from- 2015-07-14 22:53:12 +02:00
vrde
aec1ff2173 Fix acl proxy 2015-07-14 22:50:48 +02:00
vrde
63c78d09d9 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 22:43:03 +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
Tim Daubenschütz
8f386dc0cf adjust acl proxy 2015-07-14 22:34:34 +02:00
Tim Daubenschütz
d183b9ba1c include intercom 2015-07-14 21:47:14 +02:00
diminator
a9ac7b5a57 removed promocode 
prize/<id>/users/ POST, LIST
prize/<id>/users/login
 2015-07-14 21:20:34 +02:00
Tim Daubenschütz
5ae80efaa7 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 21:18:32 +02:00
Tim Daubenschütz
483e24b234 add missing language strings 2015-07-14 21:18:05 +02:00
vrde
62b0981cd7 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 21:15:54 +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
f8b87a8849 finish register artwork for prize 2015-07-14 20:35:16 +02:00
Tim Daubenschütz
6a04a1a053 fix fineuploader issue after unmounting react-s3-fineuploader 2015-07-14 20:10:41 +02:00
Tim Daubenschütz
18898b6f8a start working on register piece for price - WIP 2015-07-14 20:07:55 +02:00
vrde
5ced62c496 Cleanup constants 2015-07-14 20:06:13 +02:00
Tim Daubenschütz
aa5934cd25 made inputcheckbox component generic 2015-07-14 19:53:49 +02:00
Tim Daubenschütz
190a65b981 restyle powered by 2015-07-14 19:01:14 +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
vrde
dffcbc1191 Restore toolbar 2015-07-14 18:54:47 +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
diminator
4dfff8d6a5 Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from- 2015-07-14 17:50:01 +02:00
diminator
89a83961d9 span -> diff 2015-07-14 17:49:31 +02:00
diminator
890a312eff merge 2015-07-14 17:46:19 +02:00
diminator
982b701a5c Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-14 17:45:39 +02:00
diminator
9fa9db8352 consign/unconsign 2015-07-14 17:42:15 +02:00
Tim Daubenschütz
ff64734545 styling 2015-07-14 17:41:57 +02:00
Tim Daubenschütz
5ef63fbba3 use local whitelabel constants for route switching 2015-07-14 17:12:32 +02:00
Tim Daubenschütz
8d15238818 add subdomain settings to constants 2015-07-14 16:53:27 +02:00
Tim Daubenschütz
26f35d7628 Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 16:48:50 +02:00
Tim Daubenschütz
5a0663ea14 unshare and delete functionality + store updates for all views 2015-07-14 16:29:01 +02:00
Tim Daubenschütz
adf4630efd Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_table/table_item_acl_filtered.js
 2015-07-14 14:46:30 +02:00
Tim Daubenschütz
cc89475d0c add routine to refresh specific edition list 2015-07-14 14:45:33 +02:00
diminator
00d6ca9536 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 2015-07-14 14:17:24 +02:00
diminator
f6be4a2922 consign WIP 2015-07-14 14:16:51 +02:00
Tim Daubenschütz
373aa89041 fix bulk action refresh bug and add better feedback for edition creation 2015-07-14 13:58:33 +02:00
Tim Daubenschütz
e13649383a add filter function for acl actions 2015-07-14 13:34:32 +02:00
vrde
695a195e55 Replace history for slider 2015-07-14 12:32:18 +02:00
Tim Daubenschütz
9b663c64b2 Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 2015-07-14 12:19:41 +02:00
diminator
7a699d7cb8 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 2015-07-14 11:42:32 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
Tim Daubenschütz
7edca25add small doc for aclproxy 2015-07-14 11:14:15 +02:00
Tim Daubenschütz
f729e3c833 add acl proxy component 2015-07-14 11:11:28 +02:00
Tim Daubenschütz
27c4e588ef fix minification bug 2015-07-14 10:52:44 +02:00
Tim Daubenschütz
acbfd8c840 remove wrong imports from fineuploader 2015-07-14 10:39:36 +02:00
Tim Daubenschütz
8fc812e574 converting fineuploader promises 2015-07-14 10:36:37 +02:00
Tim Daubenschütz
bfb052f8c0 better error handling for fineuploader 2015-07-14 10:33:15 +02:00
Tim Daubenschütz
6bf28dbfa4 fix specify editions in register piece 2015-07-14 10:17:12 +02:00
diminator
3cc95cf7d5 acl WIP 2015-07-14 00:56:23 +02:00
diminator
1b3f614c80 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 2015-07-13 23:59:07 +02:00
diminator
9a7bf46675 acl WIP 2015-07-13 23:57:16 +02:00
diminator
a985fb855e acl WIP 2015-07-13 23:56:55 +02:00
Tim Daubenschütz
b238fbeeb1 fix piece list error 2015-07-13 23:29:07 +02:00
Tim Daubenschütz
e54db1e0e3 Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 23:17:15 +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
diminator
eb5e9f115e merged sluice 2015-07-13 21:20:42 +02:00
Tim Daubenschütz
a74c10d882 wät 2015-07-13 21:20:12 +02:00
Tim Daubenschütz
60600a72d4 refactor bulk acls for backend adjustment 2015-07-13 21:19:45 +02:00
diminator
3bf613941d Merge remote-tracking branch 'remotes/origin/AD-565-add-landing-page-for-sluice' into AD-419-decouple-piece-registration-from- 2015-07-13 21:16:45 +02:00
vrde
69b3c8e3dd Fix handler on sign up 2015-07-13 21:09:39 +02:00
diminator
e13b782cbe Merge remote-tracking branch 'remotes/origin/AD-565-add-landing-page-for-sluice' into AD-419-decouple-piece-registration-from- 2015-07-13 21:05:41 +02:00
vrde
7aea6669c9 Refactor login and signup 2015-07-13 20:47:43 +02:00