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
|
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
|
6c9e108b72
|
Hide unnecessary items from the piece and edition details in print
|
2015-12-23 09:39:02 +01:00 |
|
Brett Sun
|
3286ef77bf
|
Add 404 handling to prizes' piece container
|
2015-12-14 11:57:14 +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 |
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
Brett Sun
|
3fb4ae55bf
|
Merge with AD-1290
|
2015-11-04 14:04:16 +01:00 |
|
Brett Sun
|
543605aae3
|
Move store resets to componentDidMount()
|
2015-11-04 13:56:43 +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 |
|
Tim Daubenschütz
|
147c852b02
|
Replace getFullYear() with getUTCFullYear()
|
2015-11-02 10:32:48 +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 |
|
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
|
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
|
fad6caca63
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
|
2015-10-21 09:47:14 +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
|
738e94a43d
|
Change helper texts
|
2015-10-20 17:22:40 +02:00 |
|