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

842 Commits

Author SHA1 Message Date
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