Alasdair Smith
|
f2ad7ebfc3
|
Merge pull request #2429 from overleaf/as-move-deps-to-bundle
Move jQuery and Angular dependencies to bundle
GitOrigin-RevId: cee1507044438c8c435d934476f6ea6281215ccd
|
2019-12-17 04:22:53 +00:00 |
|
Timothée Alby
|
4f7c2deca5
|
Merge pull request #2345 from overleaf/ta-itm-campaign-improvements
ITM Fields Improvements
GitOrigin-RevId: 7e9a46dc2b935e2cad8cb8d2e21dfa3c81291c2d
|
2019-11-12 09:15:05 +00:00 |
|
Jessica Lawshe
|
4f637f14b5
|
Merge pull request #2299 from overleaf/as-cleanup-express-locals
Clean up express locals
GitOrigin-RevId: f57e7c57913cbf894a365c5ae9dd2810245a01ae
|
2019-10-29 15:58:53 +00:00 |
|
Timothée Alby
|
4d564d5cf1
|
Merge pull request #2258 from overleaf/ta-recurly-custom-fields
Recurly Custom Fields Tracking
GitOrigin-RevId: f29f56cf7d0dfa91a8f4152897ba6bd897cb6238
|
2019-10-25 08:38:57 +00:00 |
|
Alasdair Smith
|
9cf73f965c
|
Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack
GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
|
2019-10-16 10:36:21 +00:00 |
|
Simon Detheridge
|
c1f43ad60e
|
Merge pull request #2183 from overleaf/em-plans-faq
Allow linking inside plans FAQ invoice answer
GitOrigin-RevId: 20fb07f0f8fafee65efaa1f4467013cccc7a154d
|
2019-10-01 12:10:06 +00:00 |
|
Timothée Alby
|
03460ba229
|
Merge pull request #2020 from overleaf/ta-recurly-sca
SCA Integration
GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
|
2019-08-22 12:10:46 +00:00 |
|
Eric Mc Sween
|
358cd22f54
|
Merge pull request #2087 from overleaf/subscription-invoices-link
Add Link to Invoices for Recurly Subscriptions
GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
|
2019-08-20 12:59:58 +00:00 |
|
Eric Mc Sween
|
1fc64fc4e2
|
Merge pull request #2084 from overleaf/ta-new-subscription-country
Fix Country Auto-Selection on New Subscription Form
GitOrigin-RevId: fdf7b197017ee9ce527dd7737240756ff16d206a
|
2019-08-20 12:59:47 +00:00 |
|
Timothée Alby
|
7785c7b59e
|
Merge pull request #2029 from overleaf/ta-build-main-recurly-3
Load Recurly JS Separately
GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
|
2019-07-31 15:44:44 +00:00 |
|
Timothée Alby
|
b9ab0edf69
|
Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly
GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
|
2019-07-31 08:33:31 +00:00 |
|
Simon Detheridge
|
82672269c4
|
Merge pull request #1862 from overleaf/em-json-stringify
Globally apply StringHelper.stringifyJsonForScript()
GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
|
2019-06-17 15:14:25 +00:00 |
|
Simon Detheridge
|
3990a5d736
|
Merge pull request #1724 from sharelatex/ta-subscription-canceled-page
Add Subscription Canceled Page
GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
|
2019-04-25 14:37:15 +00:00 |
|
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 |
|
Timothée Alby
|
44ba16bb7c
|
Fix Wording in Subscription Cancellation Flow (#1723)
Fix Wording in Subscription Cancellation Flow
GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
|
2019-04-23 14:35:14 +00:00 |
|
Alasdair Smith
|
41f75b5936
|
Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss
Fix potential Angular XSS issues
GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
|
2019-03-18 10:37:15 +00:00 |
|
Timothée Alby
|
72ae3f3aa5
|
Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes
Fixes for unsubscribing from metrics email
GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
|
2019-03-11 11:07:20 +00:00 |
|
Douglas Lovell
|
24da4799ed
|
Merge remote-tracking branch 'origin/jel-payment-countries'
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
|
2019-03-11 11:05:58 +00:00 |
|
Douglas Lovell
|
44dd7c1c75
|
Merge remote-tracking branch 'origin/as-fix-email-address'
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
|
2019-03-11 11:05:36 +00:00 |
|
Simon Detheridge
|
96759a90f4
|
Merge pull request #1578 from sharelatex/jel-student-disclaimer
Show disclaimer on student subscription trials
GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
|
2019-03-11 11:04:46 +00:00 |
|
Hugh O'Brien
|
491c29bad1
|
Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out
v2 metrics email opt out and last sent tracking
GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
|
2019-03-11 11:03:39 +00:00 |
|
Simon Detheridge
|
6e960492ff
|
Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept
Fix broken accept-team-invite page
GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
|
2019-03-11 11:01:10 +00:00 |
|
Simon Detheridge
|
5d8b8ff012
|
Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite
Only prompt for group cancellation if group is personal when accepting invite
GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
|
2019-03-11 11:00:48 +00:00 |
|
Chrystal Maria Griffiths
|
9abea8ae5f
|
Merge pull request #1516 from sharelatex/as-sanitize-team-notice
Show sanitized HTML for team notice on subscription page
GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
|
2019-02-15 13:33:28 +00:00 |
|
Simon Detheridge
|
255981bdc2
|
Merge pull request #1486 from sharelatex/ta-subscription-dash-fix
Fix Subscirption Dashboard Messaging
GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99
|
2019-02-11 11:42:34 +00:00 |
|
Chrystal Maria Griffiths
|
2463fef390
|
Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging
Subscription page messaging updates
GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
|
2019-02-04 16:24:35 +00:00 |
|
Timothée Alby
|
9a0dd31d8c
|
Merge pull request #1061 from sharelatex/ja-remove-domain-license-code
Remove deprecated domain license code
GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
|
2019-01-29 12:08:29 +00:00 |
|
Timothée Alby
|
300e7d2f12
|
Merge pull request #1449 from sharelatex/ta-subscription-page-fix
Fix Subscription Page for Users with Free Affiliation
GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e
|
2019-01-28 14:38:16 +00:00 |
|
Timothée Alby
|
6985f7d1a3
|
Merge pull request #1443 from sharelatex/jel-vat-plans-page
Add VAT text to plans page
GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619
|
2019-01-28 14:38:08 +00:00 |
|
Timothée Alby
|
837302327e
|
Merge pull request #1407 from sharelatex/ta-team-status-free
Hide Free v1 Teams on Subscription Dashboard
GitOrigin-RevId: ba805e77eb1f994158d3ceaa42be23943fca0f1f
|
2019-01-17 15:15:44 +00:00 |
|
Timothée Alby
|
5169b4a73f
|
Merge pull request #1415 from sharelatex/ta-trial-fix
Check if Trial is Current in Subscription Page
GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1
|
2019-01-17 15:15:33 +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 |
|
Douglas Lovell
|
740dce07a9
|
Merge remote-tracking branch 'origin/hb-publisher-management'
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
|
2018-12-18 13:42:56 +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 |
|
Timothée Alby
|
701ba90c7b
|
Merge pull request #1182 from sharelatex/ja-dashboard-metrics-links
Add links to metrics and hubs for groups and institutions
GitOrigin-RevId: ca83108e1d1541fdc805218ea12847b0d7a97cf8
|
2018-11-26 13:43:05 +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 |
|
Brian Gough
|
8bf9d79d2f
|
Merge pull request #1157 from sharelatex/jel-aria-hidden-fix
Add value to aria-hidden attribute
GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9
|
2018-11-19 09:57:35 +00:00 |
|
Jessica Lawshe
|
d97fe4e39d
|
Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y
Image alt tags and accessible icons
GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004
|
2018-11-15 17:41:22 +00:00 |
|
James Allen
|
140f97eb20
|
Merge pull request #1107 from sharelatex/ja-purchase-groups
Purchase group/team accounts directly via app
GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
|
2018-11-13 13:50:46 +00:00 |
|
Jessica Lawshe
|
fceb8e9e66
|
Merge pull request #1096 from sharelatex/jel-plans-mobile-layout
Plans page mobile layout
GitOrigin-RevId: d650447bd7df4eda17471c2fa7fb2b376fcc0172
|
2018-11-08 16:11:49 +00:00 |
|
Tim Alby
|
48e5c6b523
|
add UserMembership logic
|
2018-10-09 12:09:11 +01:00 |
|
Jessica Lawshe
|
d2af2fb630
|
Merge pull request #927 from sharelatex/jel-plans-updates
Plans page updates
|
2018-09-20 09:00:58 -05:00 |
|
Jessica Lawshe
|
4f5c12e9ac
|
More specific group contact controller name and email subject
This form is only used on the group contact modal.
|
2018-09-17 10:47:57 -05:00 |
|
Tim Alby
|
09c92c0b69
|
don't encode /
|
2018-09-14 16:09:24 +01:00 |
|
Tim Alby
|
2e4d3d7aab
|
change links to v1 to sign user in first
|
2018-09-14 14:26:16 +01:00 |
|
Jessica Lawshe
|
c3c2e524f5
|
Add quotes
|
2018-09-05 08:14:32 -05:00 |
|
Jessica Lawshe
|
40a412b6b9
|
Remove plans message about v2 beta
|
2018-09-05 08:14:05 -05:00 |
|