Commit Graph

120 Commits

Author SHA1 Message Date
Brett Sun 826ca08073 Merge with master 2016-02-05 10:38:59 +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 8531b77633 Merge with master 2016-01-11 17:52:32 +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 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 1580dd8f52 Small additional info for logging COA errors 2015-12-17 16:40:38 +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 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 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 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 b43faf9b45 Fix multiple edition statuses 2015-12-04 16:29:57 +01:00
Tim Daubenschütz 8fcb7fcb01 Fix render bug for personal piece note 2015-12-02 16:51:56 +01:00
Tim Daubenschütz 2b6c9777e9 Display actions only if ACLs are available 2015-11-30 13:20:05 +01:00
Brett Sun 3aab73379a Merge with master 2015-11-30 11:43:33 +01:00
Brett Sun 5e45c10baa Check for piece and edition validity by using their ids instead of titles
Also removed a few unnecessary location props.
2015-11-23 10:46:20 +01:00
Tim Daubenschütz ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Brett Sun d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Tim Daubenschütz 147c852b02 Replace getFullYear() with getUTCFullYear() 2015-11-02 10:32:48 +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 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 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
Tim Daubenschütz cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz e8a9cd89a4 Add resizing functionality to AclButtonList and AclInformation 2015-10-23 09:29:17 +02:00
Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
2015-10-22 13:38:49 +02:00
Tim Daubenschütz 8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	package.json
2015-10-20 18:11: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
Tim Daubenschütz a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
2015-10-15 10:06:39 +02:00
Cevo b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
diminator 8d970a65c4 spinners in forms
button wide
2015-10-12 17:55:02 +02:00
diminator aaa1a9a000 replaced fonts
replaced spinners WIP

renamed settings-property to property
2015-10-12 15:25:21 +02:00
Cevo b8f7527a0b console.logs removed 2015-10-09 14:32:45 +02:00
Cevo 03680bd830 information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them) 2015-10-09 14:19:43 +02:00
Cevo 087884ef3c sharare button moved to the right 2015-10-08 10:14:50 +02:00
Cevo 924b462cc1 sharare button moved to the right 2015-10-08 10:14:06 +02:00
Tim Daubenschütz 28dfcfa75a Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
	js/components/ascribe_detail/edition.js
	js/components/ascribe_forms/form_login.js
	js/components/ascribe_forms/form_signup.js
2015-10-06 16:40:02 +02:00
Tim Daubenschütz 8ba6f11dfe Fix AccordionListTable item links and missing location propagation 2015-10-01 14:54:56 +02:00
Tim Daubenschütz 83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00