11 commits

Author	SHA1	Message	Date
Timothée Alby	85e7f688d5	Display Pricing Exceptions on Subscription Dashboard (#1720) ... Display Pricing Exceptions on Subscription Dashboard GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd	2019-04-23 14:35:21 +00:00
Shane Kilkelly	97e357f772	Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status ... Remove deprecated display of v1 team data in v2 GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d	2018-12-20 10:55:52 +00:00
James Allen	fc069c1752	Merge pull request #1216 from sharelatex/ja-remove-only-from-tests ... Remove stray 'only' in acceptance tests GitOrigin-RevId: 37417cfb98a512584723f5eaf6c3c684b5c60f68	2018-12-03 18:02:11 +00:00
Douglas Lovell	aae0484458	Merge branch 'master' into dcl-i1207 ... GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc	2018-11-30 13:24:27 +00:00
Douglas Lovell	ed3147a58f	Allow open from template button when lacking source ... GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a	2018-11-30 13:24:23 +00:00
James Allen	ee800f7448	Merge pull request #1176 from sharelatex/ja-manage-v1-subs ... Manage v1 subscriptions from v2 GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076	2018-11-30 10:43:37 +00:00
James Allen	49e19cad64	Merge pull request #1162 from sharelatex/ja-show-group-management ... Add group and institution membership and management info to subscription dashboard GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60	2018-11-20 11:03:56 +00:00
James Allen	0f1c732d15	Merge pull request #1130 from sharelatex/ja-subscription-dashboard ... Refactor subscription dashboard GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c	2018-11-19 16:01:59 +00:00
James Allen	301ae80f99	Allow refreshFeatures to notify v1 to update its features	2018-05-29 17:21:42 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00
James Allen	b1f378208d	Properly merge subscriptions from different places	2018-05-22 10:05:08 +01:00