223 Commits

Author	SHA1	Message	Date
vrde	5445698eea	[wip] add temporary base url	2015-06-09 16:10:25 +02:00
Tim Daubenschütz	669f2b3ae7	resolve merge conflict	2015-06-09 13:38:01 +02:00
Tim Daubenschütz	296176572e	add different kinds of notifications	2015-06-09 13:36:09 +02:00
Tim Daubenschütz	d3fc902411	add que functionality to globalnotification	2015-06-09 12:08:14 +02:00
Tim Daubenschütz	e0e75151e0	add first working prototype	2015-06-08 18:14:25 +02:00
vrde	f732cec523	Merge branch 'AD-432-put-onion-online' ... Conflicts: gulpfile.js package.json	2015-06-08 18:00:17 +02:00
vrde	a1bfbb8f86	[wip] add server to serve app	2015-06-08 15:24:58 +02:00
Tim Daubenschütz	b49f3fe9f2	set state bug fix	2015-06-08 14:51:13 +02:00
Tim Daubenschütz	8a17208643	fix bulk modal bug	2015-06-08 14:23:19 +02:00
Tim Daubenschütz	98d26f5ed7	fix minor checkbox bug	2015-06-08 14:13:35 +02:00
Tim Daubenschütz	b2241c0551	fix bulk action modal formating	2015-06-08 14:01:47 +02:00
Tim Daubenschütz	1b52864f3e	remove testing from watch process	2015-06-08 13:55:55 +02:00
Tim Daubenschütz	6d337890d0	merge conflict	2015-06-08 13:47:24 +02:00
Tim Daubenschütz	cea111c25e	solve conflict	2015-06-08 11:51:49 +02:00
Tim Daubenschütz	e2ab0c1a5c	format stuff	2015-06-08 11:50:40 +02:00
Tim Daubenschütz	793e1a78ca	add tests for generalutils	2015-06-08 11:19:18 +02:00
Tim Daubenschütz	b1973d3a64	finish integrating jest testing suite	2015-06-08 09:53:14 +02:00
Tim Daubenschütz	82bea4c241	integrate jest - not working yet though	2015-06-05 16:57:56 +02:00
Tim Daubenschütz	851d42e1d9	quick fix	2015-06-05 16:23:16 +02:00
Tim Daubenschütz	95f4efa92d	merge conflict	2015-06-05 16:21:36 +02:00
Tim Daubenschütz	443829320f	add personal note to piece detail page	2015-06-05 16:20:28 +02:00
Tim Daubenschütz	3a812e531d	fix search bug	2015-06-05 15:17:35 +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	62cc6b41df	Lint code	2015-06-05 14:14:59 +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
vrde	a4b3438a2d	Add shmui to handle images	2015-06-05 13:15:31 +02:00
Tim Daubenschütz	a7478cdcb5	resolve merge conflicts	2015-06-05 11:40:49 +02:00
Tim Daubenschütz	18a2806fb1	minor fixes	2015-06-05 11:32:10 +02:00
Tim Daubenschütz	f987bce7cc	add es6lint to build process and fix most (not really) errors and warnings	2015-06-05 11:06:36 +02:00
vrde	8f65aa7a2d	Add "other" type display	2015-06-04 17:37:46 +02:00
Tim Daubenschütz	c177b95f45	responsive table	2015-06-04 17:28:14 +02:00
vrde	ff6855970e	Still working on image preview	2015-06-04 17:23:40 +02:00
Tim Daubenschütz	6f73f1ebfd	refactor table to bootstrap table	2015-06-04 17:21:38 +02:00
Tim Daubenschütz	6aa74d6b42	fix separation of orderings in edtionLists	2015-06-04 16:41:14 +02:00
vrde	13caad7794	Refactor and restyle	2015-06-04 16:15:59 +02:00
Tim Daubenschütz	4fd5cdcdb5	add real href to edition list	2015-06-04 16:07:37 +02:00
Tim Daubenschütz	6da18e9a85	rename mergeOptions	2015-06-04 15:38:15 +02:00
Tim Daubenschütz	8a3ff445ef	use mergeOptionsList on all react components	2015-06-04 15:33:59 +02:00
Tim Daubenschütz	1230ae7192	add handle success functionality to piece list and implement onject merger for components with multiple stores	2015-06-04 15:30:21 +02:00
vrde	d44cf295f0	Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ... Conflicts: js/components/ascribe_media/resource_viewer.js	2015-06-04 14:12:29 +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	aaf393d48a	Merge branch 'master' into AD-410-finish-implementing-piecelist-pag	2015-06-04 13:18:32 +02:00
Tim Daubenschütz	c19a05ca50	fix setState bug by renaming componentDidUnmount to componentWillUnmount	2015-06-04 13:17:59 +02:00
Tim Daubenschütz	ccbf411168	fixed store bindings	2015-06-04 13:16:19 +02:00
Tim Daubenschütz	302f05b68e	add link functionality	2015-06-04 11:41:56 +02:00
Tim Daubenschütz	0747c89a35	documenting known issue with open/close state of edition list table	2015-06-04 10:25:31 +02:00
Tim Daubenschütz	4fe5766bc4	add select all functionality for edition list table	2015-06-04 10:11:18 +02:00
Tim Daubenschütz	ef6662e859	add ordering functionality to editionlist table	2015-06-04 09:16:30 +02:00
vrde	641e8ac82d	Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ... Conflicts: js/components/edition.js js/mixins/inject_in_head_mixin.js	2015-06-03 17:44:13 +02:00