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,749 Commits 115 Branches 0 Tags 13 MiB
e6d839f6a0
Commit Graph

1493 Commits

Author SHA1 Message Date
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
diminator
d069206ca6 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 2015-07-13 20:16:29 +02:00
diminator
fd2f99f1b0 acl indexof 2015-07-13 20:16:08 +02:00
vrde
3f0cdbad06 Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 20:02:42 +02:00
vrde
4af174dffb Work on signup/login 2015-07-13 19:53:16 +02:00
Tim Daubenschütz
f225ee4232 adjust table acl filtered 2015-07-13 19:46:06 +02:00
Tim Daubenschütz
2d28c00d0f display spinner on pagination request 2015-07-13 19:12:24 +02:00
Tim Daubenschütz
6e1cf55841 Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_create_editions.js
 2015-07-13 18:54:06 +02:00
Tim Daubenschütz
463f205a6e finalized: separation of edition creation and edition form 2015-07-13 18:52:55 +02:00
diminator
1f73811950 register form separate 
spinner => spans
 2015-07-13 18:13:47 +02:00
Tim Daubenschütz
85ba816a53 separate polling-success functionality 2015-07-13 18:13:16 +02:00
vrde
b4f1d3d6cc Merge branch 'master' into AD-565-add-landing-page-for-sluice 
Conflicts:
	js/components/login_container.js
 2015-07-13 17:19:23 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +02:00
