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
1,317 Commits 115 Branches 0 Tags 13 MiB
e05249eacb
Commit Graph

127 Commits

Author SHA1 Message Date
diminator
bdeef598eb Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r' 
Conflicts:
	js/components/settings_container.js
 2015-08-10 17:07:15 +02:00
Tim Daubenschütz
5be771f6ac add inline property to form 2015-08-10 14:15:32 +02:00
Tim Daubenschütz
3afb036f24 rename apiUrls to ApiUrls 2015-08-07 15:08:02 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
Tim Daubenschütz
192f776bd8 Filter open edition tables correctly 2015-08-07 13:05:50 +02:00
Tim Daubenschütz
17b991e06b adjust store calls to fetch list to new interface 2015-08-04 11:48:12 +02:00
vrde
72821001b7 Merge branch 'AD-601-in-piece_detail-longer-titles-are' 
Conflicts:
	.gitignore
 2015-08-03 13:44:53 +02:00
Tim Daubenschütz
52f10f178f Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are 2015-07-30 11:49:48 +02:00
Tim Daubenschütz
79bef1e0a9 add ellipsis functionality to detail property 2015-07-30 11:48:47 +02:00
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
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
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
a05698efc1 fix app crashing bug when transferring an edition 2015-07-27 14:59:49 +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
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
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
62bdf97a2f cleanup of SPOOL old code 2015-07-21 21:13:46 +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
44f63dace1 fix coa issue and hopefully header bug 2015-07-17 23:28:59 +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
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +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
0065c3d792 Fix bug in polling 2015-07-15 18:00:43 +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
fe91cc4f6a fix edition refresh after delete 2015-07-15 17:02:59 +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
cbfbde262f fix fineuploader bug when clicking the add files button in a form 2015-07-15 16:50:32 +02:00
diminator
4edc728278 merged 2015-07-15 15:00:39 +02:00
Tim Daubenschütz
81aeb478b7 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 14:06:03 +02:00
diminator
9ba30f0938 acl_unshare false for prize 
piece prize details
num_submissions
 2015-07-15 12:23:02 +02:00
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
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
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
5a0663ea14 unshare and delete functionality + store updates for all views 2015-07-14 16:29:01 +02:00
Tim Daubenschütz
cc89475d0c add routine to refresh specific edition list 2015-07-14 14:45:33 +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
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
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
Tim Daubenschütz
f729e3c833 add acl proxy component 2015-07-14 11:11:28 +02:00
diminator
9a7bf46675 acl WIP 2015-07-13 23:57:16 +02:00
diminator
fd2f99f1b0 acl indexof 2015-07-13 20:16:08 +02:00
Tim Daubenschütz
463f205a6e finalized: separation of edition creation and edition form 2015-07-13 18:52:55 +02:00
Tim Daubenschütz
85ba816a53 separate polling-success functionality 2015-07-13 18:13:16 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +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
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
11545c13a6 reorder edition collapsible paragraphs 2015-07-13 14:30:24 +02:00
diminator
a07bc9e0e2 piece + share 
acl first cut
 2015-07-13 14:10:46 +02:00
diminator
88ff4b55d6 acl buttons and share forms for pieces/editions 2015-07-10 20:00:35 +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
Tim Daubenschütz
62ae8fd08b fix warnings 2015-07-10 14:15:22 +02:00
diminator
8f78de3fb4 editions styling 
fix otherdata
collapsible styling
 2015-07-09 18:46:53 +01: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
diminator
9fd4c1a6fd otherdata and extradata on a piece level and templated in frontend 2015-07-09 13:37:33 +01:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +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