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 |
|
Simon Detheridge
|
870f183595
|
Merge pull request #1476 from sharelatex/spd-character-sets
Detect encoding of non-utf8 files and convert during load
GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
|
2019-03-11 11:04:22 +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 |
|
Henry Oswald
|
b9edc0f414
|
Merge pull request #1548 from sharelatex/ho-tpds-linode-hosts
read linode_url in for tpdsworker jobs
GitOrigin-RevId: 23d5b36a881e4d96ddc343444802354594d798d7
|
2019-03-11 11:01:25 +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 |
|
Simon Detheridge
|
838fe00058
|
Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade
Notify users when affiliations are upgraded
GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6
|
2019-03-11 11:00:01 +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 |
|
Henry Oswald
|
d55b38cc05
|
Merge pull request #1471 from sharelatex/ho-docker2
Move to docker image based builds
GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
|
2019-03-11 10:59:20 +00:00 |
|
Brian Gough
|
43899589dc
|
Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html
GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
|
2019-03-11 10:58:32 +00:00 |
|
Brian Gough
|
2ab346e762
|
Merge pull request #1511 from sharelatex/as-inc-linked-file-rev
Increment rev of linked file to fix bug where dropbox not syncing
GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
|
2019-03-11 10:58:21 +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
|
d52c30f272
|
Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint
Rate limit confirm university domain endpoint
GitOrigin-RevId: 1d03eec3c0e8208e5f643000693f685957e15442
|
2019-02-15 13:33:42 +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 |
|
Brian Gough
|
cc613f4370
|
Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors
Return error status to the publish modal on export creation error
GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
|
2019-02-14 15:03:42 +00:00 |
|
Shane Kilkelly
|
349d731745
|
Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix
Constant-time comparison for read-write tokens
GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7
|
2019-02-14 11:09:40 +00:00 |
|
Brian Gough
|
00cdc008d5
|
Merge pull request #1508 from sharelatex/bg-add-websocket-fallback-option
add fallback to siteUrl if websocket fails
GitOrigin-RevId: fd866d17475cb974e4158ac7a89e972c66f0dd97
|
2019-02-13 09:20:35 +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 |
|
Timothée Alby
|
b39626751a
|
Merge pull request #1499 from sharelatex/ta-open-redirect-fix
Prevent Open Redirects
GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5
|
2019-02-12 15:47:41 +00:00 |
|
Alasdair Smith
|
9b97af8977
|
Merge pull request #1403 from sharelatex/as-swap-brand-prefix
Swap brand prefix so OL is the default
GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db
|
2019-02-12 11:32: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 |
|
Simon Detheridge
|
7dcc807caf
|
Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1
Check generated read-tokens against v1
GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
|
2019-02-11 11:42:29 +00:00 |
|
Simon Detheridge
|
c7f30bdfec
|
Merge pull request #1494 from sharelatex/spd-overleaf-v1-oauth-state
Use 'state' parameter to prefent CSRF attacks when authenticating with v1
GitOrigin-RevId: bf5f8ddffa391d8f3ca84d3588df906b08eb018d
|
2019-02-11 11:42:20 +00:00 |
|
Simon Detheridge
|
ea807d053e
|
Merge pull request #1489 from sharelatex/spd-mendeley-csrf
Enforce use of csrf token in Mendeley / tpr OAuth
GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d
|
2019-02-11 11:42:15 +00:00 |
|
Simon Detheridge
|
9e07daba0b
|
Merge pull request #1490 from sharelatex/ns-remove-ip-endpoint
remove /ip endpoint
GitOrigin-RevId: 42ea1ff6db6cba5e74a6e6c133a4d9f2b93d4a2e
|
2019-02-11 11:42:10 +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 |
|
nate stemen
|
4840d9e9bd
|
Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm
refresh features on donmain confirm
GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f
|
2019-02-05 15:58:58 +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
|
f5a6992aaa
|
Merge pull request #1475 from sharelatex/sk-dont-require-login-email-confirmation
Don't require login for email confirmation action
GitOrigin-RevId: 653baa394a8cdc08e4a52681d64fbd18ae34baca
|
2019-02-04 16:24:52 +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
|
e73a7dbe9c
|
Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors
Show export creation errors to the user
GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503
|
2019-02-04 16:24:30 +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 |
|
Douglas Lovell
|
dc60d6b630
|
Merge remote-tracking branch 'origin/as-validate-email-length'
GitOrigin-RevId: 00f46c637a7563443e903f491ec39446dc570b5f
|
2019-01-29 20:32:28 +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
|
bc2ee419eb
|
Merge pull request #1451 from sharelatex/ns-check-institution-users-patch
remove extra emails call in mongo query
GitOrigin-RevId: d64ab2ef72fe7691bc29e56210de0e04743ee917
|
2019-01-29 12:08:24 +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
|
b311f997aa
|
Merge pull request #1444 from sharelatex/ta-ns-check-institution-users
add script to check all if users on institution are upgraded
GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470
|
2019-01-28 14:38: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 |
|
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
|
d2bccbec25
|
Merge remote-tracking branch 'origin/sk-admin-panel-projects'
GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff
|
2019-01-24 12:13:16 +00:00 |
|
Douglas Lovell
|
bd9adbae52
|
Merge remote-tracking branch 'origin/bg-case-sensitive-import'
GitOrigin-RevId: d8d4fff4b4803f3cae6195ce1b60628cca326296
|
2019-01-24 12:13:11 +00:00 |
|