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
76c6cd37a3
Merge pull request #18 from ascribe/AD-1264-refactor-reacts3fineuploader-to-
...
Refactor ReactS3FineUploader to be independent of react-router's location
2015-11-16 15:27:51 +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
893862886f
Merge pull request #24 from ascribe/AD-1315-implement-submission-flow
...
Ad 1315 implement submission flow
2015-11-16 09:43:34 +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
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
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
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
b6773549ee
Add proper CI colors
2015-11-12 12:04:38 +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
af58687572
Add twitter text
2015-11-10 19:33:08 +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
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
8dc0470007
Add Twitter button
2015-11-09 19:01:27 +01:00
Tim Daubenschütz
dced59237b
Remove stupid file
2015-11-09 17:58:09 +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
604544f1da
Merge pull request #20 from ascribe/TimDaub-patch-1
...
Add branch naming conventions to readme.md
2015-11-09 17:53:30 +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
Tim Daubenschütz
b78bc66fe9
Fix minor bugs for simple_prize app
2015-11-06 15:47:55 +01:00
Tim Daubenschütz
f5a5e045a6
Finalize boilerplate for portfolioreview subdomain
2015-11-06 15:18:46 +01:00
