ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity
onion/js
History
Tim Daubenschütz fbbbd1de89 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 
Fix merge conflicts

Conflicts:
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00
..
actions
contract list make public
2015-09-09 11:11:16 +02:00
components
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:47:36 +02:00
constants
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:30:24 +02:00
fetchers
contract list make public
2015-09-09 11:11:16 +02:00
mixins
remove alert mixin
2015-08-10 14:22:25 +02:00
models
delete function for multi editions
2015-06-10 15:49:46 +02:00
stores
terms and conditions page with accept/deny
2015-09-07 12:03:59 +02:00
third_party
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:30:24 +02:00
utils
only one agreement pending
2015-09-09 19:29:58 +02:00
alt.js
add es6lint to build process and fix most (not really) errors and warnings
2015-06-05 11:06:36 +02:00
app.js
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:30:24 +02:00
routes.js
contract agreement notifications
2015-09-04 11:49:55 +02:00