72 Commits

Author	SHA1	Message	Date
diminator	8fc400bb01	licenses in registration	2015-06-30 10:42:58 +02:00
Tim Daubenschütz	e44ae60b75	first cut pause	2015-06-29 16:46:12 +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
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
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	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	fba30a565b	coa renders per page ... verify	2015-06-25 14:39:39 +02:00
Tim Daubenschütz	08f574a42b	finish delete functionality	2015-06-25 14:15:02 +02:00
Tim Daubenschütz	b7e933c943	add delete buttons	2015-06-25 13:28:49 +02:00
Tim Daubenschütz	845f8c9cd3	fix issues related to multiple files upload	2015-06-25 11:12:40 +02:00
Tim Daubenschütz	ea88e87355	Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar ... Conflicts: sass/main.scss	2015-06-24 15:50:45 +02:00
ddejongh	41d70a9a15	Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar ... Conflicts: js/components/ascribe_forms/form.js js/components/settings_container.js sass/ascribe_settings.scss	2015-06-23 16:07:17 +02:00
ddejongh	95f6c08706	localization	2015-06-23 16:02:48 +02:00
ddejongh	6dd3e582df	fineuploader + register	2015-06-23 13:55:05 +02:00
ddejongh	3f3e9a273f	git removed s3-fineuploader	2015-06-23 10:27:19 +02:00
ddejongh	c8cb456709	Removed submodule react-s3	2015-06-23 10:16:53 +02:00
ddejongh	89884ced1f	edition detail updated with forms	2015-06-22 23:32:41 +02:00
ddejongh	02f8193743	style tweaks	2015-06-22 18:02:04 +02:00
ddejongh	9e1a76a08e	api settings complete	2015-06-22 17:33:25 +02:00
Tim Daubenschütz	cb3349c416	Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar	2015-06-22 10:55:43 +02:00
ddejongh	f836d4c2d4	register first cut	2015-06-22 10:50:22 +02:00
ddejongh	23190f6c48	signup/login	2015-06-20 16:43:18 +02:00
Tim Daubenschütz	2b861c4773	copy fineuploader theme	2015-06-19 13:17:40 +02:00
ddejongh	efc7f6d46b	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 13:13:37 +02:00
ddejongh	c2d8b78136	settings	2015-06-18 19:03:03 +02:00
Tim Daubenschütz	3a8efb3dd6	Dimi and Tim styling action	2015-06-17 19:50:52 +02:00
Tim Daubenschütz	e2997891df	loading icon for piece list	2015-06-16 09:57:14 +02:00
Tim Daubenschütz	7910384d99	solve merge conflicts	2015-06-16 09:02:48 +02:00
Tim Daubenschütz	d41f5df3ee	separat ascribe-table css	2015-06-12 15:42:43 +02:00
Tim Daubenschütz	87bc6b3559	fix checkbox in edition list	2015-06-12 13:41:15 +02:00
Tim Daubenschütz	dcd770ab5f	readd sourcemaps	2015-06-12 13:36:55 +02:00
vrde	b9c8002495	Add ENV variable to handle BASE_URL	2015-06-09 17:53:44 +02:00
vrde	5445698eea	[wip] add temporary base url	2015-06-09 16:10:25 +02:00
ddejongh	30ee436f4c	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ... Conflicts: gulpfile.js added notifications cleaned up proptypes	2015-06-09 16:09:59 +02:00
Tim Daubenschütz	669f2b3ae7	resolve merge conflict	2015-06-09 13:38:01 +02:00
ddejongh	6563bf97b0	toggable textarea	2015-06-09 13:29:22 +02:00
Tim Daubenschütz	e0e75151e0	add first working prototype	2015-06-08 18:14:25 +02:00
vrde	a1bfbb8f86	[wip] add server to serve app	2015-06-08 15:24:58 +02:00
Tim Daubenschütz	443829320f	add personal note to piece detail page	2015-06-05 16:20:28 +02:00
Tim Daubenschütz	7f82d49278	resolve merge	2015-06-05 14:29:37 +02:00
Tim Daubenschütz	76a41a23b9	add details to piece detail page	2015-06-05 14:22:02 +02:00
vrde	e8627cd0a3	Merge branch 'master' into AD-412-mediaplayer ... Conflicts: js/components/ascribe_media/resource_viewer.js js/components/edition_container.js js/mixins/inject_in_head_mixin.js package.json	2015-06-05 13:18:16 +02:00
Tim Daubenschütz	a7478cdcb5	resolve merge conflicts	2015-06-05 11:40:49 +02:00
vrde	8f65aa7a2d	Add "other" type display	2015-06-04 17:37:46 +02:00
Tim Daubenschütz	6f73f1ebfd	refactor table to bootstrap table	2015-06-04 17:21:38 +02:00
vrde	13caad7794	Refactor and restyle	2015-06-04 16:15:59 +02:00
Tim Daubenschütz	eaefd253d5	fixing AD-393	2015-06-04 16:13:10 +02:00