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

120 Commits

Author SHA1 Message Date
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
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
diminator
c7122d9435 plus submit button on piecelist 2015-10-12 12:08:53 +02:00
diminator
790bf595d9 glyphs, spinner, piece list/edition table 2015-10-09 16:21:26 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
diminator
71988d502d ascribe fonts
first cut layout

spinner
2015-10-08 11:12:15 +02:00
Tim Daubenschütz
957d0c66c9 minor fixes for last commit 2015-10-01 11:24:19 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
Tim Daubenschütz
3ae362ac15 Fix queryParams glitch for slide show in register_piece 2015-09-28 15:59:36 +02:00
Tim Daubenschütz
32f38428f1 PR Feedback: Fix replacement of underscores in filterParams 2015-09-17 11:39:45 +02:00
Tim Daubenschütz
67e0b34640 integrate filtering into IkonoTv and Cyland whitelabel 2015-09-17 10:06:47 +02:00
Tim Daubenschütz
a96aa1005f Make PieceListToolbar filters generic 2015-09-16 23:36:21 +02:00
Tim Daubenschütz
48508d5756 Implement filter display for piece list 2015-09-16 21:21:30 +02:00
diminator
edcd8e57a4 notification app
notification refactor in onion - split by piece/edition
2015-09-03 14:15:00 +02:00
diminator
92971a9f62 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
	sass/ascribe_accordion_list.scss
2015-09-02 10:50:33 +02:00
diminator
bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +02:00
Tim Daubenschütz
af7938dbc7 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 09:29:58 +02:00
Tim Daubenschütz
55948bc9ba integrate unfilteredPieceListCount into piece list store and list 2015-08-31 16:57:16 +02:00
Tim Daubenschütz
7e1815bb1f refactor account settings into multiple files 2015-08-31 16:36:24 +02:00
diminator
d3cc6a5007 request actions first cut 2015-08-28 15:24:32 +02:00
diminator
ab97fa420c loan request with moment
shortlist on accordeonlist OK
2015-08-26 15:46:27 +02:00
Tim Daubenschütz
284919f3db fix bug 2015-08-21 16:14:15 +02:00
Tim Daubenschütz
8a88f978c6 add start_from parameter to slide container 2015-08-19 15:30:48 +02:00
diminator
e843e2fa52 order by rating 2015-08-14 14:58:23 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00