ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
990 Commits 115 Branches 0 Tags 13 MiB
0cf5815f42
Commit Graph

768 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +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
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
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
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
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
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
13e151e83b add logging and responsive user navigation 2015-07-16 19:12:18 +02:00
Tim Daubenschütz
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +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
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
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