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

1734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +01:00
Brett Sun
3a8f91e29e Change required prop for AD1251 changes 2015-11-03 10:49:06 +01:00
Brett Sun
68c1dd9407 Merge with AD1251 2015-11-03 10:48:28 +01:00
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Brett Sun
864e0bd2a6 Remove redundant truth check for required prop 2015-10-29 15:45:00 +01:00
Brett Sun
906ef7c37e Refactor InputTextAreaToggable's required property to take a bool instead 2015-10-28 19:19:14 +01:00
Brett Sun
784098f225 Fix PropType warnings for components in ascribe_detail 2015-10-28 18:37:09 +01:00
Tim Daubenschütz
cc8e455a0e Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent 
Change delete button back to old styling
 2015-10-28 15:56:02 +01:00
Brett Sun
c72a5aa308 Add Lumenus specific data forms to edition and piece details 2015-10-28 11:26:54 +01:00
Tim Daubenschütz
5788e77501 Merge pull request #9 from ascribe/AD-1219-sort-by-and-filter-drop-down-widget-are-cut-off 
Pull DropdownButtons in collection to the right, to make them work al…
 2015-10-27 18:11:00 +01:00
Tim Daubenschütz
9db85e7191 Change default font color to ascribe-dark-blue 2015-10-27 18:02:52 +01:00
Brett Sun
82b49fc653 Add additional required properties for Lumenus 
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
 2015-10-27 17:54:35 +01:00
Tim Daubenschütz
6217663fe0 Pull DropdownButtons in collection to the right, to make them work also on mobile 2015-10-27 17:34:31 +01:00
Tim Daubenschütz
d617f7212f Merge pull request #7 from ascribe/AD-1237-navbar-ascribe-logo-doesnt-link 
AD-1237 Navbar Ascribe Logo Doesn't Link
 2015-10-27 17:19:44 +01:00
Tim Daubenschütz
9765ed040b Add tertiary button style 2015-10-27 17:15:23 +01:00
Brett Sun
633939b7fa Use AclButton in LumenusSubmitButton 
Instead of copying functionality from AclButton to add a default email,
LumenusSubmitButton just returns one with preset settings.
 2015-10-27 17:01:50 +01:00
Tim Daubenschütz
12c7fa7ba4 Change delete button back to old styling 2015-10-27 16:32:26 +01:00
Brett Sun
c362b960dd Change focused styling of logo to be normal 2015-10-27 16:04:28 +01:00
Brett Sun
7e438dcaf5 Add link to /collection to ascribe branding on navbar 2015-10-27 11:44:40 +01:00
Tim Daubenschütz
dc813f2687 Merge pull request #4 from ascribe/AD-1075-year-before-1000-starts-with-0 
Fix correct year extraction from date-string in edition and piece detail
 2015-10-27 10:59:29 +01:00
Tim Daubenschütz
969d2f8b34 Merge pull request #5 from ascribe/AD-1209-Sort-by-widget-is-using-wrong-native-UI-elements 
Change input type in PieceListToolbarOrderWidget from "checkbox" to "…
 2015-10-27 10:56:21 +01:00
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