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
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
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
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
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
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
Tim Daubenschütz
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
357f63fa2b
Add contract link to loan history
2015-11-16 11:45:56 +01:00
Tim Daubenschütz
8188e5ca2f
Merge branch 'master' into AD-1315-implement-submission-flow
2015-11-16 09:41:06 +01:00
Brett Sun
cef19f427c
Add comment for content registration check
2015-11-13 16:02:34 +01:00
Brett Sun
09812a1881
Forgot to unlisten to UserStore when unmounting
2015-11-13 13:33:12 +01:00
Tim Daubenschütz
c852eaf143
Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014
...
Replace Javascript's Date object with momentjs
2015-11-13 09:58:12 +01:00
Tim Daubenschütz
66aef4886f
Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality
2015-11-11 10:51:45 +01:00
Brett Sun
af58687572
Add twitter text
2015-11-10 19:33:08 +01:00
Brett Sun
a9f0a46fbd
Move social share buttons to left of download button to accommodate for embed button
2015-11-10 10:29:37 +01:00
Brett Sun
8dc0470007
Add Twitter button
2015-11-09 19:01:27 +01:00
Brett Sun
d972da935a
Add Facebook Share button
2015-11-09 17:46:49 +01:00
Brett Sun
3fb4ae55bf
Merge with AD-1290
2015-11-04 14:04:16 +01:00
Brett Sun
2711c4ddb9
Move onChange() to after componentWillUnmount() for ESLint
2015-11-04 13:57:15 +01:00
Brett Sun
543605aae3
Move store resets to componentDidMount()
2015-11-04 13:56:43 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +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
Brett Sun
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +01:00
Brett Sun
5f5461c10d
Remove warning for missing prop from FurtherDetailsFileUploader
2015-11-02 10:42:15 +01:00
Tim Daubenschütz
147c852b02
Replace getFullYear() with getUTCFullYear()
2015-11-02 10:32:48 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Cevo
3cf59ae2af
added public note to piece
2015-10-29 15:31:25 +01:00
Brett Sun
784098f225
Fix PropType warnings for components in ascribe_detail
2015-10-28 18:37:09 +01:00
Brett Sun
c72a5aa308
Add Lumenus specific data forms to edition and piece details
2015-10-28 11:26:54 +01:00
Brett Sun
82b49fc653
Add additional required properties for Lumenus
...
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
2015-10-27 17:54:35 +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
4dbed67a63
Merge pull request #3 from ascribe/AD-1229-aclinformation-button-on-no-available-buttons-fails
...
Login validation for ACL actions in edition and piece detail
2015-10-27 10:53:49 +01:00
