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
1,926 Commits 115 Branches 0 Tags 13 MiB
2381bd22ac
Commit Graph

1516 Commits

Author SHA1 Message Date
Brett Sun
318a0bf4b2 Filter the collection to only show the consignable items by default 2015-11-06 14:10:54 +01:00
Brett Sun
799ccb9b8d Show unconsign button 2015-11-06 14:01:26 +01:00
Brett Sun
fb62d2d2e0 Check for completion of additional data on front end 
In the end, it made more sense to check if all the additional details
have been filled in on the front end than receiving an acl or flag from
the backend.
 2015-11-06 14:00:58 +01:00
Brett Sun
04e453b28c Fix lumenus edition endpoint 2015-11-05 16:05:20 +01:00
Brett Sun
6223248ea0 Fix lumenus whitelabel api endpoints 2015-11-05 13:51:40 +01:00
Brett Sun
4ca8ca8feb Show AdditionalDetailsModal from SubmitButton when details need to be filled in 2015-11-05 11:58:32 +01:00
Brett Sun
adf0d411d6 Fetch piece data in AdditionalDetailForm 
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
 2015-11-05 11:56:17 +01:00
Tim Daubenschütz
8892ac4225 Add additional fields to step two of cyland's loan process 2015-11-05 11:56:09 +01:00
Brett Sun
3fb4ae55bf Merge with AD-1290 2015-11-04 14:04:16 +01:00
Brett Sun
2711c4ddb9 Move onChange() to after componentWillUnmount() for ESLint 2015-11-04 13:57:15 +01:00
Brett Sun
543605aae3 Move store resets to componentDidMount() 2015-11-04 13:56:43 +01:00
Brett Sun
85eb45b5cd Add small changes for previous merges that were missed 2015-11-04 00:41:12 +01:00
Tim Daubenschütz
9a54ebdbd7 Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be- 
Refactor ModalWrapper to not require a trigger component
 2015-11-03 17:21:11 +01:00
Brett Sun
3929712e9d Prune unnecessary divs from some components 2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb Change lumens buttons for AD-1264 changes 2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255 Merge with AD-1264 2015-11-03 11:34:48 +01:00
Brett Sun
581549870f Merge with AD-1256 2015-11-03 11:13:44 +01:00
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +01:00
Brett Sun
f2555aefcc Add email prop to loan and consign button 2015-11-03 11:12:04 +01:00
Tim Daubenschütz
c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Brett Sun
3a8f91e29e Change required prop for AD1251 changes 2015-11-03 10:49:06 +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
Tim Daubenschütz
4d526a5568 Merge pull request #11 from ascribe/AD-1251-refactor-inputtextareatoggables- 
Refactor InputTextAreaToggable's required property to take a bool instead of a string
 2015-11-03 10:25:46 +01:00
Tim Daubenschütz
cd4157df32 Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways 2015-11-03 10:21:43 +01:00
Brett Sun
05e3069240 Add propTypes to acl buttons 2015-11-02 18:44:09 +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
8540e3de36 Bring over missed changes for cyland for changes to form utils 2015-11-02 15:36:18 +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
6c8016e094 Remove misleading editions prop to pieceOrEditions 2015-11-02 15:19:52 +01:00
Brett Sun
49f20462f1 Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate 
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
 2015-11-02 12:10:41 +01:00
Tim Daubenschütz
0770a1ed61 Implement cache invalidation functionality for UserStore & UserSources 2015-11-02 11:31:02 +01:00
Brett Sun
5f5461c10d Remove warning for missing prop from FurtherDetailsFileUploader 2015-11-02 10:42:15 +01:00
Brett Sun
a513af984d Update cyland for FineUploader changes 2015-11-02 10:41:59 +01:00
Tim Daubenschütz
147c852b02 Replace getFullYear() with getUTCFullYear() 2015-11-02 10:32:48 +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
5bec3c5dc6 Use const for the cloned trigger element 2015-10-30 11:13:32 +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
c242cffdbd Bring over changes for acl_button from Lumenus 2015-10-29 17:04:31 +01:00
Brett Sun
22234492e6 Refactor ModalWrapper to not require a trigger component 2015-10-29 16:23:02 +01:00
Brett Sun
864e0bd2a6 Remove redundant truth check for required prop 2015-10-29 15:45:00 +01:00
Cevo
3cf59ae2af added public note to piece 2015-10-29 15:31:25 +01:00
Tim Daubenschütz
590818cf0b Merge pull request #10 from ascribe/cleanup-utility-file-declarations 
Move code from head_setter.js to dom_utils.js and adjust function-com…
 2015-10-29 13:25:15 +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
