ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 00:28:00 +02:00
Code Issues Releases Wiki Activity
2,461 Commits 115 Branches 0 Tags 13 MiB
3be515402c
Commit Graph

1929 Commits

Author SHA1 Message Date
Tim Daubenschütz
34126c2254 Fix negation of expanded prop of Property 2015-12-04 10:49:41 +01:00
Tim Daubenschütz
5a05a029b7 Merge branch 'AD-1149-additional-details' of github.com:ascribe/onion into AD-1149-additional-details 2015-12-03 21:30:48 +01:00
Tim Daubenschütz
36041d3b51 Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett 2015-12-03 21:30:05 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f9694254c75f0cff46222d895d97dd791: 
- Integrate PropertyCollapsible's functionality to Property
 2015-12-03 20:26:53 +01:00
Tim Daubenschütz
cb19c46dac Implement PropertyCollapsible's functionality into Property 2015-12-03 20:09:27 +01:00
Brett Sun
854b642de8 Merge with main AD-1149 branch 2015-12-03 17:48:33 +01:00
Brett Sun
e69dfeb355 Revert "Merge with AD-1443" 
Revert https://github.com/ascribe/onion/pull/40, as that needs more
work.
 2015-12-03 17:43:15 +01:00
Brett Sun
f5a527b251 Fix references to form due to nested property elements 2015-12-03 17:19:17 +01:00
Brett Sun
9c64cf2b80 Add hot fix from AD-1313 for using refs in properties 
https://github.com/ascribe/onion/blob/AD-1313-Attach-thumbnail-to-piece-
in-register-form/js/components/ascribe_forms/form.js
 2015-12-03 17:17:52 +01:00
Brett Sun
328d60b279 Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty 2015-12-03 15:22:37 +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
Brett Sun
e442e6bcec Make email input be react controlled in loan and consign forms 2015-12-03 15:21:14 +01:00
Brett Sun
e1477be393 Fix typo in PropertyCollapsible declaration 2015-12-03 13:34:24 +01:00
Brett Sun
bde1e454ed Change loan form's startdate and enddate props to be camel case 2015-12-03 13:34:00 +01:00
Brett Sun
3f3ba50aa5 Merge with main AD-1149 branch 2015-12-03 12:51:47 +01:00
Brett Sun
78b8887fbf Fix Cyland landing page 
Fix font family to be Gibson, center vertically.
 2015-12-03 12:44:12 +01:00
Brett Sun
43916625bd Remove header from white labels that have landing pages 2015-12-03 12:41:59 +01:00
Brett Sun
cec652551e Add 23vivi landing page 2015-12-03 12:41:27 +01:00
Tim Daubenschütz
911860ccb5 Finalize cancel and delete functionality for UploadButton 2015-12-03 10:42:55 +01:00
Brett Sun
55bdd4e03f Only show the label or errors part of a Property if they exist 
Fix weird spacing for properties that don’t have labels (ie. checkboxes
for terms of service, etc)
 2015-12-03 00:49:26 +01:00
Brett Sun
61908a82f6 Fix prop type for MarketAdditionalDataForm's submitLabel 2015-12-03 00:48:21 +01:00
diminator
dafdf97678 Merge branch 'AD-1149-implement-lumenus-the-lumen-mark' of github.com:ascribe/onion into AD-1149-implement-lumenus-the-lumen-mark 2015-12-02 21:44:12 +01:00
diminator
565bf308ae tested and fixed ikonotv 2015-12-02 21:42:35 +01:00
Brett Sun
3be033cdd5 Add thumbnail placeholder for 23vivi 2015-12-02 19:31:50 +01:00
diminator
743c11df5b fixed cyland/ikono serializers 2015-12-02 18:56:48 +01:00
Brett Sun
594853535b Fix trailing comma from previous PR merge 
Turns out this is actually illegal in ES6 but on some version of babel,
they don’t care.

Might be an ES7 thing though:
http://www.2ality.com/2015/11/trailing-comma-parameters.html
 2015-12-02 18:28:30 +01:00
