ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Code Issues Releases Wiki Activity
2,044 Commits 115 Branches 0 Tags 13 MiB
343d6bfea2
Commit Graph

404 Commits

Author SHA1 Message Date
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
Brett Sun
68c1dd9407 Merge with AD1251 2015-11-03 10:48:28 +01:00
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Brett Sun
fe4e337690 Use Object.assign() instead of writing own merge function 2015-11-02 18:27:45 +01:00
Tim Daubenschütz
0157c048ab Add cache invalidation for signup and login 2015-11-02 15:38:37 +01:00
Brett Sun
a0ebc7dc58 Use string formatting for RequestActionForm's notification message 2015-11-02 15:21:33 +01:00
Brett Sun
fe06ea607f Remove unnecessary default props 2015-11-02 15:20: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
Brett Sun
67fbfbd470 Update RequestActionForm to use form utils 2015-10-30 11:46:01 +01:00
Brett Sun
03e0bbd024 Separate form building concerns from AclButton 
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
 2015-10-30 11:10:31 +01:00
Brett Sun
864e0bd2a6 Remove redundant truth check for required prop 2015-10-29 15:45:00 +01:00
Brett Sun
906ef7c37e Refactor InputTextAreaToggable's required property to take a bool instead 2015-10-28 19:19:14 +01:00
Brett Sun
ac1b43d24b Set the consignee email by using the server's white label settings 
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.

Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
 2015-10-26 19:17:06 +01:00
Brett Sun
3dedc93d2e Force consignee to be submissions@lumenus.co 
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
 2015-10-23 14:19:44 +02:00
Tim Daubenschütz
cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz
d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-22 13:38:49 +02:00
Tim Daubenschütz
8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	package.json
 2015-10-20 18:11:41 +02:00
