Brett Sun
|
d817b920b4
|
Use class to add overflow ellipsis instead of directly styling component
|
2015-12-23 10:20:56 +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 |
|
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 1ac2fe7f96:
- 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 |
|
Tim Daubenschütz
|
81f28a02f9
|
Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null
|
2015-12-02 16:39:18 +01:00 |
|
Tim Daubenschütz
|
8b3060d613
|
Fix simple comments in pr
|
2015-12-02 12:25:11 +01:00 |
|
Tim Daubenschütz
|
4fe10bb887
|
Cosmetic changes for EditionContainer & PieceContainer
|
2015-11-30 18:26:27 +01:00 |
|
Tim Daubenschütz
|
0b2bc1c57b
|
Introduce ReactError mixin for handling errors in React components
|
2015-11-30 18:23:03 +01:00 |
|
Tim Daubenschütz
|
5a6c827f0b
|
Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/ascribe_detail/piece_container.js
|
2015-11-30 15:00:39 +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 |
|
Cevo
|
e482caaa99
|
public note is visible outside
|
2015-11-25 21:43:15 +01:00 |
|
Brett Sun
|
efdc5d32e7
|
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
|
2015-11-24 10:42:15 +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
|
f4f89bba43
|
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
|
2015-11-20 13:53:03 +01:00 |
|
Cevo
|
dc96e908eb
|
piece note hidden from non-owner
|
2015-11-20 11:47:41 +01:00 |
|
Cevo
|
c0e0354ce8
|
fixing the public note bug
|
2015-11-20 11:11:03 +01:00 |
|
Cevo
|
63a32d949a
|
transfer added
|
2015-11-19 19:47:33 +01:00 |
|
Tim Daubenschütz
|
1ac2fe7f96
|
Remove all occurences of 'hidden' prop usage for Property
|
2015-11-17 15:52:40 +01:00 |
|
Tim Daubenschütz
|
60bf4b12f5
|
Merge pull request #29 from ascribe/AD-1281-if-contract-was-appended-to-loan
Add contract link to loan history
|
2015-11-17 14:58:09 +01:00 |
|
Tim Daubenschütz
|
a8ccf13f91
|
Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady
|
2015-11-17 12:03:22 +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
|
339421a4b7
|
Merge branch 'master' into AD-56-add-social-share-functionality
Conflicts:
js/components/ascribe_detail/media_container.js
js/components/ascribe_media/media_player.js
|
2015-11-16 15:54:49 +01:00 |
|
Tim Daubenschütz
|
da73d40fd6
|
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
|
2015-11-16 15:27:00 +01:00 |
|