Brett Sun
4664a48898 Change additional form's button text when not in registration flow 2015-12-02 18:18:20 +01:00
Tim Daubenschütz
8fcb7fcb01 Fix render bug for personal piece note 2015-12-02 16:51:56 +01:00
Tim Daubenschütz
81f28a02f9 Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null 2015-12-02 16:39:18 +01:00
Brett Sun
2381bd22ac Change nested destructuring formatting 2015-12-02 16:05:21 +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
Brett Sun
07834414c7 Set default name for marketplace wallets to be 'Market' until the white label name loads 2015-12-02 14:26:15 +01:00
Brett Sun
916ec7aace Rearrange handleDrop() to flow more naturally 2015-12-02 13:52:17 +01:00
Tim Daubenschütz
fe24a5e15a Remove all occurrences of inactivity mgmt of ReactS3Fineuploader 2015-12-02 12:37:21 +01:00
Tim Daubenschütz
8b3060d613 Fix simple comments in pr 2015-12-02 12:25:11 +01:00
Tim Daubenschütz
85340a9126 Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay 2015-12-02 12:23:38 +01:00
Tim Daubenschütz
4fe10bb887 Cosmetic changes for EditionContainer & PieceContainer 2015-11-30 18:26:27 +01:00
Tim Daubenschütz
0b2bc1c57b Introduce ReactError mixin for handling errors in React components 2015-11-30 18:23:03 +01:00
Tim Daubenschütz
68f41f7550 Implement boilerplate logic for ReactError 2015-11-30 15:01:07 +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
Tim Daubenschütz
2b6c9777e9 Display actions only if ACLs are available 2015-11-30 13:20:05 +01:00
Tim Daubenschütz
6500af121a Merge pull request #36 from ascribe/AD-706-close-expandable-navigation-after-click 
Bug fix for collapsing nav
 2015-11-30 11:59:47 +01:00
Brett Sun
b4ddec3427 Merge with AD-1443 2015-11-30 11:46:57 +01:00
Brett Sun
3aab73379a Merge with master 2015-11-30 11:43:33 +01:00
Brett Sun
3d017392c1 Only use previous filterBy on refreshing edition lists if no filterBy argument was given 
Also fix the behaviour of refresh using the list’s current length
rather than the previous page size.
 2015-11-30 11:32:48 +01:00
Brett Sun
ea52c54e3a Fix check for determining if a piece's edition list is open 2015-11-30 11:27:15 +01:00
Brett Sun
539c34db48 Fix typo for getDefaultProps() in consign form 2015-11-30 11:19:59 +01:00
Brett Sun
0c02c033e5 Fix consign form when labels aren't give as props 2015-11-27 23:53:54 +01:00
Dimitri De Jonghe
a21e450a93 Merge pull request #39 from ascribe/AD-1403-api-webhooks 
webhooks in settings page
 2015-11-27 18:04:41 +01:00
diminator
d03d1355ff copy for webhooks 2015-11-27 18:02:25 +01:00
Brett Sun
5137fa01a9 Add note for navBar state hack 2015-11-27 14:13:30 +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
Cevo
e482caaa99 public note is visible outside 2015-11-25 21:43:15 +01:00
Tim Daubenschütz
88d1edd45c Add pageExitWarning for SlidesContainer 2015-11-25 15:01:23 +01:00
Tim Daubenschütz
64030473cd Merge pull request #33 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title 
Check for piece and edition validity by using their ids instead of titles
 2015-11-25 11:25:42 +01:00
Tim Daubenschütz
5423f5dcd7 Bug fix for collapsing nav 2015-11-25 11:16:09 +01:00
Tim Daubenschütz
7d4d61e2e6 Restyle progress bar and fix bug in fileSelector 2015-11-25 10:54:29 +01:00
Brett Sun
c270977eb9 Fix default filter on piece list 2015-11-24 19:26:45 +01:00
Brett Sun
e228a4bf15 Dynamically get marketplace name for submit button 2015-11-24 18:18:49 +01:00
Brett Sun
47f56b5505 Add 23vivi to app costs 2015-11-24 18:17:51 +01:00
Brett Sun
2e03ab584a Fix api endpoints 2015-11-24 18:17:38 +01:00
Brett Sun
a72fea5db4 Add 23vivi routes 2015-11-24 12:08:37 +01:00
Brett Sun
ee61369d46 Update market api endpoints 2015-11-24 12:04:18 +01:00
Brett Sun
f7b55e56a9 Split Lumenus into a generic market wallet for 23vivi 2015-11-24 12:04:08 +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
Tim Daubenschütz
809ca6f40a Restructure thumbnail creation functionality 
- Add function in Property and Form for creating refs
- Change `handleSelectFiles` to `handleChangedFile`
- Add `setThumbnailForFile` method to `ReactS3Fineuploader`
 2015-11-23 17:59:20 +01:00
