1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

2347 Commits

Author SHA1 Message Date
Brett Sun
0d01ae1642 Remove unused btn-ascribe-add in PieceList 2016-01-27 15:01:08 +01:00
Brett Sun
5a5e597ca4 Merge pull request #80 from ascribe/align-global-notification-left
Use left alignment for global notification messages
2016-01-26 13:51:30 +01:00
Brett Sun
6a1dc7ed98 Merge with master 2016-01-26 13:50:03 +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
533a9efa8f Merge pull request #136 from ascribe/AD-1528-set-up-integration-testing-on-onion
Set up integration testing on onion
2016-01-26 10:47:54 +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
Brett Sun
0fefba549c Use configureHttp to set baseUrl for tests 2016-01-25 17:55:45 +01:00
Brett Sun
ebb8248364 Make sure to wait for LoginContainer 2016-01-25 17:37:04 +01:00
Brett Sun
bdc13473a1 Fix initial test script to wait for app to load 2016-01-25 17:32:04 +01:00
Brett Sun
f246005d9c Remove duplicate instance of gulp-sass 2016-01-25 17:31:18 +01:00
Brett Sun
a2ea9b4aa2 Add todo to the test README and make slight changes 2016-01-25 17:31:09 +01:00
vrde
c3c9c88421 Remove env variable from config 2016-01-25 11:32:43 +01:00
vrde
51d88a2ed2 Remove typo on env var name 2016-01-25 11:24:35 +01:00
vrde
c9a5fdce4f Merge remote-tracking branch 'origin/master' into AD-1528-set-up-integration-testing-on-onion 2016-01-25 11:05:18 +01:00
vrde
778c61bfdc Add utils to manage tunnel and stuff 2016-01-25 11:05:01 +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
Tim Daubenschütz
58206a6094 Merge pull request #133 from ascribe/AG-131-Show-more-for-edition-table-not-working
Ag 131 show more for edition table not working
2016-01-25 10:25:36 +01:00
Tim Daubenschütz
4088857d67 Fix property naming for Fetcher to fix "Show more" dialog
Closes #131
2016-01-25 10:23:20 +01:00
vrde
a95a0fd2ea Add multi browser test 2016-01-22 17:52:03 +01:00
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