72 Commits

Author	SHA1	Message	Date
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	ae4428795d	integrate es6lint	2015-06-05 09:17:41 +02:00
Tim Daubenschütz	95c199bed6	resolve cluster-merge-fuck	2015-06-02 17:32:38 +02:00
Tim Daubenschütz	88fe43b3e2	add es6-promise to package.json	2015-06-02 09:00:05 +02:00
vrde	f50d28be98	Refactor fetch, WIP	2015-06-01 14:22:04 +02:00
ddejongh	d90a4f97db	loan	2015-06-01 13:02:53 +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	78d61dd1d6	integrate libsass and refactoring css files	2015-05-29 11:45:10 +02:00
ddejongh	b8ffac4275	merge table branch	2015-05-29 09:20:01 +02:00
Tim Daubenschütz	64793cd90b	remove npm start scripts, add gulp for build and watch, add source maps	2015-05-26 19:16:30 +02:00
ddejongh	230ecfb0e4	modal try 1	2015-05-26 16:46:02 +02:00
Tim Daubenschütz	29d9572a37	upgrade alt version. Please do npm install and check if altjs is at version 0.16.5	2015-05-22 11:25:21 +02:00
Tim Daubenschütz	adb4c72253	Remove superagent, add isomorphic fetch instead again, add constants as well as utility functions	2015-05-19 13:45:19 +02:00
vrde	f189851355	Add uglifyjs as dependency	2015-05-18 16:35:08 +02:00
Tim Daubenschütz	4d7198fab9	integrated react-router	2015-05-15 15:38:25 +02:00
Tim Daubenschütz	2b8f46cb8c	resolving merge conflict #2	2015-05-15 15:27:23 +02:00
Tim Daubenschütz	f96ec92df6	resolving merge conflict	2015-05-15 15:22:29 +02:00
vrde	b000ecd925	Build pipeline works	2015-05-15 15:18:17 +02:00
vrde	23c033f12f	Build pipeline works	2015-05-15 15:05:17 +02:00
vrde	49eaca1e9f	Add some code	2015-05-13 16:26:12 +02:00
vrde	bd2dbbce3a	Add package.json	2015-05-12 15:28:59 +02:00