Tim Daubenschütz
59244f208a Fix detachment of DOM <-> browser state 2015-11-23 13:59:07 +01:00
Tim Daubenschütz
56d8268ceb Add remove button for thumbnail creation dialog 2015-11-23 12:31:53 +01:00
Brett Sun
5e45c10baa Check for piece and edition validity by using their ids instead of titles 
Also removed a few unnecessary location props.
 2015-11-23 10:46:20 +01:00
Brett Sun
6649b7d7f1 Implement pause and resume functionality to global notifications 
Also part of this change:
* Handle the notification cooldown periods using status changes rather
than emptying the queue
* Refactor how notifications are rendered
 2015-11-21 19:23:20 +01:00
Tim Daubenschütz
943d62dd8c Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark 2015-11-20 17:59:26 +01:00
Tim Daubenschütz
62d7a5863a Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-11-20 16:20:24 +01:00
Tim Daubenschütz
bccfc0906f Revert super funny-"Important minor fix" 
We better want this not to go live

This reverts commit b77fefb55c.

Conflicts:
	js/constants/application_constants.js
 2015-11-20 16:17:08 +01:00
Tim Daubenschütz
efcc24ab96 Make overall upload progress percentage more visible 2015-11-20 15:24:14 +01:00
Tim Daubenschütz
465bed94a2 Use overallProgress bar all the time 2015-11-20 15:14:25 +01:00
Tim Daubenschütz
96ad05cef4 Unknot (and maybe reknot) layouting for FileDragAndDrop 2015-11-20 15:02:39 +01:00
Tim Daubenschütz
1cf8ac2f31 Various small changes for FileDragAndDrop 
Changed:
  - If only one file submitted: hide file-specific progress bar + filename extension
  - Fix bug for when uploaded file is deleteable (avoid error)
  - Add checkmark for when file was actually submitted
 2015-11-20 14:30:24 +01:00
Tim Daubenschütz
e4479dc95b qMerge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-11-20 14:00:36 +01:00
Tim Daubenschütz
0946ddc0b3 Minor fix 2015-11-20 14:00:10 +01:00
Tim Daubenschütz
f4f89bba43 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 2015-11-20 13:53:03 +01:00
Cevo
dc96e908eb piece note hidden from non-owner 2015-11-20 11:47:41 +01:00
Cevo
c0e0354ce8 fixing the public note bug 2015-11-20 11:11:03 +01:00
Tim Daubenschütz
3a234e42ec Merge branch 'master' of github.com:ascribe/onion 2015-11-20 10:21:35 +01:00
Tim Daubenschütz
b77fefb55c Important minor fix 2015-11-20 10:21:21 +01:00
Cevo
63a32d949a transfer added 2015-11-19 19:47:33 +01:00
Tim Daubenschütz
c0f5351645 Fix badly indentation 2015-11-19 18:09:42 +01:00
Tim Daubenschütz
24f5d4de2b Merge branch 'master' of github.com:ascribe/onion 2015-11-19 17:51:27 +01:00
Tim Daubenschütz
446ed311ea Fix upload/hashing button in FileDragAndDropDialog 2015-11-19 17:51:17 +01:00
Tim Daubenschütz
1318bf5413 Fix indentation fail 2015-11-19 17:36:47 +01:00
diminator
c1f1573f27 change impressum to imprint 2015-11-19 17:35:25 +01:00
Tim Daubenschütz
2aab5d2d0d Fix bug in RegisterPieceForm when defining no editions 2015-11-19 16:16:25 +01:00
Tim Daubenschütz
6d08540d8b Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm 2015-11-19 11:45:29 +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
399f670bed Add variety of supported file formats & fix bug when parsing mime type 2015-11-18 17:55:27 +01:00
Tim Daubenschütz
43c6ee929b Remove PropertyCollapsible 2015-11-18 16:32:07 +01:00
Tim Daubenschütz
25372a3edf Include PropertyCollapsible's functionality into Property 2015-11-18 16:31:37 +01:00
Tim Daubenschütz
6d828ac959 Remove hidden prop from Property 2015-11-17 16:14:20 +01:00
Tim Daubenschütz
1ac2fe7f96 Remove all occurences of 'hidden' prop usage for Property 2015-11-17 15:52:40 +01:00
Tim Daubenschütz
971d42b36d Add file-format-specific call to action for thumbnail generation 2015-11-17 15:46:46 +01:00
Tim Daubenschütz
60bf4b12f5 Merge pull request #29 from ascribe/AD-1281-if-contract-was-appended-to-loan 
Add contract link to loan history
 2015-11-17 14:58:09 +01:00
