Tim Daubenschütz 669f2b3ae7 resolve merge conflict

2015-06-09 13:38:01 +02:00

..

ascribe_accordion_list

fix minor checkbox bug

2015-06-08 14:13:35 +02:00

ascribe_buttons

…

ascribe_forms

…

ascribe_media

[wip] add server to serve app

2015-06-08 15:24:58 +02:00

ascribe_modal

…

ascribe_pagination

…

ascribe_piece_list_bulk_modal

add first working prototype

2015-06-08 18:14:25 +02:00

ascribe_piece_list_toolbar

…

ascribe_table

…

ascribe_app.js

add first working prototype

2015-06-08 18:14:25 +02:00

edition_container.js

…

edition.js

…

global_notification.js

add different kinds of notifications

2015-06-09 13:36:09 +02:00

header.js

add different kinds of notifications

2015-06-09 13:36:09 +02:00

piece_list.js

…