Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +02:00 |
|
Tim Daubenschütz
|
8cd4377a58
|
Change links in app to new react-router@1.0rc1 syntax
|
2015-09-30 18:30:50 +02:00 |
|
Tim Daubenschütz
|
d888bb8a54
|
PR Feedback: remove unnecessary DnD functions
|
2015-09-16 15:52:54 +02:00 |
|
Tim Daubenschütz
|
3c3e32980c
|
minor getLangText edition
|
2015-09-16 15:23:01 +02:00 |
|
Tim Daubenschütz
|
b2a3c9545b
|
minor corrections
|
2015-09-16 14:07:55 +02:00 |
|
Tim Daubenschütz
|
83b20e6472
|
First cut: Upload button for contract settings
|
2015-09-15 16:35:45 +02:00 |
|
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 |
|
Tim Daubenschütz
|
6c8135d6ac
|
fix length of undefined bug in fineuploadeer
|
2015-09-15 13:13:58 +02:00 |
|
Tim Daubenschütz
|
c08f46bd69
|
separate FileDragAndDrop component
|
2015-09-15 11:13:17 +02:00 |
|