ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity
2,380 Commits 115 Branches 0 Tags 13 MiB
8f2ace77af
Commit Graph

2380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Daubenschütz
6821ab9e44 Merge branch 'master' of github.com:ascribe/onion 2016-01-22 15:54:14 +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
Tim Daubenschütz
0d2a8504ba Merge pull request #123 from ascribe/AG-118-Change-BY-to-CREATED_BY-in-detail-pages 
Change language in detail pages
 2016-01-21 17:02:20 +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
a94098c0a0 This is only for heroku 2016-01-21 16:32:59 +01:00
Tim Daubenschütz
d9755f3563 Extract file extension from amazon S3 link 2016-01-21 16:24:17 +01:00
vrde
d20c6baae6 Merge branch 'master' into AD-1528-set-up-integration-testing-on-onion 2016-01-21 15:48:16 +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
32a8e2d789 Add rule for branch naming with Github issues 2016-01-21 11:04:27 +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
f8193a5e16 Change alignment of global notifications 
Use left text alignment for desktop  and center alignment for mobile
notifications.

Also adds a slight transition delay before showing the notification
because react can sometimes be slow at rendering the notification’s
message, making it initially appear invisible.
 2016-01-19 18:07:04 +01:00
Brett Sun
405a46dca3 Merge pull request #84 from ascribe/AD-1531-contract-settings-buttons-look-weird 
AD-1531 Contract settings buttons look weird
 2016-01-19 17:09:26 +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
2f4534f14e Merge pull request #90 from ascribe/refactor-subdomain-settings 
Refactor subdomain settings constants
 2016-01-19 16:43:06 +01:00
Brett Sun
7b9c9eca24 Merge with master 2016-01-19 16:39:19 +01:00
Brett Sun
93c2ea99e9 Merge pull request #73 from ascribe/AD-1510-limit-create-editions-to-100 
AD-1510 Limit edition creation to 1-100
 2016-01-19 16:29:32 +01:00
Brett Sun
762af44fbb Merge with master 2016-01-19 16:28:52 +01:00
Brett Sun
77c88cbd0f Merge pull request #66 from ascribe/only-fetch-ratings-if-authorized 
Avoid unauthorized attempts at fetching ratings if user isn't an admin, judge, or jury
 2016-01-19 16:05:22 +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
c27a0ab607 Merge pull request #65 from ascribe/AD-1490-hide-download-button-on-thumbnails-during-registration 
Hide download button on the marketplace additional data form's thumbnail image during registration
 2016-01-19 15:29:34 +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
0304009a9b Merge pull request #97 from ascribe/AD-1452-share-to-facebook-not-loaded 
AD-1452 Facebook share button sometimes not loading
 2016-01-19 10:19:47 +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
Brett Sun
0382704098 Merge pull request #100 from ascribe/AD-1453-add-functionality-to-avoid-sending-error-messages-to-sentry 
Use Raven's `ignoreErrors` configuration option to ignore certain errors
 2016-01-18 18:30:38 +01:00
Brett Sun
3587a7ae4f Merge pull request #102 from ascribe/remove-unused-prize-list-components 
Remove unused PrizeList store and action
 2016-01-18 18:29:44 +01:00
Brett Sun
58289c4b9c Merge pull request #103 from ascribe/small-cleanup-for-webhook-settings 
Small cleanup for webhook settings
 2016-01-18 18:29:31 +01:00
Brett Sun
821fe79461 Merge pull request #105 from ascribe/AD-1558-piece-and-edition-detail-show-stale-data 
AD-1558 Piece and edition detail show stale data
 2016-01-18 14:31:42 +01:00
Brett Sun
aa00415a83 Merge with master 2016-01-18 14:15:19 +01:00
Brett Sun
ef33149920 Merge pull request #106 from ascribe/remove-global-action-component 
Remove unused GlobalAction component
 2016-01-18 14:10:42 +01:00
Brett Sun
1333543e22 Merge pull request #104 from ascribe/use-parameters-in-calls-to-sources 
Pass parameters to sources as opposed to using state
 2016-01-18 14:09:07 +01:00
Brett Sun
85875309c1 Remove StoreUtils since it's no longer necessary 2016-01-18 14:08:46 +01:00