784098f225 Fix PropType warnings for components in ascribe_detail 2015-10-28 18:37:09 +01:00
Tim Daubenschütz
66b86209bf Add appropriate spaces to import statement in header.js 2015-10-28 17:55:44 +01:00
Tim Daubenschütz
ee4c8f624e Move code from head_setter.js to dom_utils.js and adjust function-comments 2015-10-28 17:45:28 +01:00
Tim Daubenschütz
cc8e455a0e Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent 
Change delete button back to old styling
 2015-10-28 15:56:02 +01:00
Brett Sun
c72a5aa308 Add Lumenus specific data forms to edition and piece details 2015-10-28 11:26:54 +01:00
Tim Daubenschütz
5788e77501 Merge pull request #9 from ascribe/AD-1219-sort-by-and-filter-drop-down-widget-are-cut-off 
Pull DropdownButtons in collection to the right, to make them work al…
 2015-10-27 18:11:00 +01:00
Brett Sun
82b49fc653 Add additional required properties for Lumenus 
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
 2015-10-27 17:54:35 +01:00
Tim Daubenschütz
6217663fe0 Pull DropdownButtons in collection to the right, to make them work also on mobile 2015-10-27 17:34:31 +01:00
Tim Daubenschütz
d617f7212f Merge pull request #7 from ascribe/AD-1237-navbar-ascribe-logo-doesnt-link 
AD-1237 Navbar Ascribe Logo Doesn't Link
 2015-10-27 17:19:44 +01:00
Tim Daubenschütz
9765ed040b Add tertiary button style 2015-10-27 17:15:23 +01:00
Brett Sun
633939b7fa Use AclButton in LumenusSubmitButton 
Instead of copying functionality from AclButton to add a default email,
LumenusSubmitButton just returns one with preset settings.
 2015-10-27 17:01:50 +01:00
Tim Daubenschütz
12c7fa7ba4 Change delete button back to old styling 2015-10-27 16:32:26 +01:00
Brett Sun
7e438dcaf5 Add link to /collection to ascribe branding on navbar 2015-10-27 11:44:40 +01:00
Tim Daubenschütz
dc813f2687 Merge pull request #4 from ascribe/AD-1075-year-before-1000-starts-with-0 
Fix correct year extraction from date-string in edition and piece detail
 2015-10-27 10:59:29 +01:00
Tim Daubenschütz
969d2f8b34 Merge pull request #5 from ascribe/AD-1209-Sort-by-widget-is-using-wrong-native-UI-elements 
Change input type in PieceListToolbarOrderWidget from "checkbox" to "…
 2015-10-27 10:56:21 +01:00
Tim Daubenschütz
4dbed67a63 Merge pull request #3 from ascribe/AD-1229-aclinformation-button-on-no-available-buttons-fails 
Login validation for ACL actions in edition and piece detail
 2015-10-27 10:53:49 +01:00
Tim Daubenschütz
576fa39167 Fix wrong pushState invocation 2015-10-27 09:59:46 +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
Tim Daubenschütz
fc4d4dbe17 Change input type in PieceListToolbarOrderWidget from "checkbox" to "radio" 2015-10-26 17:12:24 +01:00
Tim Daubenschütz
384ec0f445 Fix correct year extraction from date-string in 
AccordionListItemWallet
WalletPieceContainer
 2015-10-26 16:20:33 +01:00
