ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 09:50:31 +01:00
Code Issues Releases Wiki Activity
873 Commits 115 Branches 0 Tags 13 MiB
ef61470b5f
Commit Graph

171 Commits

Author SHA1 Message Date
vrde
658f4c36e1 Merge branch 'AD-611-limit-image-size' 2015-07-29 16:04:49 +02:00
vrde
f792c7e045 remove max-height for fullscreen video 2015-07-29 16:04:33 +02:00
vrde
63c57e6725 Merge branch 'AD-611-limit-image-size' 2015-07-29 15:55:01 +02:00
vrde
83ebca2795 Add new constraints for image size 2015-07-29 15:54:08 +02:00
diminator
f4ccd417fc loan form styling 2015-07-29 14:49:36 +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
ee0c36a73d Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-29 09:35:29 +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
vrde
56b4ee5964 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-28 17:34:51 +02:00
vrde
eee74e26b7 Limit image size 2015-07-28 17:34:15 +02:00
Tim Daubenschütz
22230b0c59 correct scaling for accordion list 2015-07-28 17:19:19 +02:00
Tim Daubenschütz
d72844f29a fix alignment of elements (minor css) 2015-07-28 17:10:04 +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
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
Tim Daubenschütz
2274efaed7 implement hashing toggle 2015-07-27 14:21:26 +02:00
Tim Daubenschütz
38751ae612 add user interface feedback 2015-07-24 15:13:20 +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
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
23e6cc17b2 make dropzone inactive when user is logged out 2015-07-21 11:09:21 +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
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +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
8d37efec40 fix layouting issues for sluice 2015-07-16 13:50:19 +02:00
Tim Daubenschütz
943c7503ea fix edition creation display bug on piece detail 2015-07-16 11:39:05 +02:00
vrde
9194dc641a Dunno. Just did what Tim told me. Not my fault if something is going wrong 2015-07-15 21:15:16 +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
795a268184 loan form styling and loan contract store 2015-07-15 14:03:23 +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
Tim Daubenschütz
18898b6f8a start working on register piece for price - WIP 2015-07-14 20:07:55 +02:00
Tim Daubenschütz
49b530870d fix overflow issue 2015-07-14 19:03:10 +02:00
Tim Daubenschütz
97f8d416af styling again 2015-07-14 18:55:34 +02:00
Tim Daubenschütz
e49b920318 more styling on the landing page 2015-07-14 18:34:46 +02:00
Tim Daubenschütz
ff64734545 styling 2015-07-14 17:41:57 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +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
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
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
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
5011304939 fix spool color 2015-07-13 10:11:25 +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
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
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
75590dbb34 fix position of spinner in fine uploader 2015-07-10 14:34:14 +02:00