Brett Sun
fc153f4ab7
Add csrf utils
2016-06-14 17:58:00 +02:00
Brett Sun
7014514654
Use UrlResolver to resolve api urls based on white labelling rather than updating ApiUrl's export
...
Keeping an export constant is more predictable and less surprising for
most people.
2016-06-14 17:58:00 +02:00
Brett Sun
de571c7fab
Use js-utility-belt's truncateText
2016-06-14 17:57:59 +02:00
Brett Sun
a4216db6d9
Remove redundant '_utils' suffix in util file names
2016-06-14 17:57:57 +02:00
Brett Sun
71dbad2a18
Add location to context
2016-06-08 14:54:05 +02:00
Brett Sun
5073b0988d
Convert withCurrentUser and withWhitelabel to withContext
2016-06-08 13:53:46 +02:00
Brett Sun
b02695a33a
Convert whitelabel to be passed down through context and withWhitelabel HOC
2016-06-08 13:11:48 +02:00
Brett Sun
b5eda1cdd2
Inject isLoggedIn through withCurrentUser
...
Makes checking for logged in status less error prone than always using
`currentUser.email` or `currentUser.username`.
2016-06-07 14:56:40 +02:00
Brett Sun
d1dba86b1a
Convert currentUser to be passed down through context and withCurrentUser HOC
...
Similar to what react-router did with their router and withRouter HOC.
2016-06-07 14:56:35 +02:00
Brett Sun
7eaa3b1a2b
Inject environment variables into app
...
Injects environment variables into the app through webpack, rather than
script snippets in index.html.
As part of this:
* Updated server.js to use node’s path package to resolve file paths
* Ensure that all url environment variables passed to the app don’t
have a trailing slash, allowing for cleaner template urls
**Note**: There are still a number of constants that should be taken
out of the app and put into environment variables.
2016-06-02 17:14:58 +02:00
Tim Daubenschütz
8b0f27a17d
Merge pull request #154 from ascribe/fix-getlangtext
...
Fix missing cases of getLangText
2016-02-09 09:25:49 +01:00
Brett Sun
d5b71ca438
Fix bool warning for showing webhook events
2016-02-08 17:53:58 +01:00
Brett Sun
0f9e7cd3f6
Fix missing cases of getLangText
2016-02-08 14:50:24 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
9059ca184a
Remove previously missed imports from ContractSettings
2016-01-11 18:26:39 +01:00
Brett Sun
443be236f5
Whitespace fix for comments
2016-01-11 16:26:36 +01:00
Brett Sun
06ea23c627
Update prize routes for loading user and whitelabel settings in top level app
2016-01-11 15:14:54 +01:00
Brett Sun
d622ddac06
Load current user and whitelabel settings in AscribeApp
2016-01-11 12:54:15 +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