Tim Daubenschütz
42733740db Fix correct year extraction from date-string in 
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
 2015-10-26 16:07:31 +01:00
Tim Daubenschütz
1207522266 Fix correct year extraction from date-string in edition and piece detial view 2015-10-26 15:39:33 +01:00
Tim Daubenschütz
d48da96e3b Add login-validation to actions DetailProperty in Edition and Piece detail view 2015-10-26 11:21:22 +01:00
Brett Sun
84c459c426 Revert changes to allow piece list to filter ACLs 
We can do this with the backend instead.
 2015-10-26 11:09:04 +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
TimDaubenschuetz
d0f6f1571d Merged in AD-538-users-and-even-devs-are-unsure-wh (pull request #94) 
Ad 538 users and even devs are unsure wh
 2015-10-23 11:25:50 +02:00
Tim Daubenschütz
3bf70628c1 Finalizing behavior of AclInformation 2015-10-23 11:24:26 +02:00
Tim Daubenschütz
cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz
e8a9cd89a4 Add resizing functionality to AclButtonList and AclInformation 2015-10-23 09:29:17 +02:00
Tim Daubenschütz
b77beb0b1e Replace last occurences of ascribe-spool-chunked 2015-10-22 17:17:38 +02:00
Brett Sun
e226477424 Merge with master 2015-10-22 14:18:23 +02:00
Brett Sun
7ba7e26d5b Fix typo in edition api url 2015-10-22 14:14:06 +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
ef14fc9b2e Fix edition deletion redirect 2015-10-22 13:21:07 +02:00
Tim Daubenschütz
68b608763a Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow 
Conflicts:
	js/components/header.js
	js/utils/head_setter.js
 2015-10-22 12:00:59 +02:00
TimDaubenschuetz
e16198e3ab Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104) 
Ad 1080 restyle webapp with new corporate identity
 2015-10-22 11:55:34 +02:00
Sylvain Bellemare
ffb699f3f3 Point to apiary-based docs - fixes AD-1218 2015-10-22 11:52:14 +02:00
Brett Sun
ba777781b7 Add sliding piece registration with dummy additional form 2015-10-22 11:13:44 +02:00
Tim Daubenschütz
b2a9eb1c7c Add thumbnail replacement for new logo 2015-10-22 10:39:11 +02:00
Tim Daubenschütz
7f97ce9828 Handle deletion method for WalletPieceContainer 2015-10-21 23:45:53 +02:00
TimDaubenschuetz
bb18676020 Merged master into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-21 21:25:49 +02:00
Brett Sun
0c51eb374e Add Lumenus specific piece list 2015-10-21 17:37:29 +02:00
Tim Daubenschütz
a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Brett Sun
7116133337 AD-1194 Create front-end host configs 
Default route components to be replaced with Lumenus specific ones.
 2015-10-21 14:10:21 +02:00
