49 Commits

Author	SHA1	Message	Date
ddejongh	9e1a76a08e	api settings complete	2015-06-22 17:33:25 +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
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
Tim Daubenschütz	4fd5cdcdb5	add real href to edition list	2015-06-04 16:07:37 +02:00
Tim Daubenschütz	a93634f010	add transition model and callback for closing the edition list of a piece after changing route	2015-06-04 13:48:07 +02:00
Tim Daubenschütz	8d560fb664	thumbnail is not croped anymore	2015-06-03 16:48:31 +02:00
Tim Daubenschütz	e3c3afcefa	add year to accordion-list-item	2015-06-03 16:34:32 +02:00
ddejongh	876ade5f12	collapse part 1	2015-06-03 11:56:49 +02:00
Tim Daubenschütz	b4076aeef7	code styling	2015-06-03 10:45:23 +02:00
ddejongh	a51c27fb9f	loan form styled, ... overlay styled	2015-06-02 18:43:37 +02:00
Tim Daubenschütz	95c199bed6	resolve cluster-merge-fuck	2015-06-02 17:32:38 +02:00
vrde	141d21155b	WIP to style widgets, will continue later	2015-06-02 13:44:50 +02:00
Tim Daubenschütz	713dd72b2b	add unfinished filtering widget	2015-06-02 11:40:55 +02:00
Tim Daubenschütz	eb5d6f6cc3	implement search functionality	2015-06-02 10:10:09 +02:00
Tim Daubenschütz	c2c2049229	rename piece_list_toolbar to a more fitting name: piece_list_bulk_modal	2015-06-02 09:10:26 +02:00
ddejongh	3f9f133224	Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup	2015-06-01 15:58:37 +02:00
Tim Daubenschütz	8a18d894cc	add clear selection functionality	2015-06-01 15:12:31 +02:00
Tim Daubenschütz	f653564b51	implement toggle functionality	2015-06-01 13:18:24 +02:00
ddejongh	d90a4f97db	loan	2015-06-01 13:02:53 +02:00
Tim Daubenschütz	ade6ab7f26	integrate table component into accordion list	2015-06-01 11:51:03 +02:00
Tim Daubenschütz	897b771068	style and prepare boilerplate components	2015-05-29 16:28:05 +02:00
Tim Daubenschütz	e14e1cfae1	add glyphicons	2015-05-29 13:38:59 +02:00
Tim Daubenschütz	fe78f30dc8	remove cdn bootstrap and integrate bootstrap-sass. PLZ DO NPM INSTALL	2015-05-29 12:02:37 +02:00
Tim Daubenschütz	70f333292d	separat fonts and images	2015-05-29 11:57:24 +02:00
Tim Daubenschütz	78d61dd1d6	integrate libsass and refactoring css files	2015-05-29 11:45:10 +02:00