Brett Sun
3929712e9d
Prune unnecessary divs from some components
2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb
Change lumens buttons for AD-1264 changes
2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
581549870f
Merge with AD-1256
2015-11-03 11:13:44 +01:00
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
cb6e94c8f1
Forgot to use our own omit instead of lodash's
2015-11-02 18:57:56 +01:00
Brett Sun
0b4cc3123d
Remove lodash dependency
2015-11-02 18:45:06 +01:00
Brett Sun
1a3dffe8bc
Modify excludePropFromObject to be similar to lodash.omit()
2015-11-02 18:31:01 +01:00
Brett Sun
955e20d6b6
Reduce dependency footprint of new includes
...
Opted for decamelize instead of snake-case as it’s much smaller and we
don’t need the extra functionality of snake-case.
2015-11-02 18:29:06 +01:00
Brett Sun
fe4e337690
Use Object.assign() instead of writing own merge function
2015-11-02 18:27:45 +01:00
Brett Sun
49f20462f1
Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate
...
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
2015-11-02 12:10:41 +01:00
Brett Sun
5f5461c10d
Remove warning for missing prop from FurtherDetailsFileUploader
2015-11-02 10:42:15 +01:00
Brett Sun
a513af984d
Update cyland for FineUploader changes
2015-11-02 10:41:59 +01:00
Brett Sun
1e328b722b
Sanitize utility should not modify given object
...
Mutating arguments and then returning them is redundant and confusing
behaviour (why pass it back if they already have it? Am I getting a new
copy since it returns something?).
2015-10-30 17:46:51 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Brett Sun
5bec3c5dc6
Use const for the cloned trigger element
2015-10-30 11:13:32 +01:00
Brett Sun
22234492e6
Refactor ModalWrapper to not require a trigger component
2015-10-29 16:23:02 +01:00
Brett Sun
864e0bd2a6
Remove redundant truth check for required prop
2015-10-29 15:45:00 +01:00
Tim Daubenschütz
590818cf0b
Merge pull request #10 from ascribe/cleanup-utility-file-declarations
...
Move code from head_setter.js to dom_utils.js and adjust function-com…
2015-10-29 13:25:15 +01:00
Tim Daubenschütz
eba9023efc
From dom_utils.js, remove useless 'continue' statement in loop/try-catch
2015-10-29 13:22:10 +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
66b86209bf
Add appropriate spaces to import statement in header.js
2015-10-28 17:55:44 +01:00
Tim Daubenschütz
ee4c8f624e
Move code from head_setter.js to dom_utils.js and adjust function-comments
2015-10-28 17:45:28 +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
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
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
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
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
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
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
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
