ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,659 Commits 115 Branches 0 Tags 13 MiB
ac1b43d24b
Commit Graph

1659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Sun
ac1b43d24b Set the consignee email by using the server's white label settings 
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.

Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
 2015-10-26 19:17:06 +01:00
Brett Sun
84c459c426 Revert changes to allow piece list to filter ACLs 
We can do this with the backend instead.
 2015-10-26 11:09:04 +01:00
Brett Sun
3dedc93d2e Force consignee to be submissions@lumenus.co 
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
 2015-10-23 14:19:44 +02:00
Brett Sun
e226477424 Merge with master 2015-10-22 14:18:23 +02:00
Brett Sun
7ba7e26d5b Fix typo in edition api url 2015-10-22 14:14:06 +02:00
Tim Daubenschütz
ef14fc9b2e Fix edition deletion redirect 2015-10-22 13:21:07 +02:00
TimDaubenschuetz
68a6c70931 Merged in AD-756-branding-for-sluiceascribeio-brow (pull request #92) 
Ad 756 branding for sluiceascribeio browser
 2015-10-22 12:04:28 +02:00
Tim Daubenschütz
68b608763a Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow 
Conflicts:
	js/components/header.js
	js/utils/head_setter.js
 2015-10-22 12:00:59 +02:00
TimDaubenschuetz
e16198e3ab Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104) 
Ad 1080 restyle webapp with new corporate identity
 2015-10-22 11:55:34 +02:00
TimDaubenschuetz
6acc4d4da7 Merged in AD-1218-point-api-link-to-apiary (pull request #111) 
Point to apiary-based docs - fixes AD-1218
 2015-10-22 11:54:52 +02:00
Sylvain Bellemare
ffb699f3f3 Point to apiary-based docs - fixes AD-1218 2015-10-22 11:52:14 +02:00
Tim Daubenschütz
e6d6f86d3f Style placeholder according to Woj's mockups 2015-10-22 11:34:51 +02:00
Brett Sun
ba777781b7 Add sliding piece registration with dummy additional form 2015-10-22 11:13:44 +02:00
Brett Sun
de3c5bca14 Correct misleading comments in utils 2015-10-22 11:12:41 +02:00
Tim Daubenschütz
b2a9eb1c7c Add thumbnail replacement for new logo 2015-10-22 10:39:11 +02:00
Tim Daubenschütz
7f97ce9828 Handle deletion method for WalletPieceContainer 2015-10-21 23:45:53 +02:00
Tim Daubenschütz
846e891d84 Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-21 22:35:46 +02:00
Tim Daubenschütz
dd4a964142 add skipping advanced optimizations for minifying css 2015-10-21 22:35:03 +02:00
TimDaubenschuetz
bb18676020 Merged master into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-21 21:25:49 +02:00
Tim Daubenschütz
b2634c5b3f Upgrade react-router 2015-10-21 20:57:35 +02:00
Brett Sun
0c51eb374e Add Lumenus specific piece list 2015-10-21 17:37:29 +02:00
TimDaubenschuetz
63505946e6 Merged in AD-1198-no-space-between-text-and-link-i (pull request #109) 
AD-1198 Add missing space to accordion list placeholder
 2015-10-21 16:37:09 +02:00
Tim Daubenschütz
2b3f33cca0 Change button styles for whitelabel pages 2015-10-21 15:56:30 +02:00
Tim Daubenschütz
a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Brett Sun
7116133337 AD-1194 Create front-end host configs 
Default route components to be replaced with Lumenus specific ones.
 2015-10-21 14:10:21 +02:00
Tim Daubenschütz
61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz
f4b0952806 Add vendor prefixes and resolve leftover PR comments 2015-10-21 11:00:37 +02:00
Tim Daubenschütz
ba553455d2 Remove ascribe_scrollbar.scss 2015-10-21 10:56:24 +02:00
Tim Daubenschütz
0655955027 Remove Source Sans Pro as its not being used anymore 2015-10-21 10:52:52 +02:00
Tim Daubenschütz
cd1cdfeede Change font-weights, remove gibson from local CSS file and fix glitches 2015-10-21 10:35:11 +02:00
Brett Sun
f1e9f4a0c8 Add missing space to accordion list placeholder 2015-10-21 09:57:40 +02:00
Tim Daubenschütz
fad6caca63 Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/logout_container.js
 2015-10-21 09:47:14 +02:00
Tim Daubenschütz
444de8ebd7 Remove potentially dangerous automatic upgrade for react-router 2015-10-20 17:42:19 +02:00
vrde
e220ee6fbb Merge branch 'AD-697-update-title-in-the-browser' 2015-10-20 15:06:41 +02:00
vrde
a1827b329c Merge branch 'AD-1195-window-videojs-is-not-a-func' 2015-10-20 15:04:47 +02:00
diminator
3a503db396 Merged in AD-1174-collecting-society-info-is-showi (pull request #102) 
Put CopyrightAssociationForm in AclProxy
 2015-10-20 14:41:45 +02:00
vrde
1a6ddf67ac Add fall back if client cannot load 3rd party libs 2015-10-20 14:16:49 +02:00
vrde
5f0329ccf6 Remove useless code 2015-10-20 11:35:32 +02:00
vrde
4ee26d7259 Update PR with fixes 2015-10-20 11:25:27 +02:00
vrde
7ce98d0433 Fix comments on PR 2015-10-19 17:24:49 +02:00
TimDaubenschuetz
5a35e40a76 Merged in AD-947-fileuploader-button-does-not-work (pull request #100) 
Remove stopPropagation for event in FileDragAndDrop
 2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed Fix simulate click for Opera 2015-10-19 14:22:20 +02:00
Tim Daubenschütz
f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
 2015-10-19 10:30:14 +02:00
TimDaubenschuetz
d66c201a98 Merged in AD-727-missing-redirects-to-login-page (pull request #95) 
Ad 727 missing redirects to login page
 2015-10-19 10:13:54 +02:00
diminator
54333c4ebe Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-16 13:31:42 +02:00
diminator
74eb1ce3a2 spinner and some colors 
***FML***
 2015-10-16 13:30:36 +02:00
Tim Daubenschütz
b964bde281 Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-16 13:10:44 +02:00
Tim Daubenschütz
69e75f5ce0 Add AscribeSpinner to LogoutContainer 2015-10-16 13:10:18 +02:00
Tim Daubenschütz
5e6e2e8cb0 Redirect directly to /login on loggout 2015-10-16 13:01:54 +02:00
diminator
f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +02:00