1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
onion/js
Tim Daubenschütz 5a6c827f0b Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/ascribe_detail/piece_container.js
2015-11-30 15:00:39 +01:00
..
actions Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio 2015-11-30 15:00:39 +01:00
components Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio 2015-11-30 15:00:39 +01:00
constants webhooks in settings without acl 2015-11-27 03:24:37 +01:00
fetchers Refactor webhooks: add source, clear state on create hide create on no items left 2015-11-27 13:36:42 +01:00
models Revert "Add first cut on persistent stores" 2015-11-02 09:59:59 +01:00
sources Refactor webhooks: add source, clear state on create hide create on no items left 2015-11-27 13:36:42 +01:00
stores Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio 2015-11-30 15:00:39 +01:00
third_party Add Facebook Share button 2015-11-09 17:46:49 +01:00
utils Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio 2015-11-30 15:00:39 +01:00
alt.js Separate dispatcher logic of whitelabel and user stores 2015-10-07 09:31:38 +02:00
app.js Add Facebook Share button 2015-11-09 17:46:49 +01:00
history.js Restore baseUrl in router 2015-10-13 14:19:08 +02:00
routes.js Redirect directly to /login on loggout 2015-10-16 13:01:54 +02:00