Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +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
|
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
|
34cf9e6871
|
Add support for videos and images
|
2015-06-03 16:53:27 +02:00 |
|
vrde
|
3e7a670509
|
Merge branch 'master' into piece-detail-mediaplayer
Conflicts:
js/components/edition.js
|
2015-06-02 14:00:47 +02:00 |
|
ddejongh
|
cbecbf44ad
|
bind modals to actionbuttons
|
2015-06-01 18:59:47 +02:00 |
|
vrde
|
df95e75025
|
WIP
|
2015-05-27 17:34:33 +02:00 |
|