Tim Daubenschütz
2ffc26d703 Use destructuring for ReactS3Fineuploader props 2015-11-17 13:37:01 +01:00
Tim Daubenschütz
a8ccf13f91 Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady 2015-11-17 12:03:22 +01:00
Tim Daubenschütz
16840a6136 Generalize InputFineuploader's submitFileName method to submitFile 2015-11-17 11:57:18 +01:00
Tim Daubenschütz
14621b5b38 Generalize UploadButton styling 2015-11-17 11:22:24 +01:00
Tim Daubenschütz
4f0c0fe65a Add static version of thumbnail uploader in register piece form 2015-11-17 10:38:10 +01:00
Tim Daubenschütz
efde22270c Add error nullification in sources 2015-11-16 17:44:56 +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
6db353e1a9 Fix indentation 2015-11-16 17:18:24 +01:00
Tim Daubenschütz
f8c923daec Adjust naming for promise-based callback functions in sources 2015-11-16 17:16:13 +01:00
Tim Daubenschütz
ed3624198a Merge branch 'master' into AD-1309-change-share-to-email 
Conflicts:
	js/components/ascribe_buttons/acls/acl_button.js
 2015-11-16 16:55:33 +01:00
Tim Daubenschütz
9a706ebb7d Merge pull request #26 from ascribe/AD-56-add-social-share-functionality 
Add social sharing for Facebook and Twitter
 2015-11-16 16:52:06 +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
c100a3b307 Merge branch 'master' into AD-1340-add-details-video-upload-errors 
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-11-16 16:33:39 +01:00
Tim Daubenschütz
e42df2bb36 Merge branch 'master' into AD-812-cannot-reupload-video-without-refresh 
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-11-16 16:23:23 +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
dd8fe34bb6 Define more strict props & re-change method name to componentWillUpdate again 2015-11-16 15:15:55 +01:00
Tim Daubenschütz
b35d6a1013 Merge pull request #22 from ascribe/AD-1298-for-cyland-add-extra-fields 
Add additional fields to step two of cyland's loan process
 2015-11-16 14:11:34 +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
a95dfe6439 Remove unused imports from AclButton 2015-11-16 13:49:40 +01:00
Tim Daubenschütz
357f63fa2b Add contract link to loan history 2015-11-16 11:45:56 +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
1c172fd887 Last minute editions for usability 2015-11-16 09:39:45 +01:00
Brett Sun
536ce12aac Remove duplicate sentry logging on errors 2015-11-13 17:33:01 +01:00
Brett Sun
1b4bf58129 Log additional details when chunk signing fails 2015-11-13 17:32:20 +01:00
Tim Daubenschütz
633ebc8fb9 Last minute edits 2015-11-13 17:07:21 +01:00
Tim Daubenschütz
5d7f6bf6ed Fix redirect on email submission 2015-11-13 16:51:31 +01:00
Brett Sun
8db531fb87 Add xhr details to sentry logging 
FineUploader’s s3.XhrUploadHandler was also fixed to pass down the xhr
object when initiating a multipart upload fails.
 2015-11-13 16:16:54 +01:00
Brett Sun
eae22a2e04 Move logging of upload errors to be before cancellation of uploads 
Although logging isn’t affected by the cancelation of uploads, it may
cause confusion for readers if the uploads are cancelled before the
error is logged.
 2015-11-13 16:04:55 +01:00
