Brett Sun
a4292f09c3
Merge with master
2016-02-05 17:06:16 +01:00
Brett Sun
acd7c0f0a3
Fix PR comments
2016-02-05 15:17:59 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
2ad2ea242d
Changes for PR comments
2016-01-18 17:31:56 +01:00
Brett Sun
8531b77633
Merge with master
2016-01-11 17:52:32 +01:00
Brett Sun
f31d6352eb
Merge general_utils.js from #35 for selectFromObject
2016-01-11 17:09:17 +01:00
Brett Sun
41df6fe837
Add global notification to form validation
2015-12-17 13:05:39 +01:00
Brett Sun
ad17a9d6f3
Show server error in notification if one is given for failed piece registrations
2015-12-16 18:14:06 +01:00
Brett Sun
d9615188b0
Only assume TypeError if request's response is null
2015-12-14 14:54:57 +01:00
Brett Sun
9342262f5c
Move ignoreSentry parameter of logGlobal to be last in parameter list
2015-12-14 14:31:53 +01:00
Brett Sun
7605f093ab
Fix Request error case
2015-12-09 14:44:31 +01:00
diminator
02a9844ed7
Merge remote-tracking branch 'remotes/origin/master' into AD-290-coa-buttons-and-usage-esp-verify
2015-12-09 11:42:22 +01:00
Tim Daubenschütz
de3d3e937e
Throw no 'Client Request Error' when body.success is not available
2015-12-09 11:24:11 +01:00
Brett Sun
e0b35e0a24
Merge with master
2015-12-08 20:55:13 +01:00
Brett Sun
79780cfb3a
Add FileDragAndDropError
2015-12-08 18:22:11 +01:00
Tim Daubenschütz
2cc02d9599
Increase robustness of coa fetching routine
2015-12-08 14:18:31 +01:00
Tim Daubenschütz
3681260054
Return empty string if file without extension is submitted
2015-12-07 17:14:43 +01:00
Tim Daubenschütz
49421e1fa1
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
2015-12-07 13:39:30 +01:00
Tim Daubenschütz
2b6b78310c
Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio
...
AD-1177 display 404 on pieces and editio
2015-12-07 11:49:39 +01:00
Tim Daubenschütz
b0b8af3305
Merge pull request #2 from ascribe/AD-1149-implement-lumenus-the-lumen-mark
...
Implement marketplace wallets
2015-12-07 10:37:22 +01:00
Brett Sun
3c516c1598
Refactor contract agreement to be a self contained component that can be used in forms
2015-12-03 15:22:17 +01:00
Tim Daubenschütz
d01acea9ce
Nicer formatting for long parametrized function
2015-12-02 14:34:31 +01:00
Tim Daubenschütz
123e2a4d13
Add functionality to avoid sending error messages to sentry
2015-12-02 14:31:42 +01:00
Tim Daubenschütz
5a6c827f0b
Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/ascribe_detail/piece_container.js
2015-11-30 15:00:39 +01:00
Brett Sun
0d6b3710f7
Fix bugs in ErrorQueueStore and deepMatchObject()
2015-11-25 18:58:56 +01:00
Brett Sun
4b91b58adf
Merge branch 'AD-1313-Attach-thumbnail-to-piece-in-register-form' into AD-1360-show-common-upload-errors-to-user
2015-11-25 10:18:40 +01:00
Brett Sun
c270977eb9
Fix default filter on piece list
2015-11-24 19:26:45 +01:00
Brett Sun
efdc5d32e7
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
2015-11-24 10:42:15 +01:00
Tim Daubenschütz
e4cafd4bc3
Fix bug in FB button component & simplify injectHead util
2015-11-23 19:02:28 +01:00
Brett Sun
3e28d6f421
Add functionality to match known errors
...
Implemented as part of AD-1360 and AD-1378 as a way to match an error
situation to a known class of errors so that we can modify behaviour or
show pretty text to the user.
2015-11-23 17:12:47 +01:00
Tim Daubenschütz
2dcd375850
Add functionality for displaying file name upon uploading single file
2015-11-19 10:43:40 +01:00
Tim Daubenschütz
e016ee7446
Merge pull request #12 from ascribe/AD-1242-Frontend-caching-using-local-storage
...
Implement functionality for feature-detecting webStorage
2015-11-16 17:37:29 +01:00
Tim Daubenschütz
ac07107210
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
...
Conflicts:
js/constants/application_constants.js
js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz
339421a4b7
Merge branch 'master' into AD-56-add-social-share-functionality
...
Conflicts:
js/components/ascribe_detail/media_container.js
js/components/ascribe_media/media_player.js
2015-11-16 15:54:49 +01:00
Tim Daubenschütz
da73d40fd6
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
...
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
8188e5ca2f
Merge branch 'master' into AD-1315-implement-submission-flow
2015-11-16 09:41:06 +01:00
Tim Daubenschütz
8b335cfb07
Include feedback from PR
2015-11-13 09:48:22 +01:00
Brett Sun
84e8e4612f
Autofocus message field in consignment form and use custom labels
...
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
2015-11-10 18:24:46 +01:00
Tim Daubenschütz
9ae6b10add
Finalizing basic submission flow with lazy evaluated form
2015-11-09 17:52:09 +01:00
Brett Sun
7c73b7fac7
Refactor InjectInHeadMixin to be a util class instead
2015-11-09 14:32:14 +01:00
Brett Sun
f92fa972bf
Merge with AD-1255
2015-11-06 15:26:37 +01:00
Brett Sun
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Tim Daubenschütz
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Brett Sun
cb6e94c8f1
Forgot to use our own omit instead of lodash's
2015-11-02 18:57:56 +01:00
Brett Sun
0b4cc3123d
Remove lodash dependency
2015-11-02 18:45:06 +01:00
Brett Sun
e890cf5bb1
Cherry pick changes to excludePropFromObject()
2015-11-02 18:37:27 +01:00