Tim Daubenschütz
ddc2e7b919 Rename intersectAcls to intersectList and do some clean up 2015-10-20 18:10:48 +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
TimDaubenschuetz
d66c201a98 Merged in AD-727-missing-redirects-to-login-page (pull request #95) 
Ad 727 missing redirects to login page
 2015-10-19 10:13:54 +02:00
Tim Daubenschütz
712ec74247 add getLangText 2015-10-16 12:10:28 +02:00
Tim Daubenschütz
32d317cdef add download button to loan form 2015-10-16 11:29:08 +02:00
diminator
ed24ec194e added PR comments 2015-10-15 15:24:40 +02:00
Tim Daubenschütz
8bb971d9df Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/cyland/cyland_landing.js
 2015-10-15 11:55:44 +02:00
Tim Daubenschütz
d77bdb25a5 Cleanup code 2015-10-15 11:17:16 +02:00
Tim Daubenschütz
a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-15 10:06:39 +02:00
diminator
c24021302f Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_hero.js
 2015-10-14 17:25:53 +02:00
diminator
317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
vrde
2869cbc125 Disable eslint check on specific proptype 2015-10-14 15:49:04 +02:00
vrde
01cea9ad3d Property component now propagate its name to its input child 2015-10-14 15:30:10 +02:00
Cevo
b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
diminator
6175775503 property blur refactor 2015-10-12 17:59:45 +02:00
diminator
8d970a65c4 spinners in forms 
button wide
 2015-10-12 17:55:02 +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
299007baab Refactor redirect and redirectAuthenticated 2015-10-09 13:51:21 +02:00
Tim Daubenschütz
f066971ccc Finalize ProxyRoute and RedirectProxyRoute 2015-10-06 18:28:15 +02:00
Tim Daubenschütz
28dfcfa75a Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/components/ascribe_detail/edition.js
	js/components/ascribe_forms/form_login.js
	js/components/ascribe_forms/form_signup.js
 2015-10-06 16:40:02 +02:00
Tim Daubenschütz
9a17e44df1 Refactor of wallet app routing 2015-10-01 15:57:46 +02:00
diminator
5f201ad76a fix redirect 2015-10-01 15:38:37 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
957d0c66c9 minor fixes for last commit 2015-10-01 11:24:19 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
diminator
dfa01a0dde signup fix 
consign redirect
 2015-10-01 09:45:12 +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
diminator
bbae33a40f avoid dispatcherror when switching to signup 2015-09-30 17:07:18 +02:00
diminator
0d6e82a45d WIP signup/login redirect and redirectAuthenticated 2015-09-30 17:05:40 +02:00
Tim Daubenschütz
5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz
62e85c66ac Rename 'Send loan request' to 'send contract' for ikonoTv 2015-09-28 11:51:02 +02:00
Tim Daubenschütz
afef5db150 Add proper button to create editions form 2015-09-28 10:19:12 +02:00
diminator
5ddf89e020 forward to collection after contract sent 2015-09-25 15:39:36 +02:00
Tim Daubenschütz
4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-23 14:22:09 +02:00
Tim Daubenschütz
4acbc2c923 fix InputTextareaToggable 2015-09-23 14:12:33 +02:00
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz
33b8e51aee Fix react warning for select inputs 2015-09-22 14:13:04 +02:00
Tim Daubenschütz
878a716262 Remove 'learn more' from contract form 2015-09-22 13:20:55 +02:00
Tim Daubenschütz
31ffc4262a change text in signup form 2015-09-22 11:41:10 +02:00
Tim Daubenschütz
6102ed3bb4 update react textarea autosize 2015-09-21 16:10:25 +02:00
Tim Daubenschütz
c756024702 Add whitelabel tailored extra_data forms to piece detail 2015-09-21 15:08:24 +02:00
Tim Daubenschütz
652df66cb3 Fix some issues with smelly code 2015-09-21 14:22:52 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
Tim Daubenschütz
3cbcfc17a3 Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-21 10:57: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
ec0208358d added appendix 2015-09-21 10:54:13 +02:00
diminator
2486158c12 .required => .isRequired 2015-09-21 10:47:24 +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
vrde
004aa16b3f Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-18 15:43:30 +02:00
Tim Daubenschütz
e05249eacb WIP fix wrong input fields bug 2015-09-18 14:50:08 +02:00
Tim Daubenschütz
2cbf7d0095 Implement PR Feedback 2015-09-18 14:12:50 +02:00
diminator
2bd148407b Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields 2015-09-17 14:22:19 +02:00
diminator
ff163df61e PR update 2015-09-17 14:20:46 +02:00
Tim Daubenschütz
780ab9f7f1 Cleanup window.setTimeout 2015-09-17 13:28:59 +02:00
diminator
63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
Cevo
cf39b1e708 min year changed to 1 2015-09-17 11:17:47 +02:00
diminator
5c2ec3ffb0 bug fix signup query 
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
 2015-09-16 23:27:38 +02:00
diminator
a85447e94c bug fix user token on signup/login 2015-09-16 19:00:59 +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
diminator
d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
Tim Daubenschütz
f0936b9074 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 17:19:50 +02:00
Tim Daubenschütz
2656bdac14 correct query parameters for contract list request 2015-09-15 17:18:38 +02:00
Tim Daubenschütz
497a330e1a Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 13:56:31 +02:00
diminator
4ae137ee9e Merged in AD-924-apply-contractagreements-to-loan- (pull request #57) 
Ad 924 apply contractagreements to loan
 2015-09-15 13:43:21 +02:00
diminator
06f5b61cad reset agreements on mount of loan_form 2015-09-15 13:37:18 +02:00
Tim Daubenschütz
ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
 2015-09-15 13:30:24 +02:00
diminator
71f94768d9 fix PR comments 2015-09-15 13:22:52 +02:00
Tim Daubenschütz
c5ef3cacd5 add ContractSettingsUpdateButton boilerplate code 2015-09-15 11:50:23 +02:00
Tim Daubenschütz
280f3bc73a Add input filter for specific file extensions to react fineuploader 2015-09-15 10:15:56 +02:00
diminator
0ce298879b fixed tests 
refactored contractagreement actions
 2015-09-14 17:53:50 +02:00
Tim Daubenschütz
209d141939 extend fileClassToUpload functionality and implement it in contract settings 2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff add fileclassToUpload to react fineuploader 2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec make contract creation implicit 2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544 rename fineuploader's submitKey method to submitFile 2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings 
Conflicts:
	js/components/ascribe_forms/property.js
 2015-09-14 14:23:36 +02:00
diminator
7fd5516b79 contract, contractagreement migration 
contractagreement added to loanpiece
 2015-09-14 14:16:53 +02:00
Tim Daubenschütz
e087e9f332 PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js 2015-09-14 11:36:24 +02:00
Tim Daubenschütz
356483f9ca Fix bug for resetting non-native HTML inputs in form 2015-09-14 10:49:45 +02:00
diminator
ef22707680 create public agreement 2015-09-11 18:23:31 +02:00
Tim Daubenschütz
c8ece4c532 refactor contract creation form 2015-09-11 10:11:07 +02:00