1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

2206 Commits

Author SHA1 Message Date
Brett Sun
9059ca184a Remove previously missed imports from ContractSettings 2016-01-11 18:26:39 +01:00
Brett Sun
d867a3d9c1 Change SignupForm for loading UserStore from top level app 2016-01-11 18:24:55 +01:00
Brett Sun
1c4ca0d152 Change RegisterPieceForm and parents for loading UserStore from top level app 2016-01-11 18:16:46 +01:00
Brett Sun
58f57af932 Remove unused props in LoginForm 2016-01-11 18:07:52 +01:00
Brett Sun
eafa675760 Small code style changes 2016-01-11 17:57:35 +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
f31d6352eb Merge general_utils.js from #35 for selectFromObject 2016-01-11 17:09:17 +01:00
Brett Sun
fbb35915eb Update market routes for loading user and whitelabel settings in top level app 2016-01-11 16:57:48 +01:00
Brett Sun
194c554637 Update Ikono routes for loading user and whitelabel settings in top level app 2016-01-11 16:56:24 +01:00
Brett Sun
723f93e629 Update CC routes for loading user and whitelabel settings in top level app 2016-01-11 16:28:27 +01:00
Brett Sun
3e66b78d4c Update Cyland routes for loading user and whitelabel settings in top level app 2016-01-11 16:27:03 +01:00
Brett Sun
443be236f5 Whitespace fix for comments 2016-01-11 16:26:36 +01:00
Brett Sun
06ea23c627 Update prize routes for loading user and whitelabel settings in top level app 2016-01-11 15:14:54 +01:00
Brett Sun
5ae166edf3 Add AppRouteWrapper to handle passing down props to routes 2016-01-11 14:00:09 +01:00
Brett Sun
d622ddac06 Load current user and whitelabel settings in AscribeApp 2016-01-11 12:54:15 +01:00
Brett Sun
19841ce6c4 Refactor EventActions and UserStore to more cleanly handle user authentication and log out events 2016-01-08 14:59:45 +01:00
diminator
2acf3f4056 Added round to prizepiece
upon new round:
- reset is_selected
- increment round for is_selected=True
bug fix filter on is_selected
2016-01-06 14:24:58 +01:00
Brett Sun
e12d086997 Merge pull request #92 from ascribe/AD-1362-implement-portfolio-review-judging-flow-stage-3
AD-1362 Implement portfolio review judging flow stage 3
2016-01-06 00:32:37 +01:00
Brett Sun
e76a36621e Use correct prize_round parameter 2016-01-05 19:45:49 +01:00
Brett Sun
0ce1633294 Add round parameter to prize ratings 2016-01-04 19:40:54 +01:00
Brett Sun
c4730dbae5 Merge pull request #91 from ascribe/AD-1543-edition-detail-hangs-on-first-view-after-transfer
AD-1543 Edition detail hangs on first view after transfer
2016-01-04 18:10:27 +01:00
Brett Sun
15a2bfae9a Fix check for coa 2016-01-04 18:06:26 +01:00
Brett Sun
f819e1313e Merge pull request #87 from ascribe/AD-1362-implement-portfolio-review-judging-flow-stage-2
AD-1362 Implement portfolio review judging flow stage 2
2015-12-23 21:15:33 +01:00
Brett Sun
13937c9951 Fix stale prize ratings showing up on other pieces when they do not have ratings 2015-12-23 20:43:46 +01:00
Brett Sun
39730ec637 Merge with master 2015-12-23 13:17:08 +01:00
Brett Sun
591882618b Merge pull request #88 from ascribe/AD-1344-users-want-pretty-detail-page-to-print
AD-1344 Users want pretty detail page to print
2015-12-23 11:22:01 +01:00
Brett Sun
d817b920b4 Use class to add overflow ellipsis instead of directly styling component 2015-12-23 10:20:56 +01:00
Brett Sun
0f8499dfee Use getLangText for COA Intercom message 2015-12-23 09:50:38 +01:00
Brett Sun
6419a4e8e0 Form and property restyling in print 2015-12-23 09:49:20 +01:00
Brett Sun
5b34d569f6 Don't expand some anchor links in print 2015-12-23 09:48:45 +01:00
Brett Sun
2dc036047f Substitute upload button for placeholder text in print 2015-12-23 09:47:30 +01:00
Brett Sun
1eea6c2cb2 Substitute COA for placeholder text in print 2015-12-23 09:46:30 +01:00
Brett Sun
6c9e108b72 Hide unnecessary items from the piece and edition details in print 2015-12-23 09:39:02 +01:00
Brett Sun
8ec7023b8f Force piece and edition layout to be two columns 2015-12-23 09:37:03 +01:00
Brett Sun
c4da6a2dfc Hide footer in print 2015-12-23 09:36:21 +01:00
Brett Sun
eda479a51c Change header to be just logo in print 2015-12-23 09:36:08 +01:00
Brett Sun
cf6d653c68 Small code style fixes 2015-12-23 09:33:25 +01:00
Brett Sun
441cf68fae Add initial print stylesheet overrides 2015-12-23 09:32:15 +01:00
Brett Sun
8a70f0acc5 Hotfix portfolio review cover image text to show correct 5mb limit 2015-12-22 19:37:44 +01:00
Brett Sun
b5fc811789 Merge pull request #77 from ascribe/pr-show-server-error-response
Show server error in failed piece registration notifications on Portfolio Review
2015-12-22 19:27:30 +01:00
Brett Sun
2bb04ff4f0 Merge pull request #86 from ascribe/AD-1530-limit-thumbnail-upload-size
Limit thumbnail size to 5mb
2015-12-22 19:26:58 +01:00
Brett Sun
9c51db34da Merge pull request #85 from ascribe/AD-1530-optimize-thumbnail-uploads
AD-1530 Use the 300x300 thumbnail if available
2015-12-22 19:26:49 +01:00
Brett Sun
58cd68f1c4 Change Portfolio Review closing date to be Dec. 27th 2015-12-22 10:36:05 +01:00
Brett Sun
1cf8ca006a Move loan request action at the end of a prize to be sluice specific 2015-12-21 16:16:41 +01:00
Brett Sun
ce9493e3dd Use the 300x300 thumbnail if available 2015-12-21 14:46:10 +01:00
Brett Sun
e3c9ebe5f3 Limit thumbnail size to 5mb 2015-12-21 11:53:27 +01:00
Brett Sun
1e83de0b90 Merge pull request #61 from ascribe/AD-1484-hide-PieceListToolbarFilterWidget-if-no-filters-applicable
Hide PieceListToolbarFilterWidget when no filters are applicable
2015-12-21 11:49:29 +01:00
Brett Sun
8ff747e117 Componentize the action available for selected prizes 2015-12-18 14:57:52 +01:00
Brett Sun
311d03d09c Also execute child's handleSuccess() instead of just overwriting it in ModalWrapper 2015-12-18 14:57:10 +01:00