Brett Sun
cef19f427c Add comment for content registration check 2015-11-13 16:02:34 +01:00
Brett Sun
00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +01:00
Brett Sun
09812a1881 Forgot to unlisten to UserStore when unmounting 2015-11-13 13:33:12 +01:00
Brett Sun
7bc5492236 Clear previously selected files from input element when ReactS3FineUploader fails 2015-11-13 12:20:52 +01:00
Brett Sun
4336190b5e Fix FineUploader to handle cancellations in the onError() callback 
Calling cancel() in the onError() callback would cause an error as the
upload handler tries to clear the upload’s xhr requests after cancel
already clears them.
 2015-11-13 12:10:51 +01:00
Tim Daubenschütz
c852eaf143 Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014 
Replace Javascript's Date object with momentjs
 2015-11-13 09:58:12 +01:00
Tim Daubenschütz
19bdf59f46 Include feedback from PR for destructuring props 2015-11-13 09:57:22 +01:00
Tim Daubenschütz
8b335cfb07 Include feedback from PR 2015-11-13 09:48:22 +01:00
Tim Daubenschütz
f5c76af6cb Complete list of supported image file formats on the web 2015-11-12 14:52:03 +01:00
Tim Daubenschütz
da09bd8649 Add link to ToS to submission form 2015-11-12 14:48:57 +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
d1b931715d Add spinner to submission for and make submittable on default with providing error messages 2015-11-12 13:21:10 +01:00
Tim Daubenschütz
1a67cd66f5 Add labeling functionality to UploadButton 2015-11-12 13:08:23 +01:00
Tim Daubenschütz
3be275aefd Add artist contact information 2015-11-12 11:51:33 +01:00
Tim Daubenschütz
5b594e9d82 left-align uploader buttons 2015-11-12 11:27:55 +01:00
Tim Daubenschütz
e6d839f6a0 Add proper validation for multiple uploaders in submission form 2015-11-12 10:46:08 +01:00
Tim Daubenschütz
62f19467b7 Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine 2015-11-11 18:17:32 +01:00
Tim Daubenschütz
0438f461c2 Implement static feedback for submitted pieces 2015-11-11 16:27:50 +01:00
Tim Daubenschütz
66aef4886f Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality 2015-11-11 10:51:45 +01:00
Brett Sun
f3b0b4ffc1 Adjust info text for email 2015-11-10 19:35:42 +01:00
Brett Sun
af58687572 Add twitter text 2015-11-10 19:33:08 +01:00
Brett Sun
e85747144a Add Lumenus landing page 2015-11-10 18:49:08 +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
ea321a4a77 Finalize submission flow with validation and thumbnail creation 2015-11-10 17:35:57 +01:00
Tim Daubenschütz
447ccabf45 Delete UploadFileButton as logic can also be handled in InputFineuploader 2015-11-10 15:52:21 +01:00
Tim Daubenschütz
aec850a905 Improve validation for non-HTML5 inputs 2015-11-10 15:51:24 +01:00
Tim Daubenschütz
62eb78ae76 Add naive & manual validation to Form 2015-11-10 13:40:34 +01:00
Brett Sun
3cfa65cb82 Change instances of "Share" to be "Email" 2015-11-10 11:53:05 +01:00
Brett Sun
2dba4d5156 Use display:none for CollapsibleButton's hidden panel 
Using visibility:invisible is awkward due to the spacing it leaves when
the panel is invisible. The CollapsibleParagraph behaves similarly,
leaving no spacing behind when the paragraph is collapsed.
 2015-11-10 10:32:08 +01:00
Brett Sun
a9f0a46fbd Move social share buttons to left of download button to accommodate for embed button 2015-11-10 10:29:37 +01:00
Tim Daubenschütz
be7fa0c6eb Add conditional redirect after successful registration 2015-11-10 10:15:38 +01:00
Brett Sun
61cd316a86 Merge branch 'AD-1255-refactor-aclbuttons-form-creatio' into AD-1309-change-share-to-email 2015-11-09 20:08:11 +01:00
Brett Sun
8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Tim Daubenschütz
31d9b85ddd Merge pull request #19 from ascribe/Remove-deadcode-fineuploader.min.js 
Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways
 2015-11-09 17:55:35 +01:00
