ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-11 05:29:06 +01:00
Code Issues Releases Wiki Activity
2,679 Commits 115 Branches 0 Tags 13 MiB
d8e92f6e01
Commit Graph

34 Commits

Author SHA1 Message Date
Brett Sun
7014514654 Use UrlResolver to resolve api urls based on white labelling rather than updating ApiUrl's export 
Keeping an export constant is more predictable and less surprising for
most people.
 2016-06-14 17:58:00 +02:00
Brett Sun
a4216db6d9 Remove redundant '_utils' suffix in util file names 2016-06-14 17:57:57 +02:00
Brett Sun
5a0a6e88db Convert usages of withRouter to withContext 2016-06-08 13:53:50 +02:00
Brett Sun
b02695a33a Convert whitelabel to be passed down through context and withWhitelabel HOC 2016-06-08 13:11:48 +02:00
Brett Sun
d1dba86b1a Convert currentUser to be passed down through context and withCurrentUser HOC 
Similar to what react-router did with their router and withRouter HOC.
 2016-06-07 14:56:35 +02:00
Brett Sun
6b67a8462f Convert usage of router from context to using withRouter 2016-06-06 16:54:38 +02:00
Tim Daubenschütz
fcaa85a0ed Replace usage of History mixin with contextTypes 2016-06-06 16:07:16 +02:00
Brett Sun
8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun
826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Brett Sun
e5cae3fc34 Update multiline destructuring format based on style guide 2016-01-18 14:46:39 +01:00
Brett Sun
78cf40ba64 Small cosmetic changes 2016-01-18 10:53:01 +01:00
Brett Sun
a2320b892d Merge with master 2016-01-18 10:40:13 +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
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
4624e936b3 Use the new history api and its LocationDescriptors 2016-01-05 17:27:25 +01:00
Brett Sun
257ff9b5d3 Destructure params for fetchPieceList 2015-12-08 15:09:03 +01:00
Brett Sun
c1959033c0 Fix comments in PR 2015-12-04 16:34:25 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f96: 
- Integrate PropertyCollapsible's functionality to Property
 2015-12-03 20:26:53 +01:00
Brett Sun
efdc5d32e7 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark 2015-11-24 10:42:15 +01:00
Cevo
63a32d949a transfer added 2015-11-19 19:47:33 +01:00
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +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
c72a5aa308 Add Lumenus specific data forms to edition and piece details 2015-10-28 11:26:54 +01:00
Tim Daubenschütz
576fa39167 Fix wrong pushState invocation 2015-10-27 09:59:46 +01: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
ef14fc9b2e Fix edition deletion redirect 2015-10-22 13:21:07 +02:00
Tim Daubenschütz
738e94a43d Change helper texts 2015-10-20 17:22:40 +02:00
Tim Daubenschütz
c7c83083d3 change layout of AclButtonList 2015-10-15 11:32:34 +02:00
Tim Daubenschütz
d77bdb25a5 Cleanup code 2015-10-15 11:17:16 +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
diminator
b233dbb937 PR fixes 2015-10-01 09:49:01 +02:00