Tim Daubenschütz
|
d72844f29a
|
fix alignment of elements (minor css)
|
2015-07-28 17:10:04 +02:00 |
|
TimDaubenschuetz
|
78049b448e
|
Merged in AD-598-register-action-switches (pull request #14)
Ad 598 register action switches
|
2015-07-28 16:36:57 +02:00 |
|
Tim Daubenschütz
|
8868842817
|
react fineuploader remove multiple property
|
2015-07-28 16:30:50 +02:00 |
|
Tim Daubenschütz
|
0f658b9a71
|
add error reason to fineuploader raven
|
2015-07-28 16:24:18 +02:00 |
|
Tim Daubenschütz
|
4c99632616
|
remove form console.log
|
2015-07-28 15:49:08 +02:00 |
|
Tim Daubenschütz
|
bd28450619
|
add documentation for input checkbox
|
2015-07-28 15:46:55 +02:00 |
|
Tim Daubenschütz
|
bb11bbc6e4
|
Fix all instances of input checkbox
|
2015-07-28 15:33:47 +02:00 |
|
diminator
|
3142e00ea5
|
Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-28 12:13:40 +02:00 |
|
diminator
|
232991b566
|
removed signup terms default false
|
2015-07-28 12:13:19 +02:00 |
|
diminator
|
3031fcdbe1
|
Merge remote-tracking branch 'remotes/origin/AD-606-login-returns-this-field-may-not-' into AD-435-hash-locally-for-when-a-artist-do
Conflicts:
js/components/ascribe_forms/input_checkbox.js
js/components/ascribe_forms/property.js
|
2015-07-28 12:11:48 +02:00 |
|
Tim Daubenschütz
|
09ce4de29d
|
refactor input checkbox
|
2015-07-28 12:03:45 +02:00 |
|
diminator
|
c5072164eb
|
Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-28 11:32:31 +02:00 |
|
diminator
|
2cece3ce33
|
inputcheckbox defaultvalue WIP
|
2015-07-28 11:32:16 +02:00 |
|
vrde
|
5d1b7d3294
|
Merge branch 'AD-622-google-analytics-tracking'
|
2015-07-28 11:15:35 +02:00 |
|
Tim Daubenschütz
|
b530018dda
|
remove unused components
|
2015-07-28 11:06:19 +02:00 |
|
Tim Daubenschütz
|
212038ae43
|
cosmetic changes + fix react warning for map fn
|
2015-07-28 10:09:54 +02:00 |
|
Tim Daubenschütz
|
828d24044b
|
Integrate hashing setting in uploader
|
2015-07-28 10:05:31 +02:00 |
|
diminator
|
60ad72aabb
|
Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-28 09:50:29 +02:00 |
|
diminator
|
6d71c20ea8
|
inputcheckbox for loan
settings container with profile update
|
2015-07-28 09:49:53 +02:00 |
|
Tim Daubenschütz
|
275f6c839e
|
minor fixes
|
2015-07-27 18:24:21 +02:00 |
|
vrde
|
17ec6f34e0
|
Fix code after review
|
2015-07-27 18:21:20 +02:00 |
|
Tim Daubenschütz
|
1a1ba8bbb1
|
add ellipsis again
|
2015-07-27 18:19:55 +02:00 |
|
vrde
|
c2601f242f
|
Comment events not yet implemented
|
2015-07-27 18:08:12 +02:00 |
|
vrde
|
4d93e076df
|
Add third party modules to handle tracking without polluting the code
|
2015-07-27 18:06:02 +02:00 |
|
Tim Daubenschütz
|
21fc2cee28
|
convert cancel hashing action to anchor
|
2015-07-27 16:37:54 +02:00 |
|
Tim Daubenschütz
|
332366ec15
|
Integrate dropzone inactivity into user flow
|
2015-07-27 16:00:54 +02:00 |
|
Tim Daubenschütz
|
d52a89cd3e
|
only display hashing toggle on user permissions
|
2015-07-27 15:34:45 +02:00 |
|
TimDaubenschuetz
|
b00c225b74
|
Merged in AD-657-after-transferring-or-consigning (pull request #20)
fix app crashing bug when transferring an edition
|
2015-07-27 15:10:10 +02:00 |
|
Tim Daubenschütz
|
a05698efc1
|
fix app crashing bug when transferring an edition
|
2015-07-27 14:59:49 +02:00 |
|
diminator
|
b105e77009
|
Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-27 14:39:42 +02:00 |
|
diminator
|
1504a5b20d
|
inputcheckbox and terms checking
|
2015-07-27 14:39:19 +02:00 |
|
Tim Daubenschütz
|
2274efaed7
|
implement hashing toggle
|
2015-07-27 14:21:26 +02:00 |
|
Tim Daubenschütz
|
8f6b858f0a
|
make form submittable after the files blob was successfully created
|
2015-07-27 09:33:31 +02:00 |
|
Tim Daubenschütz
|
5da577caca
|
use standard promises instead of fineuploaders'
|
2015-07-27 09:28:50 +02:00 |
|
Tim Daubenschütz
|
d71111b6f1
|
fix wording for file drag and drop dialog
|
2015-07-27 09:23:01 +02:00 |
|
Tim Daubenschütz
|
d6968b40b5
|
Fix wording and add localization
|
2015-07-24 17:29:30 +02:00 |
|
Tim Daubenschütz
|
e53a45822b
|
simplified error handling in progress routine
|
2015-07-24 16:29:57 +02:00 |
|
Tim Daubenschütz
|
a7a36589a7
|
Add abort hashing functionality
|
2015-07-24 16:17:27 +02:00 |
|
Tim Daubenschütz
|
38751ae612
|
add user interface feedback
|
2015-07-24 15:13:20 +02:00 |
|
Tim Daubenschütz
|
494ab209ca
|
implement hashing progress functionality
|
2015-07-24 14:39:04 +02:00 |
|
Tim Daubenschütz
|
9dc811febb
|
forgot one Q import
|
2015-07-24 13:49:16 +02:00 |
|
Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +02:00 |
|
diminator
|
861f633476
|
concurrent upload of chunks
fixed spool tests for bitcoin and blobs
|
2015-07-23 18:14:17 +02:00 |
|
Tim Daubenschütz
|
01b34ec1fb
|
add getLangText for reactfineuploader
|
2015-07-23 17:17:48 +02:00 |
|
Tim Daubenschütz
|
2f24ad8352
|
implement feedback for hashing functionalitxy
|
2015-07-23 17:05:52 +02:00 |
|
Tim Daubenschütz
|
4ec8f6b718
|
add file hashing functionality to react fine uploader
|
2015-07-23 16:47:32 +02:00 |
|
Tim Daubenschütz
|
80861813e9
|
documente and implement routine in react fine uploader
|
2015-07-23 15:57:25 +02:00 |
|
Tim Daubenschütz
|
33a179cfe2
|
converte computeHashOfFile to a promise based solution
|
2015-07-23 15:38:52 +02:00 |
|
diminator
|
5c3d57ff3a
|
Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19)
Ad 604 non owner cannot download pdfs an
|
2015-07-23 15:33:54 +02:00 |
|
Tim Daubenschütz
|
71fcdff874
|
made react fine uploader error message more generic
|
2015-07-23 15:27:14 +02:00 |
|