878 Commits

This Branch

This Branch

All Branches

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