Tim Daubenschütz
61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz
cd1cdfeede Change font-weights, remove gibson from local CSS file and fix glitches 2015-10-21 10:35:11 +02:00
Brett Sun
f1e9f4a0c8 Add missing space to accordion list placeholder 2015-10-21 09:57:40 +02: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
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
8417c2781e Making AclInformation more robust by adding checks for if the information to display is available 2015-10-20 18:00:59 +02:00
Tim Daubenschütz
738e94a43d Change helper texts 2015-10-20 17:22:40 +02:00
Tim Daubenschütz
beee069d3f Minor layouting fixes 2015-10-20 15:51:22 +02:00
Tim Daubenschütz
22a95f07fd Further cleanup 2015-10-20 15:10:18 +02:00
vrde
e220ee6fbb Merge branch 'AD-697-update-title-in-the-browser' 2015-10-20 15:06:41 +02:00
vrde
a1827b329c Merge branch 'AD-1195-window-videojs-is-not-a-func' 2015-10-20 15:04:47 +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
vrde
1a6ddf67ac Add fall back if client cannot load 3rd party libs 2015-10-20 14:16:49 +02:00
vrde
7ce98d0433 Fix comments on PR 2015-10-19 17:24:49 +02:00
TimDaubenschuetz
5a35e40a76 Merged in AD-947-fileuploader-button-does-not-work (pull request #100) 
Remove stopPropagation for event in FileDragAndDrop
 2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed Fix simulate click for Opera 2015-10-19 14:22:20 +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
b964bde281 Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-16 13:10:44 +02:00
Tim Daubenschütz
69e75f5ce0 Add AscribeSpinner to LogoutContainer 2015-10-16 13:10:18 +02:00
Tim Daubenschütz
5e6e2e8cb0 Redirect directly to /login on loggout 2015-10-16 13:01:54 +02:00
diminator
f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +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
TimDaubenschuetz
e804722c71 Merged in AD-679-concept-of-drag-is-nonsensical-fo (pull request #103) 
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
 2015-10-15 15:16:51 +02:00
TimDaubenschuetz
9dec5eab1d Merged in AD-744-search-filter-not-working-i-type- (pull request #97) 
Ad 744 search filter not working i type
 2015-10-15 15:16:33 +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
702f1d29f3 Styling 2015-10-15 11:41:46 +02:00
Tim Daubenschütz
c7c83083d3 change layout of AclButtonList 2015-10-15 11:32:34 +02:00
Tim Daubenschütz
d77bdb25a5 Cleanup code 2015-10-15 11:17:16 +02:00
Tim Daubenschütz
2c8f262826 Add isRequired to aim prop 2015-10-15 10:21:21 +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
Tim Daubenschütz
2b00bfeb4f Revert "Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity" 
Remove AD-756 from PR

This reverts commit 097e158e50, reversing
changes made to 6175775503.

Conflicts:
	js/components/header.js
 2015-10-14 17:41:44 +02:00
Cevo
602675ccb4 set title pull req comment handled 2015-10-14 17:29:14 +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
Tim Daubenschütz
8b23a9c74f Introduce draganddrop feature detection and add it to FileDragAndDropDialog 2015-10-14 17:19:01 +02:00
diminator
b54beae322 cyland 
cc
 2015-10-14 17:13:16 +02:00
Tim Daubenschütz
1b21bc49ab Put CopyrightAssociationForm in AclProxy 2015-10-14 16:56:16 +02:00
Tim Daubenschütz
713eea03cc Better robustness for slides container and register form for cyland 2015-10-14 16:20:51 +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
Tim Daubenschütz
dab7503601 Refactor SlidesContainer to only use queryParams to keep slidepage state 2015-10-14 14:22:53 +02:00
Cevo
a0ab076943 acl information render refactored 2015-10-14 13:30:51 +02:00
Cevo
f0761ec36b acl information render refactored 2015-10-14 12:16:49 +02:00
diminator
a457439347 sluice styling 2015-10-14 12:12:06 +02:00
Cevo
2d87533009 prop types added 2015-10-14 11:41:16 +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
vrde
2967a29f2e Set title to edition/piece containers 2015-10-13 17:52:45 +02:00
Tim Daubenschütz
3321379a8f bug fix for going to a piece when in a search 2015-10-13 17:30:49 +02:00
vrde
21c84774c8 Add document title for wallets 2015-10-13 17:29:53 +02:00
Tim Daubenschütz
ea40181805 add 'clear search' dialog to AccordionList and implement functionality in SearchBar 2015-10-13 17:28:10 +02:00
vrde
84d2dd7701 Add document title for prize 2015-10-13 17:02:03 +02:00
vrde
66dbf3da71 Add document title management for the ascribe app 2015-10-13 16:42:40 +02:00
TimDaubenschuetz
7af4e0912e Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98) 
Ad 972 remove 50mb limit in additional f
 2015-10-13 16:42:04 +02:00
Tim Daubenschütz
4627381c16 add getLangText 2015-10-13 16:41:35 +02:00
Tim Daubenschütz
984761a386 Remove stopPropagation for event in FileDragAndDrop 2015-10-13 16:12:05 +02:00