952 Commits

This Branch

This Branch

All Branches

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	6c85d43cfc	Rebuild	2015-07-14 23:53:42 +02:00
vrde	5e0473c8fd	Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k'	2015-07-14 23:42:23 +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	49b530870d	fix overflow issue	2015-07-14 19:03:10 +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