Brett Sun
8fce04125f
Merge with master
2016-02-08 14:08:54 +01:00
Brett Sun
d95bdc0913
Merge with master
2016-02-08 11:43:02 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
0d01ae1642
Remove unused btn-ascribe-add in PieceList
2016-01-27 15:01:08 +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
Brett Sun
27f1b7e9b4
Add default redirect for empty collections
2016-01-21 16:47:57 +01:00
Brett Sun
e5cae3fc34
Update multiline destructuring format based on style guide
2016-01-18 14:46:39 +01:00
Brett Sun
78cf40ba64
Small cosmetic changes
2016-01-18 10:53:01 +01:00
Brett Sun
a2320b892d
Merge with master
2016-01-18 10:40:13 +01:00
Brett Sun
d805c1758c
Merge pull request #60 from ascribe/AD-1443-open-edition-lists-not-refreshing
...
AD-1443 Attempt to show as much of the original edition list as possible on refresh
2016-01-18 10:26:51 +01:00
Brett Sun
40041197d6
Update components for loading WhitelabelStore from top level app
2016-01-11 19:22:25 +01:00
Brett Sun
8009174787
Change AccordionListItems and parents for loading UserStore from top level app
2016-01-11 19:06:50 +01:00
Brett Sun
8531b77633
Merge with master
2016-01-11 17:52:32 +01:00
Brett Sun
d4bb00168c
Change AclButtonList and parents for loading UserStore from top level app
2016-01-11 17:41:31 +01:00
Brett Sun
443be236f5
Whitespace fix for comments
2016-01-11 16:26:36 +01:00
Brett Sun
d622ddac06
Load current user and whitelabel settings in AscribeApp
2016-01-11 12:54:15 +01:00
Brett Sun
41c9a10c84
Use a default shouldRedirect that just always returns true
2016-01-05 17:28:45 +01:00
Brett Sun
4624e936b3
Use the new history api and its LocationDescriptors
2016-01-05 17:27:25 +01:00
Brett Sun
6cc9ce8094
Don't redirect to register piece and then to contract notifications
...
Avoids new user getting asked if they want to cancel registration of a
piece before they even agree to the Ikono contract.
2015-12-14 18:34:27 +01:00
Brett Sun
ffe88eb3bf
Cherry pick from previous PR
2015-12-09 18:02:14 +01:00
Brett Sun
b02f6d7695
Merge with master
2015-12-08 16:11:27 +01:00
Brett Sun
257ff9b5d3
Destructure params for fetchPieceList
2015-12-08 15:09:03 +01:00
Brett Sun
4fa25ca446
Add option to specify the max edition to fetch and update the edition list to
2015-12-08 13:41:15 +01:00
Brett Sun
9d02877363
Fix customThumbnailPlacholder propType
2015-12-04 13:52:17 +01:00
Brett Sun
904a6ce15a
Merge pull request #46 from ascribe/AD-1149-style-23vivi
...
AD-1149 Style 23vivi
2015-12-04 13:39:09 +01:00
Brett Sun
e69dfeb355
Revert "Merge with AD-1443"
...
Revert https://github.com/ascribe/onion/pull/40 , as that needs more
work.
2015-12-03 17:43:15 +01:00
Brett Sun
3be033cdd5
Add thumbnail placeholder for 23vivi
2015-12-02 19:31:50 +01:00
Tim Daubenschütz
85340a9126
Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay
2015-12-02 12:23:38 +01:00
Brett Sun
b4ddec3427
Merge with AD-1443
2015-11-30 11:46:57 +01:00
Brett Sun
ea52c54e3a
Fix check for determining if a piece's edition list is open
2015-11-30 11:27:15 +01:00
Brett Sun
c270977eb9
Fix default filter on piece list
2015-11-24 19:26:45 +01:00
Brett Sun
318a0bf4b2
Filter the collection to only show the consignable items by default
2015-11-06 14:10:54 +01:00
Brett Sun
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +01:00
Brett Sun
54212627bb
Change lumens buttons for AD-1264 changes
2015-11-03 12:10:21 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +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
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
e226477424
Merge with master
2015-10-22 14:18:23 +02:00
Brett Sun
0c51eb374e
Add Lumenus specific piece list
2015-10-21 17:37:29 +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
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +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
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +02:00
Tim Daubenschütz
ea40181805
add 'clear search' dialog to AccordionList and implement functionality in SearchBar
2015-10-13 17:28:10 +02:00
vrde
66dbf3da71
Add document title management for the ascribe app
2015-10-13 16:42:40 +02:00
Tim Daubenschütz
c59f5267ce
add threshold functionality to SearchBar
2015-10-12 16:38:00 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
