ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,369 Commits 115 Branches 0 Tags 13 MiB
026261f8c7
Commit Graph

2369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Daubenschütz
026261f8c7 Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:57:53 +01:00
Tim Daubenschütz
c18b70f764 Remove sass comment 2016-02-04 15:57:38 +01:00
Tim Daubenschütz
1f783dbd84 Remove sass comment 2016-02-04 15:57:05 +01:00
Tim Daubenschütz
d5f52e876e Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:53:36 +01:00
Tim Daubenschütz
ac2319f231 Cleanup styles for polline.ascribe.io 2016-02-04 15:53:16 +01:00
Tim Daubenschütz
135f9f453f Cleanup styling for artcity.ascribe.io 2016-02-04 15:44:05 +01:00
Tim Daubenschütz
88926998a8 Use whitelabel routes for wl-specific requests 2016-02-04 14:46:20 +01:00
Tim Daubenschütz
0a17ec0414 Use whitelabel routes for wl-specific requests 2016-02-04 14:45:46 +01:00
Tim Daubenschütz
38aa567ab5 Add artcity to README.md 2016-02-04 13:50:56 +01:00
Tim Daubenschütz
f12630dfad Add routes and styling for artcity.ascribe.io 2016-02-04 13:44:45 +01:00
Tim Daubenschütz
7dfe6a51a4 For 23vivi, switch back to appropriate piece list 2016-02-04 11:51:54 +01:00
Tim Daubenschütz
f6a5734871 Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00
Tim Daubenschütz
c0e55a1829 Merge pull request #147 from ascribe/AG-144-wallet-owner-should-not-be-redirected 
Fix redirection of wallet owners
 2016-02-02 10:23:57 +01:00
Brett Sun
eaaaa3bb76 Merge pull request #82 from ascribe/fix-input-date 
Fix InputDate's initial evaluation of defaultValue
 2016-02-01 15:45:40 +01:00
Tim Daubenschütz
b405bc675b Fix PR feedback 2016-02-01 14:47:51 +01:00
Tim Daubenschütz
e2a481a3f0 Fix redirection of wallet owners 
This also fixes a problem where newly created
users would be redirected to a 404 page.
 2016-02-01 13:50:55 +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
Tim Daubenschütz
e08328b2fb Merge pull request #143 from ascribe/increase-sizelimit-for-works 
Increase file size limit to 50GB
 2016-01-27 11:55:20 +01:00
Brett Sun
215cc3b841 Move file name to under file upload preview for smaller screens 2016-01-27 11:33:45 +01:00
Tim Daubenschütz
8f7d4ccc2c Increase file size limit to 50GB 
- Customer request
 2016-01-27 11:32:23 +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
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
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