659 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vrde	c5fd8aa28f	Add custom url mapping	2015-07-14 21:15:10 +02:00
vrde	5ced62c496	Cleanup constants	2015-07-14 20:06:13 +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
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	27f04f59a3	Merged in AD-419-decouple-piece-registration-from- (pull request #9) ... Ad 419 decouple piece registration from	2015-07-14 17:51:46 +02:00
diminator	a86ea00c7e	Merged in AD-419-decouple-piece-registration-from- (pull request #8) ... Ad 419 decouple piece registration from	2015-07-14 17:50:35 +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
vrde	b64fbe3871	Rebuild	2015-07-14 14:36:52 +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
Tim Daubenschütz	73ab401257	add fav icons	2015-07-14 12:19:31 +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	927c89f342	Merged in AD-419-decouple-piece-registration-from- (pull request #7) ... Ad 419 decouple piece registration from	2015-07-14 00:00:19 +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
vrde	3b1fdba80f	Merge branch 'AD-565-add-landing-page-for-sluice'	2015-07-13 23:58:15 +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