Tim Daubenschütz
a9fa60eaf2
Fix buttons for cc
2015-10-21 14:52:25 +02:00
Tim Daubenschütz
fad6caca63
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
2015-10-21 09:47:14 +02:00
TimDaubenschuetz
5a35e40a76
Merged in AD-947-fileuploader-button-does-not-work (pull request #100 )
...
Remove stopPropagation for event in FileDragAndDrop
2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed
Fix simulate click for Opera
2015-10-19 14:22:20 +02:00
Tim Daubenschütz
f0d8e32ecf
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
TimDaubenschuetz
d66c201a98
Merged in AD-727-missing-redirects-to-login-page (pull request #95 )
...
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Tim Daubenschütz
8b23a9c74f
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
2015-10-14 17:19:01 +02:00
diminator
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +02:00
Tim Daubenschütz
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +02:00
Tim Daubenschütz
cee8d7cae7
fix bug in FileDragAndDropDialog
2015-10-09 14:22:48 +02:00
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
f16a012771
Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract
...
Sync with master
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-16 13:45:24 +02:00
Tim Daubenschütz
17cb2223c2
finalize contract update button
2015-09-16 09:47:22 +02:00
Tim Daubenschütz
83b20e6472
First cut: Upload button for contract settings
2015-09-15 16:35:45 +02:00
Tim Daubenschütz
33ec380f4c
fix minor merge conflict error
2015-09-15 14:20:30 +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
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
TimDaubenschuetz
e025de878b
Merged in AD-917-show-progress-when-uploading (pull request #54 )
...
Ad 917 show progress when uploading
2015-09-15 13:15:52 +02:00
Tim Daubenschütz
6c8135d6ac
fix length of undefined bug in fineuploadeer
2015-09-15 13:13:58 +02:00
Tim Daubenschütz
c5ef3cacd5
add ContractSettingsUpdateButton boilerplate code
2015-09-15 11:50:23 +02:00
Tim Daubenschütz
c08f46bd69
separate FileDragAndDrop component
2015-09-15 11:13:17 +02:00
Tim Daubenschütz
8b1193f05b
implement template functionality for react fineuploader
2015-09-15 10:43:45 +02:00
Tim Daubenschütz
280f3bc73a
Add input filter for specific file extensions to react fineuploader
2015-09-15 10:15:56 +02:00
Tim Daubenschütz
24f0d84fbc
finalize contract settings layout
2015-09-14 17:38:26 +02:00
Tim Daubenschütz
209d141939
extend fileClassToUpload functionality and implement it in contract settings
2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff
add fileclassToUpload to react fineuploader
2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec
make contract creation implicit
2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
...
Conflicts:
js/components/ascribe_forms/property.js
2015-09-14 14:23:36 +02:00
Tim Daubenschütz
e087e9f332
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
2015-09-14 11:36:24 +02:00
Tim Daubenschütz
f42f4a02f8
Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading
...
Resolve merge conflicts with master for easier PR.
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-14 11:14:02 +02:00
diminator
6013303bd6
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
82b9b68338
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-10 16:14:02 +02:00
Tim Daubenschütz
1d184973f4
reset method for react s3 fineuploader
2015-09-10 11:22:42 +02:00
Tim Daubenschütz
b4756be60a
replace anonymous filter functions with util functions
2015-09-10 09:54:02 +02:00
Tim Daubenschütz
1fabea93ff
refactor file size calculation
2015-09-10 09:30:04 +02:00
Tim Daubenschütz
2ba27d3847
add documentation for exception
2015-09-09 17:21:55 +02:00
Tim Daubenschütz
384e0e3e6f
only show progress bar if files are greater than 10MB
2015-09-09 16:32:08 +02:00
Tim Daubenschütz
2cc4284118
minor cleanup
2015-09-09 16:22:20 +02:00
Tim Daubenschütz
8255c8dc6f
style progress bar
2015-09-09 15:15:54 +02:00
Tim Daubenschütz
801227cfee
remove react-progress-bar for react-bootstrap progressbar
2015-09-09 14:11:52 +02:00
Tim Daubenschütz
3197fad1b6
fix bug in progress method
2015-09-07 17:49:38 +02:00
Tim Daubenschütz
1c4bf9915c
refactor setState actions to fix overriding values bug
2015-09-07 12:02:01 +02:00
Tim Daubenschütz
bf6b5e00a6
update fineuploader
2015-09-04 16:39:57 +02:00
Tim Daubenschütz
bb6deb3f68
refactor setStatus method of fineuploader
2015-09-04 15:13:38 +02:00
Tim Daubenschütz
8e98a7bff7
show overall progress
2015-09-04 14:54:39 +02:00
