Commit graph

8169 commits

Author SHA1 Message Date
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
78b79999e9 Merge pull request #1492 from sharelatex/spd-dropbox-unlink-csrf
Add csrf protection for unlinking Dropbox accounts

GitOrigin-RevId: 00bbf0b8d4dc9f97098a645267bf23a6c3e5eea3
2019-02-11 11:42:24 +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
ef1bbba618 Merge pull request #1478 from sharelatex/cmg-fix-subscription-tests
Fix subscription page failing tests

GitOrigin-RevId: dc8bef0aa4996b457d3c770e3ad446315b8bed6f
2019-02-04 16:25:12 +00:00
Chrystal Maria Griffiths
24dd3698e2 Merge pull request #1474 from sharelatex/cmg-delete-markers
Comment out callouts for delete markers

GitOrigin-RevId: 43f0d36ec9cf6ca4e9f2231c69408dbb5a105d4e
2019-02-04 16:25: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
d187b6b186 Merge pull request #1463 from sharelatex/jel-quote-style
Set a min-width on .quote-by

GitOrigin-RevId: 843c4bca65ca19308814521556af16d56f4af5ad
2019-02-04 16:24:47 +00:00
Chrystal Maria Griffiths
09444a5e42 Merge pull request #1456 from sharelatex/sk-references-refresh
When refreshing linked file, if it's from mendeley/zotero, re-index

GitOrigin-RevId: 4f9916d0682335e1477674b46c1133a4a9d0e6af
2019-02-04 16:24:40 +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
cdf9bb432b Merge pull request #1442 from sharelatex/bg-ignore-generated-files-in-vscode
add vscode workspace settings to ignore generated files

GitOrigin-RevId: 59d58bc98b3707ff32ca925dcfb34abf78d18999
2019-02-04 16:24:25 +00:00
Chrystal Maria Griffiths
d1150ec13d Merge pull request #1461 from sharelatex/ns-escape-double-backslash
fix double backslash not being escaped

GitOrigin-RevId: 901d5f1bfdf1434edcef4e28c5c15a848b40134b
2019-02-04 16:24:20 +00:00
Chrystal Maria Griffiths
11b6ae0982 Merge pull request #1457 from sharelatex/ns-tikz-highlight
Better TikZ support

GitOrigin-RevId: 963853cea4e3bdd9046b5b44b5719cc1a82ece5f
2019-02-04 16:24:15 +00:00
Chrystal Maria Griffiths
210e2700a9 Merge pull request #1467 from sharelatex/as-global-search-keybind
Enable search keybinding globally in editor

GitOrigin-RevId: 8e36dbe44ffd385d212bf9dabb549fd04b84a428
2019-02-04 16:24:09 +00:00
Timothée Alby
01a8cc9aea Merge pull request #1460 from sharelatex/ns-remove-only
remove only call

GitOrigin-RevId: cfe130bec782079cce9aa8bf7e5c7541def6159d
2019-01-30 20:11:45 +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
b85595b8ca Merge pull request #1426 from sharelatex/as-cleanup-grunt
Cleanup grunt config & dependencies

GitOrigin-RevId: e44445e727e8cf56d03bf33a8741b9a47418a620
2019-01-29 10:12:10 +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
Jessica Lawshe
87eb794ccc Merge pull request #1424 from sharelatex/as-fix-overlapping-toolbar
Fix overlapping toolbar

GitOrigin-RevId: 0b901ddb2d52024aee0e4151180bcbc2223a3181
2019-01-28 16:23:26 +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
7739e0ece8 Merge pull request #1351 from sharelatex/hb-csv-metrics-export
Add metrics csv download button

GitOrigin-RevId: 51597ef5b5901b1a659763d190648ed8d37e42ed
2019-01-28 14:38:21 +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
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
Alasdair Smith
f32ecc744c Merge pull request #1425 from sharelatex/spd-rate-limit-on-project-upload
Add rate limit on project upload

GitOrigin-RevId: e2da5fb1815d85d8e82fe2f4498786f1fc5b5727
2019-01-22 11:38:59 +00:00
Alasdair Smith
3af1ef48c2 Merge pull request #1423 from sharelatex/as-fix-non-existent-v1-token
Fix import page showing for non-existent v1 token

GitOrigin-RevId: cdce007b64d153505a15ec7b16fb4b9311ebf11b
2019-01-22 11:38:55 +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
a906504dac Merge pull request #1416 from sharelatex/ja-no-header-margin-in-cards
Remove top margin from header when at top of card

GitOrigin-RevId: cbb7e2445476f48a3bf188d7062b05b1a1847cbf
2019-01-18 10:37:23 +00:00
Simon Detheridge
64f69529e0 Merge pull request #1406 from sharelatex/spd-more-rate-limits
Add additional rate limits to prevent resource-exhaustion attacks

GitOrigin-RevId: 428cf8a16e062267dd92e7fba73ef5c192a8e668
2019-01-18 10:37:18 +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
88249226f4 Merge pull request #1388 from sharelatex/hb-csv-institution-members
Add CSV download for institutional members to hub

GitOrigin-RevId: 07f78b03725a8bddaadff5a8bd0455a29e59496e
2019-01-17 15:15:54 +00:00
Timothée Alby
7d5f3537df Merge pull request #1414 from sharelatex/as-fix-pdf-link-referrer
Fix links in PDF to have noreferrer

GitOrigin-RevId: fa14e552b0d4947781c88ce22fc70696b04cf8a4
2019-01-17 15:15:49 +00:00