Tim Daubenschütz
|
04c406a288
|
minor changes
|
2015-08-06 10:58:09 +02:00 |
|
Tim Daubenschütz
|
3624ae874f
|
refactor form_remove_piece_from_collection
|
2015-08-06 10:42:12 +02:00 |
|
Tim Daubenschütz
|
0eb10c6c4b
|
refactor form_remove_editions_from_collection
|
2015-08-06 10:31:51 +02:00 |
|
Tim Daubenschütz
|
68f4decaad
|
remove FormPropertyHeader
|
2015-08-06 10:23:01 +02:00 |
|
Tim Daubenschütz
|
a3bfda186a
|
refactor form_delete_piece
|
2015-08-06 10:15:02 +02:00 |
|
Tim Daubenschütz
|
dbd0e14a64
|
add DELETE http support to form
|
2015-08-06 10:09:25 +02:00 |
|
diminator
|
18c7e2bc93
|
invite user with token and signup without email validation
|
2015-08-05 19:22:58 +02:00 |
|
Tim Daubenschütz
|
d66549478f
|
WIP: Refactor delete editions form
|
2015-08-05 18:14:49 +02:00 |
|
Tim Daubenschütz
|
1ae77d5157
|
remove close button from modals
|
2015-08-05 18:00:44 +02:00 |
|
Tim Daubenschütz
|
4c88f88d56
|
first cut porting and using new react-bootstrap version
|
2015-08-05 17:32:35 +02:00 |
|
Tim Daubenschütz
|
f3e378f221
|
update react-bootstrap first cut
|
2015-08-05 16:49:25 +02:00 |
|
diminator
|
792325f71d
|
acl_create_editions
|
2015-08-05 16:02:48 +02:00 |
|
diminator
|
36356dd5c5
|
Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
|
2015-08-05 14:52:18 +02:00 |
|
diminator
|
5108ca2fc6
|
merge conflict
|
2015-08-05 14:50:44 +02:00 |
|
diminator
|
bd52bc8136
|
Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
js/components/whitelabel/prize/constants/api_urls.js
|
2015-08-05 14:50:17 +02:00 |
|
diminator
|
6ab5bec8d3
|
WIP prize settings for admin
|
2015-08-05 14:40:26 +02:00 |
|
Tim Daubenschütz
|
f134ca29d6
|
fix property reset function
|
2015-08-05 13:42:53 +02:00 |
|
Tim Daubenschütz
|
f31d576583
|
add styling for piece list filter widget
|
2015-08-04 15:58:39 +02:00 |
|
Tim Daubenschütz
|
fb10d9329b
|
add labels for filter params
|
2015-08-04 15:39:20 +02:00 |
|
Tim Daubenschütz
|
fc0bccbff3
|
add filterBy to edition list action|store
|
2015-08-04 15:06:02 +02:00 |
|
Tim Daubenschütz
|
6f1c6a0168
|
add 'filter active' functionality to piece list filter widget
|
2015-08-04 13:28:44 +02:00 |
|
diminator
|
5ce549e533
|
disable submit prize with ACL
|
2015-08-04 13:15:38 +02:00 |
|
Tim Daubenschütz
|
17b991e06b
|
adjust store calls to fetch list to new interface
|
2015-08-04 11:48:12 +02:00 |
|
diminator
|
2258968856
|
Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
|
2015-08-04 11:45:20 +02:00 |
|
Tim Daubenschütz
|
e3b46c69a5
|
implement piece list filter widget functionality
|
2015-08-04 11:39:33 +02:00 |
|
Tim Daubenschütz
|
7ee296c963
|
static styling of filter widget
|
2015-08-04 10:06:02 +02:00 |
|
Tim Daubenschütz
|
ae8bc674d2
|
add logging for complete as well
|
2015-08-03 18:50:14 +02:00 |
|
Tim Daubenschütz
|
4bf21e1afd
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-08-03 18:38:33 +02:00 |
|
Tim Daubenschütz
|
92d699a831
|
add chunk logging
|
2015-08-03 18:35:56 +02:00 |
|
Tim Daubenschütz
|
30d84af7fb
|
add more logs
|
2015-08-03 18:02:21 +02:00 |
|
vrde
|
c31acd4317
|
Merge branch 'AD-700-redirect-landing-to-collection-if-logged-in'
|
2015-08-03 13:53:30 +02:00 |
|
vrde
|
72821001b7
|
Merge branch 'AD-601-in-piece_detail-longer-titles-are'
Conflicts:
.gitignore
|
2015-08-03 13:44:53 +02:00 |
|
Tim Daubenschütz
|
5d92716726
|
add logging in fineuploader
|
2015-08-03 11:45:44 +02:00 |
|
vrde
|
ac4a98fa16
|
Redirect from landing to collection if user is logged in
|
2015-08-03 11:32:52 +02:00 |
|
Tim Daubenschütz
|
6bf33f541a
|
remove raven
|
2015-08-03 11:26:30 +02:00 |
|
Tim Daubenschütz
|
765969c5b3
|
log file list to sentry on error
|
2015-08-03 11:09:31 +02:00 |
|
Tim Daubenschütz
|
63b763dd25
|
remove onComplete call if there has been an error with fineuploader
|
2015-08-03 10:54:34 +02:00 |
|
Tim Daubenschütz
|
c9042a0934
|
delete password of user when submitting to sentry
|
2015-08-03 10:41:51 +02:00 |
|
Tim Daubenschütz
|
2c7c78af67
|
Merge remote-tracking branch 'origin/master' into AD-699-rename-prize-endpoint-to-prizes
|
2015-07-31 13:45:53 +02:00 |
|
Tim Daubenschütz
|
84703779a9
|
rename prize endpoint to prizes
|
2015-07-31 13:44:57 +02:00 |
|
diminator
|
950e63b6d0
|
content copy for hash_locally
|
2015-07-30 14:04:39 +02:00 |
|
Tim Daubenschütz
|
52f10f178f
|
Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are
|
2015-07-30 11:49:48 +02:00 |
|
Tim Daubenschütz
|
79bef1e0a9
|
add ellipsis functionality to detail property
|
2015-07-30 11:48:47 +02:00 |
|
vrde
|
91078bfdd9
|
Fix comment
|
2015-07-29 18:24:54 +02:00 |
|
vrde
|
8f52d8bf87
|
Comment the solution
|
2015-07-29 18:19:04 +02:00 |
|
Tim Daubenschütz
|
4f2aa430f2
|
refactor ascribe table and add prizes dashboard boilerplate code
|
2015-07-29 18:03:49 +02:00 |
|
vrde
|
ef61470b5f
|
First iteration
|
2015-07-29 18:00:49 +02:00 |
|
diminator
|
bab29d6ffa
|
Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
js/components/ascribe_forms/form_loan.js
|
2015-07-29 15:55:16 +02:00 |
|
Tim Daubenschütz
|
9ebc489c78
|
refresh piece list correctly after piece with edition creation
|
2015-07-29 15:24:30 +02:00 |
|
diminator
|
f5732661bd
|
subdomain-dependent localhashing
|
2015-07-29 15:22:30 +02:00 |
|
Tim Daubenschütz
|
b0d3213816
|
add flushLoanContract logic
|
2015-07-29 15:03:15 +02:00 |
|
diminator
|
f4ccd417fc
|
loan form styling
|
2015-07-29 14:49:36 +02:00 |
|
Tim Daubenschütz
|
8da71d0229
|
make term components unique in loan form
|
2015-07-29 14:46:33 +02:00 |
|
diminator
|
deebacd063
|
Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22)
Ad 601 in piece_detail longer titles are
|
2015-07-29 14:16:40 +02:00 |
|
Tim Daubenschütz
|
cb5b381e0b
|
fix scaling issue for slides container
|
2015-07-29 11:23:25 +02:00 |
|
Tim Daubenschütz
|
76cf9fd74d
|
Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_slides_container/slides_container.js
js/components/ascribe_uploader/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
|
2015-07-29 09:35:14 +02:00 |
|
Tim Daubenschütz
|
390e5d51e9
|
advanced error logging for register piece
|
2015-07-28 17:45:05 +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 |
|
Tim Daubenschütz
|
1a1ba8bbb1
|
add ellipsis again
|
2015-07-27 18:19:55 +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 |
|
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 |
|