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

2067 Commits

Author SHA1 Message Date
Tim Daubenschütz
4dbed67a63 Merge pull request #3 from ascribe/AD-1229-aclinformation-button-on-no-available-buttons-fails
Login validation for ACL actions in edition and piece detail
2015-10-27 10:53:49 +01:00
Tim Daubenschütz
b2eb51a4a8 Merge pull request #6 from ascribe/AD-1235-delete-edition-failed
Fix wrong pushState invocation
2015-10-27 10:02:57 +01:00
Tim Daubenschütz
576fa39167 Fix wrong pushState invocation 2015-10-27 09:59:46 +01:00
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
Tim Daubenschütz
fc4d4dbe17 Change input type in PieceListToolbarOrderWidget from "checkbox" to "radio" 2015-10-26 17:12:24 +01:00
Brett Sun
29e422d16a Add suggestion to refactor AclProxy to readme 2015-10-26 16:53:48 +01:00
Tim Daubenschütz
384ec0f445 Fix correct year extraction from date-string in
AccordionListItemWallet
WalletPieceContainer
2015-10-26 16:20:33 +01:00
Tim Daubenschütz
42733740db Fix correct year extraction from date-string in
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
2015-10-26 16:07:31 +01:00
Tim Daubenschütz
1207522266 Fix correct year extraction from date-string in edition and piece detial view 2015-10-26 15:39:33 +01:00
Tim Daubenschütz
da895bb434 Add alberto's suggestion on currentUser's login status to refactor.md 2015-10-26 15:13:02 +01:00
Tim Daubenschütz
d48da96e3b Add login-validation to actions DetailProperty in Edition and Piece detail view 2015-10-26 11:21:22 +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
Tim Daubenschütz
2ce0b2417d Change Readme.md origin in installation guide 2015-10-23 15:08:03 +02: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
Tim Daubenschütz
1f7addb886 Adding whitelabel colors for AclInformation 2015-10-23 11:34:58 +02:00
TimDaubenschuetz
d0f6f1571d Merged in AD-538-users-and-even-devs-are-unsure-wh (pull request #94)
Ad 538 users and even devs are unsure wh
2015-10-23 11:25:50 +02:00
Tim Daubenschütz
3bf70628c1 Finalizing behavior of AclInformation 2015-10-23 11:24:26 +02:00
Tim Daubenschütz
cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz
e8a9cd89a4 Add resizing functionality to AclButtonList and AclInformation 2015-10-23 09:29:17 +02:00
Tim Daubenschütz
b77beb0b1e Replace last occurences of ascribe-spool-chunked 2015-10-22 17:17:38 +02:00
Tim Daubenschütz
3f97d09238 Readd chrome specific styles 2015-10-22 16:51:49 +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
d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
2015-10-22 13:38:49 +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