Tim Daubenschütz
9ae6b10add Finalizing basic submission flow with lazy evaluated form 2015-11-09 17:52:09 +01:00
Brett Sun
d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
Tim Daubenschütz
deceb61c60 Implement lazy blob creation routine and increase robustness of upload button template for react-fineuploader 2015-11-09 16:58:35 +01:00
Brett Sun
7c73b7fac7 Refactor InjectInHeadMixin to be a util class instead 2015-11-09 14:32:14 +01:00
Tim Daubenschütz
3e22ad1d9d Finalize layouting submission form 2015-11-09 10:35:23 +01:00
Tim Daubenschütz
7721d62319 Create boilerplate code for portfolioreview 2015-11-06 16:52:08 +01:00
Brett Sun
b100fdd80a Change default collection filter for lumens admin 2015-11-06 16:13:47 +01:00
Tim Daubenschütz
b78bc66fe9 Fix minor bugs for simple_prize app 2015-11-06 15:47:55 +01:00
Brett Sun
f92fa972bf Merge with AD-1255 2015-11-06 15:26:37 +01:00
Tim Daubenschütz
f5a5e045a6 Finalize boilerplate for portfolioreview subdomain 2015-11-06 15:18:46 +01:00
Tim Daubenschütz
5adc34faeb Move and rename sluice prize app to 'simple_prize' 2015-11-06 15:18:36 +01:00
Brett Sun
56eff0d9ed Improve DRYness of acl buttons 
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
 2015-11-06 15:10:29 +01:00
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
Tim Daubenschütz
c17685731a Fix invalidateCache functionality 2015-11-04 11:36:42 +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
Tim Daubenschütz
ecdcbbc25e Fix minor issue 2015-11-03 10:09:44 +01:00
Tim Daubenschütz
35e9bedf04 Convert WhitelabelFetcher to WhitelabelSource 2015-11-03 10:07:44 +01:00
Tim Daubenschütz
6a0c4b4272 Remove user_fetcher.js 2015-11-03 09:52:54 +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
05e3069240 Add propTypes to acl buttons 2015-11-02 18:44:09 +01:00
Brett Sun
e890cf5bb1 Cherry pick changes to excludePropFromObject() 2015-11-02 18:37:27 +01:00
Brett Sun
1a3dffe8bc Modify excludePropFromObject to be similar to lodash.omit() 2015-11-02 18:31:01 +01:00
Brett Sun
955e20d6b6 Reduce dependency footprint of new includes 
Opted for decamelize instead of snake-case as it’s much smaller and we
don’t need the extra functionality of snake-case.
 2015-11-02 18:29:06 +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
f0325f2473 Specify and applying naming conventions 📃 for source and store methods 2015-11-02 16:32:55 +01:00
Tim Daubenschütz
7ce7f4d17d Completing prototype for using alt.js's sources instead of fetchers 2015-11-02 15:47:57 +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
7746241a59 Fix getLangText() when using multiple placeholders 2015-11-02 15:21:27 +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
Tim Daubenschütz
d50aa2913f Remove SessionPersistentStore 2015-11-02 10:00:50 +01:00
Tim Daubenschütz
ff4067e637 Revert "Add first cut on persistent stores" 
This reverts commit bed067f9bc.

Conflicts:
	js/actions/user_actions.js
	js/stores/session_persistent_store.js
	js/stores/user_store.js
	js/utils/feature_detection_utils.js
 2015-11-02 09:59:59 +01:00
Tim Daubenschütz
11f3ab51a3 Revert "Implement functionality for feature-detecting webStorage" 
This reverts commit c7ef23ee40.

Conflicts:
	js/utils/feature_detection_utils.js
 2015-11-02 09:55:53 +01:00
Brett Sun
1e328b722b Sanitize utility should not modify given object 
Mutating arguments and then returning them is redundant and confusing
behaviour (why pass it back if they already have it? Am I getting a new
copy since it returns something?).
 2015-10-30 17:46:51 +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
469f5108a8 Implement cached source for user endpoint 2015-10-30 16:57:03 +01:00
Brett Sun
67fbfbd470 Update RequestActionForm to use form utils 2015-10-30 11:46:01 +01:00
Brett Sun
7e1f6a382a Remove unnecessary import from form utils 2015-10-30 11:16:44 +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
Tim Daubenschütz
bed067f9bc Add first cut on persistent stores 2015-10-29 17:15:26 +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
Tim Daubenschütz
eba9023efc From dom_utils.js, remove useless 'continue' statement in loop/try-catch 2015-10-29 13:22:10 +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
c7ef23ee40 Implement functionality for feature-detecting webStorage 2015-10-28 17:53:52 +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