vrde
232a4ede92 Add form_login 2015-07-13 16:59:12 +02:00
vrde
db1c6a530a Refactor login/signup containers 2015-07-13 16:57:25 +02:00
vrde
3878dc12da Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 16:35:49 +02:00
vrde
8f07abc39b WIP 2015-07-13 16:34:26 +02:00
Tim Daubenschütz
ad6dd40867 Merge branch 'master' into AD-419-decouple-piece-registration-from- 2015-07-13 15:31:44 +02:00
Tim Daubenschütz
54ab0922cf Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-13 15:28:38 +02:00
Tim Daubenschütz
6372a5af20 adjusted frontend to use first_edition from piece directly 2015-07-13 15:28:28 +02:00
TimDaubenschuetz
80be7e67be Merged in AD-555-prevent-email-enumeration (pull request #6) 
removed messages indicating that the email is valid
 2015-07-13 15:26:35 +02:00
Tim Daubenschütz
733c95a070 loading feedback for piece and edition page 2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
Tim Daubenschütz
fd094aa471 remove first edition routine 2015-07-13 14:49:39 +02:00
Sylvain Bellemare
1497ed45eb removed messages indicating that the email is valid 2015-07-13 14:36:29 +02:00
Tim Daubenschütz
11545c13a6 reorder edition collapsible paragraphs 2015-07-13 14:30:24 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
Tim Daubenschütz
b51a03ce9c styling changes 2015-07-13 14:19:22 +02:00
diminator
a07bc9e0e2 piece + share 
acl first cut
 2015-07-13 14:10:46 +02:00
Tim Daubenschütz
c8649306d4 fix collection queryParams bug 2015-07-13 13:51:16 +02:00
Tim Daubenschütz
5011304939 fix spool color 2015-07-13 10:11:25 +02:00
Tim Daubenschütz
3dd5626eb9 fix polling bug 2015-07-13 10:07:22 +02:00
diminator
88ff4b55d6 acl buttons and share forms for pieces/editions 2015-07-10 20:00:35 +02:00
Tim Daubenschütz
f7618d18f5 fix stateful polling of editions 2015-07-10 19:11:57 +02:00
Tim Daubenschütz
cbb965c264 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list 2015-07-10 19:01:21 +02:00
Tim Daubenschütz
104a72fcc9 generic polling 2015-07-10 19:00:59 +02:00
diminator
62289be5ce polling for editions 2015-07-10 18:51:35 +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
diminator
e282da8474 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 17:52:39 +02:00
diminator
b58fe51722 fixed crowdcurity issues on login/email/requestpassword 
num editions supports status: -1, 0, >0
 2015-07-10 16:45:49 +02:00
vrde
d5ea4e515d Use distinct routers for different apps 2015-07-10 16:43:35 +02:00
Tim Daubenschütz
b6048a7f91 refactor login form 2015-07-10 16:34:34 +02:00
Tim Daubenschütz
e55bc239b4 refactor signup form 2015-07-10 16:04:57 +02:00
Tim Daubenschütz
b364414e16 input checkbox functionality 2015-07-10 15:56:54 +02:00
diminator
6f7600fca2 login errors + request obfuscated 2015-07-10 15:52:09 +02:00
diminator
8679a2446d Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 14:49:19 +02:00
Tim Daubenschütz
fd6fad5da3 correct number of editions 2015-07-10 14:48:55 +02:00
Tim Daubenschütz
62ae8fd08b fix warnings 2015-07-10 14:15:22 +02:00
Tim Daubenschütz
fa6e522222 Merge branch 'AD-551-work-on-burn-down-list' of bitbucket.org:ascribe/onion into AD-551-work-on-burn-down-list 2015-07-10 13:54:36 +02:00
Tim Daubenschütz
1df068d75f add edition creation functionality 2015-07-10 13:54:25 +02:00
diminator
6a84e9d36e whitelabel logo + sluice 2015-07-10 11:59:03 +02:00
vrde
cbe3be6faa Correct typo 2015-07-10 11:07:25 +02:00
Tim Daubenschütz
ca72168da2 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list 2015-07-10 10:32:42 +02:00
Tim Daubenschütz
bcb1bbe29b first cut edition creation in piece list item 2015-07-10 10:32:39 +02:00
diminator
22b201f388 register piece returns to piece detail 2015-07-10 10:30:17 +02:00
diminator
5855b163a8 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item.js
 2015-07-10 10:29:59 +02:00
diminator
8f78de3fb4 editions styling 
fix otherdata
collapsible styling
 2015-07-09 18:46:53 +01:00
Tim Daubenschütz
2e8e86c62f add boilerplate code for creating an edition 2015-07-09 17:56:27 +02:00
Tim Daubenschütz
5f459aa139 add dynamic links to piece list item depending on wether editions exist or not 2015-07-09 17:28:21 +02:00
Tim Daubenschütz
d051198676 add loading feedback to new edition toggle 2015-07-09 17:01:08 +02:00
Tim Daubenschütz
0642185087 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list 2015-07-09 16:32:55 +02:00
diminator
cde77bf944 editions layout 2015-07-09 15:29:10 +01:00
Tim Daubenschütz
ec0c668dbf stop propagation when clicking on an edition link (selection) 2015-07-09 16:26:05 +02:00
Tim Daubenschütz
c538cd757e remove border from piece list item 2015-07-09 16:09:53 +02:00
diminator
9aa81433a6 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:59:24 +01:00
diminator
bf0a36f2a3 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:59:16 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:54:11 +01:00
Tim Daubenschütz
773d42a3b8 add firstEdition to a piece 2015-07-09 15:44:20 +02:00
diminator
9fd4c1a6fd otherdata and extradata on a piece level and templated in frontend 2015-07-09 13:37:33 +01:00
Tim Daubenschütz
773cab6505 remove piece list edition table toggle and put it inside of accordion list item 2015-07-09 14:04:48 +02:00
Tim Daubenschütz
d514a553f2 reformat intendation for login modal handler 2015-07-09 12:06:09 +02:00
Tim Daubenschütz
35a287b8a1 made edition registration optional 2015-07-09 11:56:54 +02:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00
Tim Daubenschütz
e9f0af3e72 change the default expand of additional settings 2015-07-08 17:46:52 +02:00
Tim Daubenschütz
bfb40bb19e made edition table row selectable 2015-07-08 17:35:30 +02:00
Tim Daubenschütz
1c470203b7 scroll page to top on pagination 2015-07-08 17:19:06 +02:00
Tim Daubenschütz
59f131f788 add desktop version for notifications 2015-07-08 17:06:53 +02:00
Tim Daubenschütz
5e14ea6f87 refactor globalnotification 2015-07-08 15:40:32 +02:00
Tim Daubenschütz
16dfe3f224 add debug component for globalnotifications 2015-07-08 15:00:11 +02:00
Tim Daubenschütz
c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
Tim Daubenschütz
e56fbbac2b fix polling endless loop 2015-07-08 13:05:15 +02:00
Tim Daubenschütz
7cc5585eb1 readd year again 2015-07-08 11:32:55 +02:00
Tim Daubenschütz
3958c104f1 remove licence for piece list item 2015-07-08 10:56:05 +02:00
Tim Daubenschütz
c61fd71108 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-08 10:35:58 +02:00
Tim Daubenschütz
72dfcad17d Merge branch 'AD-438-progressbar-encoding' 
Conflicts:
	js/components/edition.js
 2015-07-08 10:35:45 +02:00
Tim Daubenschütz
6d72352580 some minor corrections 2015-07-08 10:15:58 +02:00
Tim Daubenschütz
c1e50cbe78 visual edits to fineuploader 2015-07-08 10:03:06 +02:00
Sylvain Bellemare
f066008ce9 translated english text to french 2015-07-08 09:57:50 +02:00
Tim Daubenschütz
22629ac09d adjust register piece form 2015-07-07 18:07:12 +02:00
diminator
d5ce1ecde2 bug fix 2015-07-07 15:56:35 +02:00
diminator
4a2ad0ea9d piece registration without editions 2015-07-07 15:48:09 +02:00
diminator
27c1b390ea editions optional 2015-07-07 15:25:49 +02:00
diminator
b9e8aae298 Merge remote-tracking branch 'remotes/origin/AD-475-loading-feedback-for-all-views' 
Conflicts:
	sass/ascribe_piece_list_toolbar.scss
 2015-07-07 10:34:40 +02:00
diminator
787d48ad11 Merge remote-tracking branch 'origin/master' 2015-07-07 10:28:59 +02:00
diminator
fa2ae7cba8 styling changes for frontend 2015-07-07 10:28:39 +02:00
Tim Daubenschütz
ae9e2e6a28 if user has piece with one edition, do not display show editions 2015-07-07 09:31:56 +02:00
Tim Daubenschütz
ad833a53dc fix loading feedback for piece list 2015-07-07 09:22:46 +02:00
Tim Daubenschütz
bc53b4b54c Merge branch 'AD-540-chunked-edition-list-loading-to-a' 2015-07-06 18:35:17 +02:00
Tim Daubenschütz
d5fad09b60 loading animation for show more 2015-07-06 18:29:27 +02:00
Tim Daubenschütz
5ec54f4324 add icons 2015-07-06 17:07:41 +02:00
Tim Daubenschütz
7863431727 add toggle for show more 2015-07-06 15:56:14 +02:00
Tim Daubenschütz
f12a57c3cf fix merging on ACL action 2015-07-06 15:42:04 +02:00
Tim Daubenschütz
e10b56cfc7 first cut pagination for editions 2015-07-03 16:31:09 +02:00
diminator
37759582ce cc-staging 2015-07-03 15:52:42 +02:00
vrde
1d6e3cd26c Add progressbar for encoding 2015-07-03 15:05:14 +02:00
diminator
9d30b9e3b2 embed 2015-07-03 12:35:45 +02:00
diminator
ecef14b4df fix comma bug 2015-07-03 10:45:37 +02:00
diminator
b760d23813 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-03 10:41:32 +02:00
Tim Daubenschütz
643a50a242 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-03 10:40:24 +02:00
Tim Daubenschütz
909e9db0b8 add polyfill 2015-07-03 10:40:04 +02:00
diminator
e9c8ab6bf7 Merge remote-tracking branch 'remotes/origin/AD-523-french-translation-of-whole-front' 2015-07-03 10:29:38 +02:00
diminator
3220cfcd5a Merge remote-tracking branch 'origin/master' 2015-07-02 19:23:23 +02:00
diminator
59cc9cbbce coa button 2015-07-02 19:22:32 +02:00
Sylvain Bellemare
3eedda7724 [WIP] adding localisation support for French 2015-07-02 19:13:40 +02:00
diminator
fbba3f4670 staging with cors without uglify and lang error 2015-07-02 18:54:47 +02:00
Tim Daubenschütz
ce5b9231af Merge branch 'AD-527-transition-to-login-form-if-user-' 2015-07-02 18:43:04 +02:00
Tim Daubenschütz
216c63506e important stuff 2015-07-02 18:42:24 +02:00
diminator
a26e8f7813 test without cors 2015-07-02 18:40:54 +02:00
diminator
531505c0d1 Merge remote-tracking branch 'remotes/origin/AD-506-add-audio-player' 2015-07-02 18:35:04 +02:00
vrde
c2c0fd3ab8 Add audio player 2015-07-02 18:27:09 +02:00
Tim Daubenschütz
dd039b88e8 fix contract fineuploader bugs 2015-07-02 17:57:33 +02:00
vrde
7f8a36b99a Add videojs and styles 2015-07-02 17:10:32 +02:00
Tim Daubenschütz
24af321669 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- 2015-07-02 16:51:43 +02:00
Tim Daubenschütz
29fdb1e0d7 fix csrf bug with fineuploaders props 2015-07-02 16:51:22 +02:00
diminator
41da3b2029 footer + social icons 2015-07-02 15:41:17 +02:00
Tim Daubenschütz
3ae94a2100 nail login transition 2015-07-02 15:40:54 +02:00
Tim Daubenschütz
85a1574d41 handle slide_num default for non-set queryParams 2015-07-02 14:53:49 +02:00
Tim Daubenschütz
cb996566c7 couple slides container to url state 2015-07-02 14:42:04 +02:00
diminator
3556e8c3c2 ellipsis 2015-07-02 14:40:04 +02:00
Tim Daubenschütz
3adcbe0f8d add slide functionality 2015-07-02 13:56:24 +02:00
Tim Daubenschütz
4b87d21259 add working slides container boilerplate 2015-07-02 13:31:35 +02:00
diminator
18f3b51153 fineuploader session with cors 2015-07-02 11:54:33 +02:00
Tim Daubenschütz
1f6d20fb15 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- 
Conflicts:
	js/components/register_piece.js
 2015-07-02 11:50:39 +02:00
Tim Daubenschütz
e542d3b2a5 piece registration animation process 2015-07-02 11:49:17 +02:00
diminator
85347a8916 fineuploader session with cors 2015-07-02 11:35:06 +02:00
diminator
4ca2144c0c request actions in frontend 2015-07-01 19:05:47 +02:00
Tim Daubenschütz
d0b8610050 update piece list after piece registration 2015-07-01 16:21:49 +02:00
Tim Daubenschütz
740f506ced fix bug in mergeOptions method 2015-07-01 16:19:02 +02:00
diminator
323a2472b4 Merge remote-tracking branch 'remotes/origin/master' into AD-368-harmonize-functionality-of-ascrib 2015-07-01 15:55:32 +02:00
diminator
5f372eedda edition_index + default license 2015-07-01 15:28:48 +02:00
Tim Daubenschütz
787f25ddde fix old edition data bug 2015-07-01 15:23:50 +02:00
diminator
eb947e68aa licenses in header and on piece level 2015-07-01 13:54:58 +02:00
diminator
1ec47338a1 deleted editions cannot be retrieved 2015-07-01 12:17:50 +02:00
Tim Daubenschütz
b5a5481285 add editable acl to react s3 fineuploader 2015-07-01 12:13:05 +02:00
diminator
f58a65eb0c s3 views dont accept anonymous 2015-07-01 11:43:33 +02:00
Tim Daubenschütz
2bf7d2cbb3 fix collapse bug concerning accordion table 2015-07-01 11:36:36 +02:00
diminator
ca3b058b4d Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 2015-07-01 11:22:49 +02:00
diminator
3e71926b7d register piece transitions 2015-07-01 11:21:43 +02:00
Tim Daubenschütz
75ea9e1da6 piece list toolbar responsive 2015-07-01 11:13:45 +02:00
Tim Daubenschütz
a4fd7fc837 rename bitcoin address to id 2015-07-01 10:59:06 +02:00
Tim Daubenschütz
d67bbe7770 made accordion table responsive 2015-07-01 10:53:40 +02:00
Tim Daubenschütz
1db9921dd8 use safe urls for thumbnails and links 2015-07-01 10:00:53 +02:00
diminator
2436e198db styling + licenses url 2015-07-01 09:15:36 +02:00
Tim Daubenschütz
929c694ad7 finalized delete functionality 2015-06-30 17:57:20 +02:00
Tim Daubenschütz
bb73416a8c Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-30 17:14:53 +02:00
diminator
c6528d8999 other_data : delete without cascade and show acl 2015-06-30 17:12:51 +02:00
diminator
5ecd1368f0 Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-06-30 17:12:21 +02:00
Tim Daubenschütz
26442c9230 add margins to button lists 2015-06-30 17:12:13 +02:00
Tim Daubenschütz
a8120867b9 add call to action on empty piece list 2015-06-30 16:58:26 +02:00
diminator
5008ade408 otherdata delete 2015-06-30 16:54:45 +02:00
Tim Daubenschütz
2a5bd9173e fix image scaling 2015-06-30 16:53:22 +02:00
Tim Daubenschütz
e6ac475ad5 add download functionality to s3 fine uploader 2015-06-30 16:15:50 +02:00
diminator
fe4d4c6a72 Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 2015-06-30 15:43:48 +02:00
Tim Daubenschütz
9ce6c45690 add sessions for already uploaded files and implement manual deletion 2015-06-30 15:41:39 +02:00
diminator
ce13da4b49 password reset complete + subdomain 2015-06-30 15:26:39 +02:00
diminator
6660065cad signup process complete + subdomained 2015-06-30 14:46:28 +02:00
Tim Daubenschütz
8c3dfc4b73 made download functionality optional 2015-06-30 13:53:02 +02:00
Tim Daubenschütz
ea47f7a371 add place holder for empty piece list 2015-06-30 13:32:41 +02:00
Tim Daubenschütz
1976dee57a fix firefox simulate click issue 2015-06-30 11:56:38 +02:00
Tim Daubenschütz
e31b6f0108 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 
Conflicts:
	js/components/register_piece.js
 2015-06-30 10:45:07 +02:00
diminator
8fc400bb01 licenses in registration 2015-06-30 10:42:58 +02:00
Tim Daubenschütz
e7f29cd973 fix bug in edition detail 2015-06-30 09:23:26 +02:00
Tim Daubenschütz
31e3c23302 rename upload status variable 2015-06-30 09:20:20 +02:00
Tim Daubenschütz
52db729a4d readd delete functionality 2015-06-29 17:59:35 +02:00
Tim Daubenschütz
f1d3b3968f Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-29 17:37:51 +02:00
Tim Daubenschütz
a66a4e1c9f add pause and play functionality 2015-06-29 17:37:14 +02:00
diminator
c6bc34c2f7 otherdata POST and fineuploader_session OK 2015-06-29 17:21:14 +02:00
Tim Daubenschütz
dbbf9fd233 debug 2015-06-29 16:57:31 +02:00
Tim Daubenschütz
e44ae60b75 first cut pause 2015-06-29 16:46:12 +02:00
Tim Daubenschütz
8064fdb39d Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-29 16:19:04 +02:00
Tim Daubenschütz
90e8278504 integrate file sessions for edition detail 2015-06-29 16:17:57 +02:00
diminator
ea770943f2 editions and api_urls 2015-06-29 16:15:41 +02:00
diminator
e36681ad4d Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-06-29 16:15:08 +02:00
Tim Daubenschütz
6c44333f1a add file drag and drop toolbar 2015-06-29 16:00:26 +02:00
diminator
f3677501c1 whitelabel subdomains 2015-06-29 15:58:47 +02:00
Tim Daubenschütz
dcb3e00e3a styling for mobile 2015-06-29 14:36:55 +02:00
Tim Daubenschütz
867ebec134 fix styling for fineuploader 2015-06-29 13:41:37 +02:00
Tim Daubenschütz
a87f2eb272 refactor form validation 2015-06-29 11:44:16 +02:00
Tim Daubenschütz
1a9c82d683 finalize delete and cancel functionality 2015-06-29 11:01:45 +02:00
Tim Daubenschütz
66fff1c50a implement cancel functionality 2015-06-29 10:01:54 +02:00
diminator
5916c27c45 uploader defaultprops 2015-06-29 10:00:26 +02:00
diminator
2c2ccd7891 Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend 2015-06-26 11:52:59 +02:00
diminator
eff25a9801 withdraw transfer with delete of transfer record 2015-06-26 11:44:35 +02:00
diminator
99d6dd278c withdraw fix 2015-06-26 01:05:20 +02:00
diminator
7e115e26ad withdraw transfer part one 2015-06-26 00:38:40 +02:00
diminator
930982873a Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend 2015-06-26 00:04:25 +02:00
diminator
b1ad4cc36f withdraw transfer part one 2015-06-25 23:25:03 +02:00
diminator
64017f604c login location with baseurl 2015-06-25 15:30:47 +02:00
diminator
93c1b2e826 login location with baseurl 2015-06-25 15:25:34 +02:00
diminator
d980ef7949 verify button link 2015-06-25 15:23:10 +02:00
diminator
fba30a565b coa renders per page 
verify
 2015-06-25 14:39:39 +02:00
Tim Daubenschütz
12da6c1426 add todo 2015-06-25 14:18:55 +02:00
Tim Daubenschütz
08f574a42b finish delete functionality 2015-06-25 14:15:02 +02:00
Tim Daubenschütz
ae17d2cb03 first cut: delete functionality 2015-06-25 13:46:10 +02:00
Tim Daubenschütz
b7e933c943 add delete buttons 2015-06-25 13:28:49 +02:00
Tim Daubenschütz
c478bbce9a add redirect if user is logged in to sign up page 2015-06-25 12:56:43 +02:00
Tim Daubenschütz
761138dbf6 add redirect to login page if user is logged in 2015-06-25 11:49:45 +02:00
Tim Daubenschütz
0ce56a0821 improve usability 2015-06-25 11:29:42 +02:00
Tim Daubenschütz
845f8c9cd3 fix issues related to multiple files upload 2015-06-25 11:12:40 +02:00
Tim Daubenschütz
b9f8be6636 remove console logs 2015-06-25 10:42:35 +02:00
Tim Daubenschütz
2f7bbd01b8 fix multiple attribute for fine uploader 2015-06-25 10:35:25 +02:00
Tim Daubenschütz
bf2a766e84 implement submission for autofill firefox and chrome 2015-06-24 15:52:43 +02:00
ddejongh
208e580985 share + email combined 2015-06-23 17:01:15 +02:00
ddejongh
41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar 
Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss
 2015-06-23 16:07:17 +02:00
ddejongh
95f6c08706 localization 2015-06-23 16:02:48 +02:00
ddejongh
6dd3e582df fineuploader + register 2015-06-23 13:55:05 +02:00
ddejongh
3f3e9a273f git removed s3-fineuploader 2015-06-23 10:27:19 +02:00
ddejongh
c8cb456709 Removed submodule react-s3 2015-06-23 10:16:53 +02:00
ddejongh
89884ced1f edition detail updated with forms 2015-06-22 23:32:41 +02:00
ddejongh
02f8193743 style tweaks 2015-06-22 18:02:04 +02:00
ddejongh
9e1a76a08e api settings complete 2015-06-22 17:33:25 +02:00
ddejongh
f836d4c2d4 register first cut 2015-06-22 10:50:22 +02:00
ddejongh
23190f6c48 signup/login 2015-06-20 16:43:18 +02:00
ddejongh
e1dbc0e183 Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 14:05:56 +02:00
ddejongh
efc7f6d46b Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 13:13:37 +02:00
ddejongh
48d44c0a30 Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 11:01:06 +02:00
ddejongh
6c746d09f7 Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 10:53:56 +02:00
ddejongh
c2d8b78136 settings 2015-06-18 19:03:03 +02:00
ddejongh
9b3c7e9f21 CC google tag manager 2015-06-18 10:35:36 +02:00
Tim Daubenschütz
3a8efb3dd6 Dimi and Tim styling action 2015-06-17 19:50:52 +02:00
Tim Daubenschütz
cd9c561ddf boilerplate for piece registration 2015-06-17 17:48:52 +02:00
ddejongh
fabff2922c account settings 2015-06-17 17:48:23 +02:00
vrde
41b0a33d93 Merge branch 'master' into AD-44-in-piece-detail-support-public-not 2015-06-17 10:46:31 +02:00
vrde
5165fa6c8c Fix https schema for jquery 2015-06-17 10:16:28 +02:00
ddejongh
37dfde83b0 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not 2015-06-16 20:37:01 +02:00
ddejongh
d50b3ca14d fixed logout 2015-06-16 20:35:19 +02:00
vrde
bd2be63341 Fix empty X-CSRFToken bug 2015-06-16 19:28:21 +02:00
ddejongh
ff12048c10 edition note 2015-06-16 16:38:22 +02:00
ddejongh
9cf060fdc4 csrf subdomain 2015-06-16 14:49:00 +02:00
vrde
dfd4435e27 Fix baseUrl to load shmui 2015-06-16 14:42:36 +02:00
ddejongh
1ecd579718 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not 
Conflicts:
	js/utils/requests.js
 2015-06-16 14:06:35 +02:00
ddejongh
8d73e4a77b edit acl 
editionnote
 2015-06-16 14:01:53 +02:00
vrde
03f09b8c83 Rename fetch to requests to avoid name clashing 2015-06-16 13:48:48 +02:00
vrde
ed3adf8f67 Rename fetch to requests to avoid name clashing 2015-06-16 13:48:33 +02:00
vrde
a247e111c0 Merge branch 'AD-421-add-signup-functionality' 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-16 10:58:41 +02:00
ddejongh
3784d53609 code review 2015-06-16 10:02:55 +02:00
Tim Daubenschütz
1c8ac24127 replace amazon links 2015-06-16 09:59:09 +02:00
Tim Daubenschütz
e2997891df loading icon for piece list 2015-06-16 09:57:14 +02:00
Tim Daubenschütz
1ce9b90fff Fix pagination on search bug 2015-06-16 09:27:04 +02:00
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
ddejongh
cf3b7f234d password reset ok 2015-06-15 16:56:17 +02:00
Tim Daubenschütz
8ceabda1c5 add queryparams modal 2015-06-15 15:46:33 +02:00
ddejongh
56d32efcc0 password reset 
modal switch problems
 2015-06-15 15:28:53 +02:00
ddejongh
66f8a6a1ca login/logout functional 2015-06-15 12:36:27 +02:00
vrde
07686f514f Fix (hopefully) CORS 2015-06-15 11:55:50 +02:00
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +02:00
ddejongh
4e1ef9fc72 Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 2015-06-15 09:59:53 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
Tim Daubenschütz
989b121678 Fix mangling issue 2015-06-15 08:44:44 +02:00
root
9cc70dc4c9 refactor open state of edition table first cut 2015-06-12 17:18:40 +02:00
Tim Daubenschütz
2bb004d2fb remove edition list count in table 2015-06-12 15:00:26 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
ddejongh
6ef233e43d Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- 2015-06-11 17:22:27 +02:00
ddejongh
0f1108b14e form password + signup 2015-06-11 17:22:11 +02:00
vrde
fa97470e21 Enable CORS on the frontend 2015-06-11 17:07:27 +02:00
ddejongh
5e746295bc application constants 2015-06-11 16:24:37 +02:00
ddejongh
5e7f7983e1 application constants 2015-06-11 15:57:19 +02:00
ddejongh
f4c6e025ae Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-11 15:54:50 +02:00
ddejongh
4f5e7a0821 login form 2015-06-11 15:35:18 +02:00
ddejongh
bf0a2aeefb consign unconsign requests 
async emails
 2015-06-11 15:03:55 +02:00
vrde
05b9792d3f Add some new constants to the app 2015-06-10 17:28:36 +02:00
ddejongh
af71196dfd delete function for multi editions 2015-06-10 15:49:46 +02:00
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
ddejongh
9241d3e38f further details functional / unstyled 2015-06-09 17:24:06 +02:00
ddejongh
509aa111ab Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
 2015-06-09 16:10:38 +02:00
vrde
5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
ddejongh
30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
 2015-06-09 16:09:59 +02:00
Tim Daubenschütz
669f2b3ae7 resolve merge conflict 2015-06-09 13:38:01 +02:00
Tim Daubenschütz
296176572e add different kinds of notifications 2015-06-09 13:36:09 +02:00
ddejongh
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz
d3fc902411 add que functionality to globalnotification 2015-06-09 12:08:14 +02:00
Tim Daubenschütz
e0e75151e0 add first working prototype 2015-06-08 18:14:25 +02:00
vrde
f732cec523 Merge branch 'AD-432-put-onion-online' 
Conflicts:
	gulpfile.js
	package.json
 2015-06-08 18:00:17 +02:00
vrde
a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
Tim Daubenschütz
b49f3fe9f2 set state bug fix 2015-06-08 14:51:13 +02:00
Tim Daubenschütz
8a17208643 fix bulk modal bug 2015-06-08 14:23:19 +02:00
Tim Daubenschütz
98d26f5ed7 fix minor checkbox bug 2015-06-08 14:13:35 +02:00
Tim Daubenschütz
b2241c0551 fix bulk action modal formating 2015-06-08 14:01:47 +02:00
Tim Daubenschütz
1b52864f3e remove testing from watch process 2015-06-08 13:55:55 +02:00
Tim Daubenschütz
6d337890d0 merge conflict 2015-06-08 13:47:24 +02:00
Tim Daubenschütz
cea111c25e solve conflict 2015-06-08 11:51:49 +02:00
Tim Daubenschütz
e2ab0c1a5c format stuff 2015-06-08 11:50:40 +02:00
Tim Daubenschütz
793e1a78ca add tests for generalutils 2015-06-08 11:19:18 +02:00
Tim Daubenschütz
b1973d3a64 finish integrating jest testing suite 2015-06-08 09:53:14 +02:00
Tim Daubenschütz
82bea4c241 integrate jest - not working yet though 2015-06-05 16:57:56 +02:00
Tim Daubenschütz
851d42e1d9 quick fix 2015-06-05 16:23:16 +02:00
Tim Daubenschütz
95f4efa92d merge conflict 2015-06-05 16:21:36 +02:00
Tim Daubenschütz
443829320f add personal note to piece detail page 2015-06-05 16:20:28 +02:00
Tim Daubenschütz
3a812e531d fix search bug 2015-06-05 15:17:35 +02:00
Tim Daubenschütz
7f82d49278 resolve merge 2015-06-05 14:29:37 +02:00
Tim Daubenschütz
76a41a23b9 add details to piece detail page 2015-06-05 14:22:02 +02:00
vrde
62cc6b41df Lint code 2015-06-05 14:14:59 +02:00
vrde
e8627cd0a3 Merge branch 'master' into AD-412-mediaplayer 
Conflicts:
	js/components/ascribe_media/resource_viewer.js
	js/components/edition_container.js
	js/mixins/inject_in_head_mixin.js
	package.json
 2015-06-05 13:18:16 +02:00
vrde
a4b3438a2d Add shmui to handle images 2015-06-05 13:15:31 +02:00
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00
Tim Daubenschütz
18a2806fb1 minor fixes 2015-06-05 11:32:10 +02:00
Tim Daubenschütz
f987bce7cc add es6lint to build process and fix most (not really) errors and warnings 2015-06-05 11:06:36 +02:00
vrde
8f65aa7a2d Add "other" type display 2015-06-04 17:37:46 +02:00
Tim Daubenschütz
c177b95f45 responsive table 2015-06-04 17:28:14 +02:00
vrde
ff6855970e Still working on image preview 2015-06-04 17:23:40 +02:00
Tim Daubenschütz
6f73f1ebfd refactor table to bootstrap table 2015-06-04 17:21:38 +02:00
Tim Daubenschütz
6aa74d6b42 fix separation of orderings in edtionLists 2015-06-04 16:41:14 +02:00
vrde
13caad7794 Refactor and restyle 2015-06-04 16:15:59 +02:00
Tim Daubenschütz
4fd5cdcdb5 add real href to edition list 2015-06-04 16:07:37 +02:00
Tim Daubenschütz
6da18e9a85 rename mergeOptions 2015-06-04 15:38:15 +02:00
Tim Daubenschütz
8a3ff445ef use mergeOptionsList on all react components 2015-06-04 15:33:59 +02:00
Tim Daubenschütz
1230ae7192 add handle success functionality to piece list and implement onject merger for components with multiple stores 2015-06-04 15:30:21 +02:00
vrde
d44cf295f0 Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer 
Conflicts:
	js/components/ascribe_media/resource_viewer.js
 2015-06-04 14:12:29 +02:00
Tim Daubenschütz
a93634f010 add transition model and callback for closing the edition list of a piece after changing route 2015-06-04 13:48:07 +02:00
Tim Daubenschütz
aaf393d48a Merge branch 'master' into AD-410-finish-implementing-piecelist-pag 2015-06-04 13:18:32 +02:00
Tim Daubenschütz
c19a05ca50 fix setState bug by renaming componentDidUnmount to componentWillUnmount 2015-06-04 13:17:59 +02:00
Tim Daubenschütz
ccbf411168 fixed store bindings 2015-06-04 13:16:19 +02:00
Tim Daubenschütz
302f05b68e add link functionality 2015-06-04 11:41:56 +02:00
Tim Daubenschütz
0747c89a35 documenting known issue with open/close state of edition list table 2015-06-04 10:25:31 +02:00
Tim Daubenschütz
4fe5766bc4 add select all functionality for edition list table 2015-06-04 10:11:18 +02:00
Tim Daubenschütz
ef6662e859 add ordering functionality to editionlist table 2015-06-04 09:16:30 +02:00
vrde
641e8ac82d Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer 
Conflicts:
	js/components/edition.js
	js/mixins/inject_in_head_mixin.js
 2015-06-03 17:44:13 +02:00
vrde
34cf9e6871 Add support for videos and images 2015-06-03 16:53:27 +02:00
Tim Daubenschütz
8d560fb664 thumbnail is not croped anymore 2015-06-03 16:48:31 +02:00
Tim Daubenschütz
e3c3afcefa add year to accordion-list-item 2015-06-03 16:34:32 +02:00
ddejongh
5f8abcffd2 Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- 2015-06-03 11:59:42 +02:00
ddejongh
876ade5f12 collapse part 1 2015-06-03 11:56:49 +02:00
Tim Daubenschütz
28a1c8f2d4 fix modal undefined bug 2015-06-03 11:49:39 +02:00
Tim Daubenschütz
b4076aeef7 code styling 2015-06-03 10:45:23 +02:00
ddejongh
265a7573ce aclbuttonlist willmount 2015-06-03 10:43:59 +02:00
ddejongh
6078410240 refactored buttons 2015-06-03 10:27:11 +02:00
ddejongh
a51c27fb9f loan form styled, 
overlay styled
 2015-06-02 18:43:37 +02:00
ddejongh
82d14b30fc fixed form mixin 2015-06-02 18:16:18 +02:00
Tim Daubenschütz
95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
ddejongh
97338f2727 multiloan 2015-06-02 16:47:25 +02:00
Tim Daubenschütz
0ef0558e3f merge localization 2015-06-02 15:38:54 +02:00
ddejongh
d157719043 multiloan 2015-06-02 15:38:47 +02:00
Tim Daubenschütz
ed2adb324b Merge branch 'AD-51-refactor-table-to-mockup' 2015-06-02 15:37:26 +02:00
Tim Daubenschütz
4b64f52d71 comment out filter widget 2015-06-02 15:36:06 +02:00
Tim Daubenschütz
53a01115f2 put show state of item list in store to fix bug 2015-06-02 15:33:48 +02:00
ddejongh
cdf8a358df loan/share forms multiedition 2015-06-02 15:10:40 +02:00
Tim Daubenschütz
ff5355f0ee better error messages 2015-06-02 14:43:42 +02:00
vrde
633f7f5b33 Merge branch 'master' into piece-detail-mediaplayer 2015-06-02 14:39:38 +02:00
Tim Daubenschütz
0a45f12ba7 Merge remote-tracking branch 'origin/master' into AD-350-integrate-localization 2015-06-02 14:34:08 +02:00
Tim Daubenschütz
b5c434aa18 documentation 2015-06-02 14:33:30 +02:00
vrde
842575a3cd Fix fetch 2015-06-02 14:33:00 +02:00
Tim Daubenschütz
fd0b3c0ead minor stuff 2015-06-02 14:29:06 +02:00
Tim Daubenschütz
3183dae054 add german language file and integrated translation method 2015-06-02 14:25:26 +02:00
vrde
3e7a670509 Merge branch 'master' into piece-detail-mediaplayer 
Conflicts:
	js/components/edition.js
 2015-06-02 14:00:47 +02:00
ddejongh
74faa286f1 loan/share forms multiedition 2015-06-02 14:00:05 +02:00
Tim Daubenschütz
347517a0b3 refactor all util functions for nicer usability 2015-06-02 13:48:01 +02:00
Tim Daubenschütz
366fcbf4f3 refactor general utils 2015-06-02 13:42:17 +02:00
Tim Daubenschütz
68be98c3f0 integrate string formating functionality 2015-06-02 13:31:12 +02:00
Tim Daubenschütz
a19ea989ef Merge branch 'master' into AD-350-integrate-localization 2015-06-02 13:10:12 +02:00
Tim Daubenschütz
777857b50c include lodash.templates 2015-06-02 12:00:59 +02:00
Tim Daubenschütz
713dd72b2b add unfinished filtering widget 2015-06-02 11:40:55 +02:00
ddejongh
dc3d024f8d bulk transfer part 1 2015-06-02 11:38:18 +02:00
Tim Daubenschütz
eb5d6f6cc3 implement search functionality 2015-06-02 10:10:09 +02:00
Tim Daubenschütz
c2c2049229 rename piece_list_toolbar to a more fitting name: piece_list_bulk_modal 2015-06-02 09:10:26 +02:00
ddejongh
cbecbf44ad bind modals to actionbuttons 2015-06-01 18:59:47 +02:00
Tim Daubenschütz
f2d9f3b115 start implementing localization functionality 2015-06-01 18:20:15 +02:00
vrde
2301373cae Remove useless code 2015-06-01 18:00:34 +02:00
vrde
4ee4530029 Refactor fetch 2015-06-01 17:43:38 +02:00
vrde
699c07fe3f Merge branch 'master' into AD-351-refactor-fetch 2015-06-01 16:45:40 +02:00
vrde
096739e225 Update post to work with new code 2015-06-01 16:45:12 +02:00
ddejongh
1c76c5ef48 merge fix 2015-06-01 16:04:34 +02:00
ddejongh
420516a2fe merge fix 2015-06-01 16:03:41 +02:00
ddejongh
3f9f133224 Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup 2015-06-01 15:58:37 +02:00
vrde
68827466ca Remove useless code 2015-06-01 15:37:02 +02:00
Tim Daubenschütz
8a18d894cc add clear selection functionality 2015-06-01 15:12:31 +02:00
vrde
165d2e9b1d Fix datetime selector 2015-06-01 14:49:13 +02:00
vrde
f50d28be98 Refactor fetch, WIP 2015-06-01 14:22:04 +02:00
ddejongh
f9a3be61d2 loan date 2015-06-01 14:16:06 +02:00
Tim Daubenschütz
7c4d4afbd4 add checkbox select functionality 2015-06-01 14:10:11 +02:00
Tim Daubenschütz
f653564b51 implement toggle functionality 2015-06-01 13:18:24 +02:00
ddejongh
d90a4f97db loan 2015-06-01 13:02:53 +02:00
Tim Daubenschütz
ade6ab7f26 integrate table component into accordion list 2015-06-01 11:51:03 +02:00
Tim Daubenschütz
ed66c4150e refactor routes 2015-06-01 09:05:30 +02:00
ddejongh
2c7535a73a unconsign 2015-05-29 16:53:30 +02:00
Tim Daubenschütz
897b771068 style and prepare boilerplate components 2015-05-29 16:28:05 +02:00
ddejongh
4fdf0ecc5c Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup 2015-05-29 15:34:31 +02:00
ddejongh
c6e97d916d Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi 
Conflicts:
	piece/models.py
	web/urls/frontend.py
 2015-05-29 15:27:40 +02:00
ddejongh
961b8ee58d errors for non-fields, 500 
removed retry
consign_form
 2015-05-29 15:16:42 +02:00
Tim Daubenschütz
78d61dd1d6 integrate libsass and refactoring css files 2015-05-29 11:45:10 +02:00
vrde
3ac5cc5dde Merge branch 'master' into piece-detail-mediaplayer 
Conflicts:
	js/components/ascribe_table/table_item_subtable.js
	js/components/edition.js
 2015-05-29 11:22:19 +02:00
ddejongh
7a18c150c7 merged all branches 
fixed clear errors
 2015-05-29 10:58:07 +02:00
Tim Daubenschütz
c177d382e4 Merge branch 'selectable-table-items' 2015-05-29 10:56:44 +02:00
vrde
d4e55f649d Merge branch 'piece-detail-setup' 
Conflicts:
	js/components/ascribe_table/table.js
	js/components/ascribe_table/table_item_subtable.js
 2015-05-29 10:50:49 +02:00
ddejongh
b8ffac4275 merge table branch 2015-05-29 09:20:01 +02:00
ddejongh
61342a55e8 cleanup 2015-05-29 09:13:00 +02:00
ddejongh
c3ea9aecbe form framework 
- inputtext, area, btn
 - alertmixin
 - formmixin
 - 500
 - transfer/share
 2015-05-29 01:54:56 +02:00
ddejongh
0a4dae850b solved error + reusability refactor 2015-05-28 18:18:13 +02:00
ddejongh
d4a98ce7c4 modal error resolves 2015-05-28 10:16:58 +02:00
ddejongh
a8807e8d3c modal error resolves 2015-05-27 18:54:45 +02:00
vrde
97abafda0d Fix error handling on AJAX request 2015-05-27 17:55:09 +02:00
vrde
df95e75025 WIP 2015-05-27 17:34:33 +02:00
ddejongh
3c3504d773 modal error 2015-05-27 17:33:15 +02:00
ddejongh
76317dcdca modal + forms 2015-05-27 15:53:26 +02:00
Tim Daubenschütz
e4eee35b8f add editions-selected-count to toolbar 2015-05-27 15:49:12 +02:00
Tim Daubenschütz
b9620d00aa add acl buttons for selection 2015-05-27 14:35:33 +02:00
Tim Daubenschütz
f85d4fd106 implement intersection logic for acls 2015-05-27 13:57:11 +02:00
Tim Daubenschütz
58e284cbdf refactor edition-button 2015-05-27 09:56:26 +02:00
ddejongh
8624eb26c7 sharemodal view 2015-05-27 09:34:49 +02:00
Tim Daubenschütz
aa75b7d8bd fix small bug 2015-05-27 09:05:39 +02:00
Tim Daubenschütz
f6dab18cba small refactor 2015-05-27 08:24:13 +02:00
Tim Daubenschütz
b875a9817c Refactor table_item logic 2015-05-26 20:20:17 +02:00
Tim Daubenschütz
abac948dd1 Add ACL display for table 2015-05-26 19:59:37 +02:00
Tim Daubenschütz
9c017ac993 Fix bind warning 2015-05-26 19:50:18 +02:00
Tim Daubenschütz
d71e6baa19 add persistent selected rows 2015-05-26 17:25:03 +02:00
ddejongh
3a103c1d99 modal try 1 2015-05-26 16:52:53 +02:00
Tim Daubenschütz
92be6a63e8 select state is saved in the store 2015-05-26 16:48:48 +02:00
ddejongh
d685d68d15 modal try 1 2015-05-26 16:46:50 +02:00
ddejongh
230ecfb0e4 modal try 1 2015-05-26 16:46:02 +02:00
ddejongh
e3c115897f refactored edition properties 2015-05-26 15:31:28 +02:00
vrde
fd72c1859c Merge branch 'master' into piece-detail-mediaplayer 2015-05-26 15:22:43 +02:00
ddejongh
dc33c74da6 edition loads in detail 2015-05-26 14:58:11 +02:00
Tim Daubenschütz
ca97bd9af5 Refactor TableColumnMixin 2015-05-26 14:57:32 +02:00
vrde
bd270f1e8c Add number of editions on button 2015-05-26 14:43:04 +02:00
Tim Daubenschütz
65ccaf10cf remove all .DS_Store and add to gitignore 2015-05-26 14:32:28 +02:00
vrde
efe1e44c9d Reindent for readability 2015-05-26 14:09:15 +02:00
Tim Daubenschütz
b5f0180cd6 Orderable Resource not a requirement for table anymore 2015-05-26 14:05:34 +02:00
vrde
809c89eb97 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-26 13:53:31 +02:00
vrde
c6f96a1087 Fix bug with empty query.page 2015-05-26 13:52:44 +02:00
ddejongh
bcf8756cd3 edition 2015-05-26 13:48:46 +02:00
ddejongh
497e43005e Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup 
Conflicts:
	css/main.css
	js/components/ascribe_table/table_item_subtable.js
 2015-05-26 13:48:00 +02:00
ddejongh
f564e909f7 piece_detail thumb + header 2015-05-26 13:33:35 +02:00
Tim Daubenschütz
620506b17c Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-26 13:14:44 +02:00
Tim Daubenschütz
5f492ff13b add foldable editions table 2015-05-26 13:14:35 +02:00
vrde
a33431876c Restore PieceListStore listener 2015-05-26 11:47:56 +02:00
Tim Daubenschütz
54866cda84 Improved naming 2015-05-26 10:52:20 +02:00
Tim Daubenschütz
1cb0b54f77 Added PieceDetail boilerplate code 2015-05-26 10:41:41 +02:00
Tim Daubenschütz
ffd1326366 resolve merge conflict 2015-05-22 18:43:15 +02:00
Tim Daubenschütz
0927d021c9 put architecture for transcluding TableItem in place 2015-05-22 18:41:15 +02:00
vrde
39404b92f1 Add more logic to pagination 2015-05-22 17:11:17 +02:00
Tim Daubenschütz
4c0e7992f4 Inject elements-to-transclude in the table 2015-05-22 16:51:08 +02:00
vrde
4752ac83c4 Move pagination components in their own folder 2015-05-22 15:03:29 +02:00
Tim Daubenschütz
47dd322cff Add dynamically injectable TableItems to Table Component 2015-05-22 14:15:12 +02:00
Tim Daubenschütz
486f058cb8 Refactor: Finally found pattern for making components truly generic 2015-05-22 13:58:09 +02:00
Tim Daubenschütz
654d9b93c3 Implement more pagination functionality 2015-05-22 13:43:53 +02:00
Tim Daubenschütz
d77cc20da6 Make Pagination more generic 2015-05-22 12:58:06 +02:00
Tim Daubenschütz
2c3b7c3025 Make Table component more generic 2015-05-22 11:33:38 +02:00
Tim Daubenschütz
29d9572a37 upgrade alt version. Please do npm install and check if altjs is at version 0.16.5 2015-05-22 11:25:21 +02:00
Tim Daubenschütz
4815b650c5 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-21 18:02:12 +02:00
Tim Daubenschütz
9c21edf8c4 refactor, also add boilerplate edition store, actions and container 2015-05-21 18:00:40 +02:00
vrde
f28c6d47f6 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-21 17:55:59 +02:00
vrde
0a2895e0d6 Pagination works, it still needs some love 2015-05-21 17:54:27 +02:00
Tim Daubenschütz
60d4ce8eaf fix direction of carret 2015-05-21 16:06:16 +02:00
Tim Daubenschütz
fb6945914c Refactor to proper TableColumnModel including model validation 2015-05-21 16:02:42 +02:00
Tim Daubenschütz
6821f5eb34 format header html 2015-05-21 15:20:02 +02:00
Tim Daubenschütz
0f6dc6b3e0 put link in header 2015-05-21 15:16:56 +02:00
Tim Daubenschütz
8376032b95 group table component 2015-05-21 15:14:05 +02:00
Tim Daubenschütz
653e0cadcb Complete ordering functionality 2015-05-21 14:51:15 +02:00
Tim Daubenschütz
14728af9f1 fix step 1 2015-05-21 14:03:56 +02:00
Tim Daubenschütz
9506cf3b1b implement ordering 2015-05-21 12:12:25 +02:00
Tim Daubenschütz
284f729dca Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 19:20:18 +02:00
Tim Daubenschütz
a4a4482d18 start implementing sort 2015-05-20 19:19:57 +02:00
vrde
ddc050507a Add header 2015-05-20 17:46:16 +02:00
vrde
951892a85c Add header 2015-05-20 17:35:52 +02:00
Tim Daubenschütz
52c980bfea Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 17:32:26 +02:00
Tim Daubenschütz
8c39335f3d Some styling 2015-05-20 17:32:06 +02:00
vrde
8ee9bda37b Fix spacing 2015-05-20 16:44:45 +02:00
vrde
d14e56f223 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 16:19:44 +02:00
vrde
0527e0184e Work on UserStuff 2015-05-20 16:19:40 +02:00
Tim Daubenschütz
37641650eb Add dynamical rowWidth functionailty to table 2015-05-20 16:10:02 +02:00
Tim Daubenschütz
526b241fea Add dynamically addable components to table component 2015-05-20 15:44:15 +02:00
Tim Daubenschütz
f4700e9842 resolve merge conflict 2015-05-20 15:23:15 +02:00
Tim Daubenschütz
d46b7f67dd introduce generic table types 2015-05-20 15:22:29 +02:00
Tim Daubenschütz
923db02f78 Add generic table 2015-05-20 14:48:57 +02:00
Tim Daubenschütz
0b4765aa5c layout basic table 2015-05-20 12:09:35 +02:00
vrde
f575f2b4ca Subclass React in the proper way 2015-05-20 12:00:16 +02:00
Tim Daubenschütz
ba71bd5788 refactor to use AltContainer to start developing the new table component 2015-05-20 11:32:56 +02:00
Tim Daubenschütz
148b019ff9 resolve conflict 2015-05-20 11:25:17 +02:00
Tim Daubenschütz
06d0b7abe6 fill unordered list 2015-05-20 11:24:29 +02:00
vrde
21e9216540 Add jQuery to index.html 2015-05-20 11:23:50 +02:00
Tim Daubenschütz
5080de1481 Add boilerplate table and tableitem. Also integrate bootstrap 2015-05-20 11:16:42 +02:00
Tim Daubenschütz
60c4b3ac8b fix refactor fault 2015-05-20 09:08:26 +02:00
Tim Daubenschütz
2b8e1d604b refactor: use let instead of var 2015-05-19 17:16:01 +02:00
Tim Daubenschütz
9784e09aac refactor: rename artwork to piece and artworkList to pieceList 2015-05-19 17:13:09 +02:00
Tim Daubenschütz
47246a9083 create artwork component 2015-05-19 17:01:28 +02:00
Tim Daubenschütz
9c58fa321c add encoding and camel to snake case conversion to FetchApiUtils 2015-05-19 14:09:10 +02:00
Tim Daubenschütz
adb4c72253 Remove superagent, add isomorphic fetch instead again, add constants as well as utility functions 2015-05-19 13:45:19 +02:00
Tim Daubenschütz
fe5820b44a Fix autobinding bug, considering the components creation 2015-05-19 11:23:49 +02:00
vrde
4da72d8846 Load some pieces from API endpoint 2015-05-19 10:16:44 +02:00
Tim Daubenschütz
8d57962f07 Fix bind bug 2015-05-19 08:57:42 +02:00
vrde
5dd7cd7554 Refactor a bit 2015-05-18 18:00:12 +02:00
vrde
594213a6f7 Remove bundle.js 2015-05-18 16:10:25 +02:00
Tim Daubenschütz
48e0b0076f fetchers 2015-05-18 16:06:47 +02:00
Tim Daubenschütz
c6097fe5c2 outsourced routes to separate file and created a boilerplate action and store 2015-05-18 13:43:42 +02:00
Tim Daubenschütz
6ae7ff0d4b code formatting 2015-05-18 09:59:45 +02:00
Tim Daubenschütz
25a715ddb3 continuing file structure 2015-05-18 09:56:16 +02:00
Tim Daubenschütz
0d0069a2a6 renaming app from HelloApp to AscribeApp 2015-05-18 09:31:22 +02:00
Tim Daubenschütz
7a1bd8cd82 fixed hash in url 2015-05-18 09:29:51 +02:00
Tim Daubenschütz
4d7198fab9 integrated react-router 2015-05-15 15:38:25 +02:00
vrde
23c033f12f Build pipeline works 2015-05-15 15:05:17 +02:00
vrde
49eaca1e9f Add some code 2015-05-13 16:26:12 +02:00