104 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	95e0b256b6	Merge branch 'master' into AD-613-cyland-white-label-page ... Conflicts: .gitignore	2015-08-11 11:50:09 +02:00
Tim Daubenschütz	3afb036f24	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
diminator	792325f71d	acl_create_editions	2015-08-05 16:02:48 +02:00
Tim Daubenschütz	4f2aa430f2	refactor ascribe table and add prizes dashboard boilerplate code	2015-07-29 18:03:49 +02:00
Tim Daubenschütz	277cd98549	fix cyland logo	2015-07-29 16:08:30 +02:00
Tim Daubenschütz	f0d6eaa950	update gitignore	2015-07-29 15:57:48 +02:00
diminator	3142e00ea5	Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 12:13:40 +02:00
vrde	4d93e076df	Add third party modules to handle tracking without polluting the code	2015-07-27 18:06:02 +02:00
diminator	1504a5b20d	inputcheckbox and terms checking	2015-07-27 14:39:19 +02:00
Tim Daubenschütz	af42bb8e67	error handling first cut	2015-07-17 15:41:09 +02:00
Tim Daubenschütz	8e38e9e8de	rename csrftoken	2015-07-16 19:16:26 +02:00
Tim Daubenschütz	ee6d2789ed	set csrftokens as constants	2015-07-16 18:17:45 +02:00
diminator	50d1f54051	edition loan ... piece delete	2015-07-15 16:56:11 +02:00
Tim Daubenschütz	1509c520a4	finalizing loan form	2015-07-15 14:48:51 +02:00
diminator	d03f98af76	loan url	2015-07-15 14:02:33 +02:00
Tim Daubenschütz	f1e90795f0	specify editions generically by whitelabel	2015-07-15 01:40:48 +02:00
Tim Daubenschütz	56389a542e	override api_urls and fix wording	2015-07-15 00:14:17 +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
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	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	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
diminator	9a7bf46675	acl WIP	2015-07-13 23:57:16 +02:00
Tim Daubenschütz	60600a72d4	refactor bulk acls for backend adjustment	2015-07-13 21:19:45 +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
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	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
Tim Daubenschütz	ad6dd40867	Merge branch 'master' into AD-419-decouple-piece-registration-from-	2015-07-13 15:31:44 +02:00
Sylvain Bellemare	1497ed45eb	removed messages indicating that the email is valid	2015-07-13 14:36:29 +02:00
vrde	3fbe60692e	Working on landing	2015-07-13 14:29:20 +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
Tim Daubenschütz	b364414e16	input checkbox functionality	2015-07-10 15:56:54 +02:00
Tim Daubenschütz	1df068d75f	add edition creation functionality	2015-07-10 13:54:25 +02:00
Tim Daubenschütz	bcb1bbe29b	first cut edition creation in piece list item	2015-07-10 10:32:39 +02: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	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	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
Sylvain Bellemare	f066008ce9	translated english text to french	2015-07-08 09:57:50 +02:00
diminator	fa2ae7cba8	styling changes for frontend	2015-07-07 10:28:39 +02:00
Sylvain Bellemare	3eedda7724	[WIP] adding localisation support for French	2015-07-02 19:13:40 +02:00
diminator	18f3b51153	fineuploader session with cors	2015-07-02 11:54:33 +02:00
diminator	4ca2144c0c	request actions in frontend	2015-07-01 19:05:47 +02:00
diminator	5f372eedda	edition_index + default license	2015-07-01 15:28:48 +02:00