Douglas Lovell
|
24da4799ed
|
Merge remote-tracking branch 'origin/jel-payment-countries'
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
|
2019-03-11 11:05:58 +00:00 |
|
Douglas Lovell
|
ce8695c951
|
Merge branch 'dcl-i1261b'
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
|
2019-03-11 11:05:47 +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 |
|
Douglas Lovell
|
9b6ac8f715
|
Merge remote-tracking branch 'origin/ta-entity-create-form-fix'
GitOrigin-RevId: e16167515c1c64bb350751fc1e748b719446a5b3
|
2019-03-11 11:03:28 +00:00 |
|
Hugh O'Brien
|
f887bcb121
|
Merge pull request #1556 from sharelatex/cmg-search-clearing
Stop search bar clearing on enter
GitOrigin-RevId: c3dc6236e3fd889b229f68633a17b396cbe45f60
|
2019-03-11 11:03:07 +00:00 |
|
Paulo Jorge Reis
|
46c6d11574
|
Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar
Show the toolbar in SL history projects.
GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
|
2019-03-11 11:01:56 +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 |
|
Simon Detheridge
|
c6b8ab3245
|
Merge pull request #1542 from sharelatex/as-fix-noopener
Fix some missing noopener attributes
GitOrigin-RevId: a833fc26b2c783bb713f771fb2ae4a494e5fec63
|
2019-03-11 11:00:17 +00:00 |
|
Jessica Lawshe
|
b8bb118fe3
|
Merge pull request #1528 from sharelatex/jel-portal-print
Update portals for printing
GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d
|
2019-03-11 10:59:47 +00:00 |
|
Chrystal Maria Griffiths
|
e379691767
|
Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener
Add some missing rel="noreferrer noopener" attributes
GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d
|
2019-02-15 13:33:54 +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 |
|
Timothée Alby
|
c4dd8b5da8
|
Merge pull request #1502 from sharelatex/jel-social-metatags
Update `og` metatags and add protocol to image URL
GitOrigin-RevId: 9548ca5f378cb770e454bc75062e80bd1c3da9ac
|
2019-02-12 15:48:00 +00:00 |
|
Timothée Alby
|
fb5caf7b63
|
Merge pull request #1504 from sharelatex/jel-portal-sign-in-redirect
Add redircts when signing in/up via portal
GitOrigin-RevId: b84105f35b5f1c14fa57ca91e766b8b6de00ccd7
|
2019-02-12 15:47:53 +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 |
|
Ersun Warncke
|
81e3db260c
|
Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route
Add close site setting and private disconnect all users route
GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
|
2019-02-06 14:24:52 +00:00 |
|
Brian Gough
|
c51461da09
|
Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url
allow setting separate wsUrl for websockets
GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
|
2019-02-06 10:20:36 +00:00 |
|
Paulo Reis
|
f902eb7d4a
|
Add the project name as a translation local var when rendering project invites.
GitOrigin-RevId: 80f4b10adc142173c2194f56c55df8b3ce9f948b
|
2019-02-04 17:59:05 +00:00 |
|
Chrystal Maria Griffiths
|
91594eee6d
|
Merge pull request #1473 from sharelatex/as-fix-notification-translation
Inject data into translation string to workaround removed potential XSS
GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b
|
2019-02-04 16:24:57 +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 |
|
Chrystal Maria Griffiths
|
d9692b7f91
|
Merge pull request #1168 from sharelatex/cmg-range-prototype
Rich text track changes pt. 1 view changes
GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
|
2019-01-30 14:07:06 +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 |
|
James Allen
|
286dd564e2
|
Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection
Fix history default file selection and bug when comparing with version zero
GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
|
2019-01-29 10:12:17 +00:00 |
|
James Allen
|
abb259a98b
|
Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4
Upgrade to angular-sanitize 1.6.4
GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e
|
2019-01-29 10:12:02 +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 |
|
Douglas Lovell
|
2a72804434
|
Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing'
GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3
|
2019-01-24 12:13:23 +00:00 |
|
Douglas Lovell
|
c294a8425b
|
Merge remote-tracking branch 'origin/ns-new-file-modal'
GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c
|
2019-01-24 12:13:02 +00:00 |
|
Douglas Lovell
|
59d4bd6182
|
Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling'
GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2
|
2019-01-24 12:12:56 +00:00 |
|
Douglas Lovell
|
15061047a3
|
Merge remote-tracking branch 'origin/ns-check-institution'
GitOrigin-RevId: a147965b4f3294215f1396e53d184ef4919fa6cd
|
2019-01-24 12:12:51 +00:00 |
|
Ersun Warncke
|
ef9875c5a6
|
Merge pull request #1427 from sharelatex/ew-recaptcha
add recaptcha validate middleware to reg and add recaptcha v3
GitOrigin-RevId: 35375b7887832b40bc570cf848cab9c62243443b
|
2019-01-21 17:27:54 +00:00 |
|
Simon Detheridge
|
6650dfe494
|
Merge pull request #1419 from sharelatex/as-fix-invites-permissions
Fix invite permissions in share modal
GitOrigin-RevId: 8fe073faebcd84236ac58671820166a2ad73262f
|
2019-01-18 10:37:11 +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 |
|
Ersun Warncke
|
87b2c72449
|
Merge pull request #1410 from sharelatex/ew-make-logout-area-clickable
make area around logout button clickable
GitOrigin-RevId: 8f080c6bedb7dce2ac39d877e8076b83241a4c12
|
2019-01-16 17:21:21 +00:00 |
|
Ersun Warncke
|
330f878085
|
Merge pull request #1378 from sharelatex/ew-post-logout
POST logout instead of GET
GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7
|
2019-01-15 16:48:00 +00:00 |
|
Simon Detheridge
|
b7daca4f3f
|
Merge pull request #1379 from sharelatex/jel-import-page-mobile-friendly
Mobile friendly project import page
GitOrigin-RevId: b33a3fa5113d4400beec065fe856a19967e68845
|
2019-01-11 14:43:39 +00:00 |
|
James Allen
|
7ee0dcbd7c
|
Merge pull request #1377 from sharelatex/as-deemphasise-download-zip
De-emphasise download zip button if not the primary action
GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5
|
2019-01-09 17:08:52 +00:00 |
|
James Allen
|
b969526c19
|
Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs
Handle UserStubs when linking projects with owners
GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3
|
2019-01-09 13:41:06 +00:00 |
|
James Allen
|
1530062d00
|
Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging
Update messaging on v1 tags now that v1 dash is inaccessible
GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e
|
2019-01-09 13:40:55 +00:00 |
|
James Allen
|
563cdfd439
|
Merge pull request #1363 from sharelatex/as-gdpr-notice
Add note about deleting a project if no owner to import status page
GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4
|
2019-01-08 13:02:19 +00:00 |
|
Alasdair Smith
|
42cf6a1216
|
Merge pull request #1362 from sharelatex/as-fix-status-page
Fixes for import status page
GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12
|
2019-01-08 12:02:58 +00:00 |
|
James Allen
|
1bddd03335
|
Merge pull request #1319 from sharelatex/ja-account-deletion-message
Change account deletion message when v1 access is removed
GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
|
2019-01-07 11:33:30 +00:00 |
|
James Allen
|
87b983ec6b
|
Merge pull request #1348 from sharelatex/as-tweak-import-status-page
Tweak import status page
GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60
|
2019-01-07 11:33:19 +00:00 |
|
James Allen
|
0de359b70b
|
Merge pull request #1345 from sharelatex/ja-remove-git-warning
Remove warning about no git bridge in import modal
GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
|
2019-01-04 16:33:49 +00:00 |
|
Alasdair Smith
|
9737a04125
|
Merge pull request #1338 from sharelatex/as-remove-import-modal
Don't show project import modal if feature flag is set
GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366
|
2019-01-04 10:51:47 +00:00 |
|
Ersun Warncke
|
985f0a97bc
|
Merge pull request #1332 from sharelatex/ew-block-while-project-importing
block loading project while importing
GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c
|
2019-01-03 18:14:19 +00:00 |
|
Simon Detheridge
|
ec1867198f
|
Merge pull request #1313 from sharelatex/as-import-copy
Improved copy for import status page
GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8
|
2019-01-03 12:19:35 +00:00 |
|