Brett Sun
1b08f915c2
Use the activeRoute prop to generate route classnames on whitelabels
2016-02-03 12:38:55 +01:00
Brett Sun
946d80e94f
Merge with main AD-1396 branch
2016-02-03 12:34:44 +01:00
Brett Sun
1c1719807e
Use previous method from white labels to get the current active route
2016-02-03 12:28:49 +01:00
Brett Sun
15c7baf5d4
Hide footers for all whitelabel pages
2016-02-01 15:28:35 +01:00
Brett Sun
d6e5111f43
Add route class names to prize app
2016-02-01 14:52:05 +01:00
Brett Sun
8527627db0
Hide the footer if a route has the hideFooter
attribute
2016-02-01 14:49:48 +01:00
Brett Sun
50d50c66ee
Change children
prop from react-router to only be a Element type
...
Judging by
https://github.com/rackt/react-router/blob/master/docs/API.md#children-1
and a few inspections in the code, as well as tests, the `children`
prop injected into routes can only ever be a single React Element
object.
This allows us to easily get the active route of a child (if there is
an active route) by querying the `children`’s route prop.
2016-02-01 14:48:44 +01:00
Brett Sun
6fc3a58567
Merge branch 'AD-1519-visual-regression-cli' into AD-1396-log-404-page-views-when-previous-view-was-within-the-app
2016-02-01 10:18:57 +01:00
Brett Sun
76a413cee1
Merge with master
2016-02-01 10:18:30 +01:00
Brett Sun
841cc05525
Merge with master
2016-01-29 11:35:43 +01:00
Brett Sun
7383fbb1f6
Standardize CoaVerify route across apps
2016-01-29 11:20:43 +01:00
Brett Sun
01217318a4
Add ids to dropdown buttons, as per warnings
...
Also helps us find these dropdown buttons with Gemini.
2016-01-29 11:20:27 +01:00
Tim Daubenschütz
f2542f99bd
Merge pull request #141 from ascribe/AG-139-specific-file-formats-leads-to-wrong-preview-sizing
...
AG-139 Extract extension using file name rather that mime type for uploader preview
2016-01-28 10:03:18 +01:00
Brett Sun
627b2f75fe
Extract extension using file name rather that mime type for uploader preview
...
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
2016-01-26 13:41:15 +01:00
Tim Daubenschütz
83eadf8528
Merge pull request #119 from ascribe/AG-109-marketplace-thumbnail-uploader-does-not-use-validation
...
AG-109 Marketplace thumbnail uploader does not use validation
2016-01-26 11:58:51 +01:00
Brett Sun
be081b6655
Fix check for allowed extensions in ReactS3FineUploader
2016-01-26 11:34:12 +01:00
Brett Sun
ba3c7db6cd
Reorder methods in ReactS3FineUploader
2016-01-26 11:33:38 +01:00
Tim Daubenschütz
d8f2423344
Merge pull request #95 from ascribe/add-default-should-redirect
...
Collection should redirect to Register Work when a user does not have pieces yet
2016-01-26 11:08:32 +01:00
Tim Daubenschütz
3d43cd8505
Remove 'disabledOn' for prize routes
2016-01-26 11:07:41 +01:00
Tim Daubenschütz
74c8abdf51
Merge pull request #135 from ascribe/AG-124-display-correct-file-type-in-download-button
...
Fix wrong file endings for files that do not have extensions
2016-01-26 10:47:37 +01:00
Tim Daubenschütz
79a1dc0e08
Fix wrong file endings for files that do not have extensions
...
Closes #130
2016-01-25 11:01:28 +01:00
Brett Sun
64c02d4d65
Remove duplicate 'name' propType in PieceExtraDataForm
...
You would not believe how much pain this has caused me with PhantomJS...
2016-01-22 00:03:49 +01:00
Tim Daubenschütz
9f0a071473
Merge pull request #128 from ascribe/AG-127-remove-hash-option-for-thumbnail
...
Remove hash option for thumbnail
2016-01-21 17:33:17 +01:00
Brett Sun
aef3bf5094
Remove hash option for thumbnail
2016-01-21 17:20:45 +01:00
Tim Daubenschütz
26455b856c
Merge pull request #125 from ascribe/AG-124-display-correct-file-type-in-download-button
...
Extract file extension from amazon S3 link
2016-01-21 17:14:25 +01:00
Brett Sun
27f1b7e9b4
Add default redirect for empty collections
2016-01-21 16:47:57 +01:00
Brett Sun
9559bc09b4
Disable 'Collection' header item when no pieces are found for the user
...
The disabling only happens when the piece list is fetched, which may
not happen immediately in some cases (ie. logged in user goes straight
to another person’s edition first). We’re not able to fetch the piece
list immediately, as some white labels apply default filters on the
piece list which forces them to wait until they can begin fetching
their piece lists.
2016-01-21 16:47:35 +01:00
Tim Daubenschütz
d9755f3563
Extract file extension from amazon S3 link
2016-01-21 16:24:17 +01:00
Tim Daubenschütz
b81cd76d10
Change language in detail pages:
...
- "BY" => "CREATED BY"
- "REGISTREE" => "ASCRIBED BY"
2016-01-21 15:17:19 +01:00
Brett Sun
9b1e6cc8a1
Small stylistic changes to Header and NavRoutes
2016-01-21 15:11:19 +01:00
Tim Daubenschütz
80b4e22435
Cancel dragged invalid file with proper messaging
2016-01-21 13:53:14 +01:00
Brett Sun
4dd701a414
Add extension validation to marketplace thumbnail uploader
2016-01-21 12:24:31 +01:00
Brett Sun
af59531fe7
Move fine uploader validation constants into their own file
2016-01-21 12:24:15 +01:00
Brett Sun
a23dd99b94
Merge pull request #98 from ascribe/AD-1417-turn-links-in-further-details-into-anchors
...
AD-1417 Turn links in further details into anchors
2016-01-20 12:41:36 +01:00
Brett Sun
a85c70798e
Fix mistaken check for form buttons
2016-01-20 12:32:49 +01:00
Brett Sun
0045dc6981
Add anchorization to whitelabel forms
2016-01-20 12:31:02 +01:00
Brett Sun
d75a2d257d
Merge with master
2016-01-19 19:36:30 +01:00
Brett Sun
5b7a5de332
Merge with master
2016-01-19 17:02:04 +01:00
Brett Sun
c6afea2583
Calculate max thumbnail size instead of hard coding it on the registration form
2016-01-19 16:54:08 +01:00
Brett Sun
762af44fbb
Merge with master
2016-01-19 16:28:52 +01:00
Brett Sun
2e8d1faaca
Remove duplicate onRatingClick missed during merge
2016-01-19 15:59:43 +01:00
Brett Sun
d0d4f773c8
Re-add missed fetch for prize during merge
2016-01-19 15:57:49 +01:00
Brett Sun
f93cd93eff
Merge with master
2016-01-19 15:53:51 +01:00
Brett Sun
fbc1a43bf0
Merge with master
2016-01-19 15:28:50 +01:00
Brett Sun
9c1b229d85
Forgot to remove unnecessary import
2016-01-19 15:16:12 +01:00
Brett Sun
86ff1f88d0
Fix small issues
2016-01-19 15:15:33 +01:00
Brett Sun
efbc605fc8
Standardize render structure across main app and white label apps
...
Also fixes some whitelabel landing pages broken from the
standardization and removes unnecessary class names
2016-01-19 15:04:46 +01:00
Brett Sun
7e1cfbb490
Add AppBase HOC to improve DRYness of functionality reused across apps
2016-01-19 15:00:50 +01:00
Brett Sun
dbdef3ce6b
Merge branch 'master' into AD-1452-share-to-facebook-not-loaded
2016-01-19 10:18:52 +01:00
Tim Daubenschütz
3984469f38
Fix input for FacebookShareButton
2016-01-19 09:10:33 +01:00