vrde 3ac5cc5dde Merge branch 'master' into piece-detail-mediaplayer ...

Conflicts:
	js/components/ascribe_table/table_item_subtable.js
	js/components/edition.js

2015-05-29 11:22:19 +02:00

..

actions

merge table branch

2015-05-29 09:20:01 +02:00

components

Merge branch 'master' into piece-detail-mediaplayer

2015-05-29 11:22:19 +02:00

constants

merge table branch

2015-05-29 09:20:01 +02:00

fetchers

edition loads in detail

2015-05-26 14:58:11 +02:00

mixins

Merge branch 'master' into piece-detail-mediaplayer

2015-05-29 11:22:19 +02:00

models

Inject elements-to-transclude in the table

2015-05-22 16:51:08 +02:00

stores

merge table branch

2015-05-29 09:20:01 +02:00

utils

modal error

2015-05-27 17:33:15 +02:00

alt.js

Add jQuery to index.html

2015-05-20 11:23:50 +02:00

app.js

Pagination works, it still needs some love

2015-05-21 17:54:27 +02:00

routes.js

edition

2015-05-26 13:48:46 +02:00