Brett Sun
af59531fe7
Move fine uploader validation constants into their own file
2016-01-21 12:24:15 +01:00
Brett Sun
5b7a5de332
Merge with master
2016-01-19 17:02:04 +01:00
Brett Sun
31bec7f2f8
Remove extraneous call for fetching webhook events
...
Successfully fetching the webhooks will fetch the events as well.
2016-01-15 14:00:36 +01:00
Brett Sun
91c97afb7c
Small clean up for WebhookSettings
2016-01-15 13:59:41 +01:00
Brett Sun
3467e9f526
Make behaviour of ContractSettingsUpdateButton more robust
...
Also fixes the “Contract could not be updated” notification that would
occur after every attempt to update the contract.
2015-12-21 11:45:50 +01:00
Brett Sun
5a497bae59
Small cleanups and fixes for spacing, unused props, etc
2015-12-21 11:44:13 +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
diminator
d03d1355ff
copy for webhooks
2015-11-27 18:02:25 +01:00
Tim Daubenschütz
7146f00c05
Refactor webhooks: add source, clear state on create hide create on no items left
2015-11-27 13:36:42 +01:00
diminator
1c25f8e776
webhooks in settings without acl
2015-11-27 03:24:37 +01:00
Tim Daubenschütz
14621b5b38
Generalize UploadButton styling
2015-11-17 11:22:24 +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
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
45d5821abb
Refactor UploadButton to resemble HTML5 file chooser input
2015-11-12 14:18:08 +01:00
Tim Daubenschütz
1a67cd66f5
Add labeling functionality to UploadButton
2015-11-12 13:08:23 +01:00
Tim Daubenschütz
3e22ad1d9d
Finalize layouting submission form
2015-11-09 10:35:23 +01:00
Tim Daubenschütz
0770a1ed61
Implement cache invalidation functionality for UserStore & UserSources
2015-11-02 11:31:02 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01: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
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +02:00
diminator
3a503db396
Merged in AD-1174-collecting-society-info-is-showi (pull request #102 )
...
Put CopyrightAssociationForm in AclProxy
2015-10-20 14:41:45 +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
Tim Daubenschütz
1b21bc49ab
Put CopyrightAssociationForm in AclProxy
2015-10-14 16:56:16 +02:00
vrde
66dbf3da71
Add document title management for the ascribe app
2015-10-13 16:42:40 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
Tim Daubenschütz
9a17e44df1
Refactor of wallet app routing
2015-10-01 15:57:46 +02:00
Tim Daubenschütz
f9393c5bb3
Remove all unneccessary react-router imports
2015-10-01 14:36:56 +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
5b41e368ac
Implement AclProxy for hash work in account settings
2015-09-28 12:00:13 +02:00
Tim Daubenschütz
2e6acff56d
Make user email uneditable
2015-09-28 10:02:07 +02:00
diminator
b2cbe2c674
merged
2015-09-25 15:35:36 +02:00
diminator
e6a6c2c2a3
set collapsible default show=true
2015-09-25 15:33:01 +02:00
Tim Daubenschütz
cb452ce7bf
PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex
2015-09-25 15:22:16 +02:00
Tim Daubenschütz
9080c84fa9
Implement word wrap for ContractSettings
2015-09-25 11:20:12 +02:00
Tim Daubenschütz
a6f09c8f35
add acl for update button in ContractSettings
2015-09-23 16:09:12 +02:00
Tim Daubenschütz
74e7c9a3d9
Integrate new ACLOptions into settings
2015-09-23 15:41:12 +02:00
Tim Daubenschütz
2a4bc2af89
separate contract settings from account settings
2015-09-23 15:16:46 +02:00
Tim Daubenschütz
90d6ec20f6
Revert "Revert "acls on 3 levels""
...
This reverts commit c02d1ea3ac
2015-09-22 17:38:25 +02:00
Tim Daubenschütz
c02d1ea3ac
Revert "acls on 3 levels"
...
This reverts commit f1bc400faf
2015-09-22 17:29:07 +02:00
diminator
f1bc400faf
acls on 3 levels
...
whitelabel
user
piece
the higher on the list, the more power (whitelabel overrides user and piece)
2015-09-22 17:23:19 +02:00
Tim Daubenschütz
0819724a10
probably fix dispatch.dispatch error + showing wrong piece data bug
2015-09-21 10:57:10 +02:00
diminator
9d67d046d0
fix currentUser bug
2015-09-21 10:32:35 +02:00
diminator
9bfd50e3bc
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
...
Conflicts:
js/components/signup_container.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
2015-09-21 10:21:44 +02:00
Tim Daubenschütz
afef1214f0
contract expandedDefault to false
2015-09-18 16:04:48 +02:00
Tim Daubenschütz
eb43b18167
make remove in ContractSettings a secondary action
2015-09-18 15:22:57 +02:00
Tim Daubenschütz
63b375ade6
fix separation
2015-09-18 15:17:24 +02:00
diminator
7bccb26d82
acl on contract settings
2015-09-18 09:46:37 +02:00
diminator
b24d4608dd
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 15:59:07 +02:00
Tim Daubenschütz
7c376b7229
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
2015-09-16 15:14:08 +02:00
Tim Daubenschütz
b2a3c9545b
minor corrections
2015-09-16 14:07:55 +02:00
