ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Code Issues Releases Wiki Activity
2,467 Commits 115 Branches 0 Tags 13 MiB
373d9d13a7
Commit Graph

278 Commits

Author SHA1 Message Date
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
2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun
cc9fa2378f Remove unnecessary duplication of updating encoding status in Edition 
Also reduces the time between each update to 5s since 10s feels way too
long.
 2016-01-12 17:55:37 +01:00
Brett Sun
b22ae7def1 Small bug fixes for components affected by the UserStore and WhitelabelStore being passed down as a prop 2016-01-12 15:07:38 +01:00
Brett Sun
ed264d8511 Fix MediaContainer not being refreshed while in Edition 2016-01-11 19:34:39 +01:00
Brett Sun
40041197d6 Update components for loading WhitelabelStore from top level app 2016-01-11 19:22:25 +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
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
cc16508e64 Merge with master 2016-01-11 11:59:35 +01:00
Brett Sun
4624e936b3 Use the new history api and its LocationDescriptors 2016-01-05 17:27:25 +01:00
Brett Sun
15a2bfae9a Fix check for coa 2016-01-04 18:06:26 +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
5b34d569f6 Don't expand some anchor links in print 2015-12-23 09:48:45 +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
e3c9ebe5f3 Limit thumbnail size to 5mb 2015-12-21 11:53:27 +01:00
Brett Sun
1580dd8f52 Small additional info for logging COA errors 2015-12-17 16:40:38 +01:00
Brett Sun
1fc1337207 Fix React warnings 2015-12-16 17:49:47 +01:00
Brett Sun
f2f775f20c Carry down currentUser as prop to MediaContainer instead of adding state 2015-12-16 17:49:30 +01:00
Brett Sun
cef2785438 Hot fix to show edition even if not logged on 2015-12-14 17:00:04 +01:00
Brett Sun
3286ef77bf Add 404 handling to prizes' piece container 2015-12-14 11:57:14 +01:00
Tim Daubenschütz
02af024609 Cosmetic changes in EditionContainer and CoaVerifyContainer 2015-12-09 15:56:47 +01:00
Tim Daubenschütz
3e8e7a40e7 Fix setState warning for EditionContainer 2015-12-09 13:28:11 +01:00
Tim Daubenschütz
057a278d19 In EditionStore use empty object instead of null as default state 2015-12-09 13:21:55 +01:00
diminator
7318d4e5df embed in edition 2015-12-09 11:41:46 +01:00
Tim Daubenschütz
4727646654 Add nice message for waiting user 2015-12-08 17:43:19 +01:00
Tim Daubenschütz
e8d5e0390d Improve robustness for server-side failing requests for COA 2015-12-08 17:38:04 +01:00
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Tim Daubenschütz
da75353b00 Refactor Edition endpoints to create Coa on demand properly 2015-12-08 13:28:47 +01:00
Tim Daubenschütz
bf6b78c058 Revert "coa flush causes dispatcherror" 
This reverts commit eaed301155.
 2015-12-08 11:49:03 +01:00
diminator
eaed301155 coa flush causes dispatcherror 2015-12-08 11:46:30 +01:00
Tim Daubenschütz
49421e1fa1 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form 
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_forms/property.js
	js/components/ascribe_forms/property_collapsible.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
	sass/ascribe-fonts/ascribe-fonts.scss
	sass/whitelabel/wallet/cyland/cyland_custom_style.scss
 2015-12-07 13:39:30 +01:00
Tim Daubenschütz
2b6b78310c Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio 
AD-1177 display 404 on pieces and editio
 2015-12-07 11:49:39 +01:00
Tim Daubenschütz
3ce63c33bf Finalize ReactError component 2015-12-07 11:48:28 +01:00
Tim Daubenschütz
45919f93a6 Merge pull request #32 from ascribe/AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null 
Ad 1342 public piece note doesnt render correctly def data null
 2015-12-07 11:00:39 +01:00
Tim Daubenschütz
3374862edf Make monkeyPatched key specific to component's displayName 2015-12-07 10:57:49 +01:00
Brett Sun
d2aba04bea Change show condition on public note to be more stylistically similar 2015-12-07 10:52:00 +01:00
Tim Daubenschütz
2130b74a96 Merge pull request #42 from ascribe/AD-1434-hide-actions-in-detail-pages-if-they-re-not-available 
Display actions only if ACLs are available
 2015-12-07 10:49:07 +01:00
Tim Daubenschütz
9392a71b33 Add comment for bug fix hiding actions from detail pages 2015-12-07 10:48:46 +01:00
Brett Sun
c1959033c0 Fix comments in PR 2015-12-04 16:34:25 +01:00
Brett Sun
b43faf9b45 Fix multiple edition statuses 2015-12-04 16:29:57 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f9694254c75f0cff46222d895d97dd791: 
- Integrate PropertyCollapsible's functionality to Property
 2015-12-03 20:26:53 +01:00
Tim Daubenschütz
8fcb7fcb01 Fix render bug for personal piece note 2015-12-02 16:51:56 +01:00