Tim Daubenschütz
|
cbfbde262f
|
fix fineuploader bug when clicking the add files button in a form
|
2015-07-15 16:50:32 +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 |
|