github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
8697 commits 3 branches 7 tags 199 MiB
Commit graph

5060 commits

Author SHA1 Message Date
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
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
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
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
Brian Gough
205da19173 Merge pull request #1408 from sharelatex/bg-increase-timeout-on-clone-project 
increase timeout for cloning project to 5 minutes

GitOrigin-RevId: 949c7553f331573b391ff37f180e80b60c260cf5
 2019-01-16 13:17:46 +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
Brian Gough
f1179f0fa7 Merge pull request #1384 from sharelatex/bg-use-queued-lock 
use queued locks

GitOrigin-RevId: b5a3bfb55af201392a50ffb3fe30e740e56da30d
 2019-01-15 10:55:32 +00:00
Brian Gough
724e2e8fcd Merge pull request #1344 from sharelatex/bg-handle-filestore-errors 
handle non-sucess responses from filestore copy

GitOrigin-RevId: f00766066a5a2cf20116aa9c8d876f78fae8953f
 2019-01-15 10:55:27 +00:00
Simon Detheridge
da6711dc99 Merge pull request #1275 from sharelatex/hb-authorization-flags 
Authorization flags for metrics

GitOrigin-RevId: 651587c11317bfc8bb7b1e8143e8c2c820683cb5
 2019-01-11 14:44:17 +00:00
Simon Detheridge
4c191953d3 Merge pull request #1356 from sharelatex/spd-password-complexity 
Make password validation more consistent between backend and frontend

GitOrigin-RevId: 6ba729da842bf474cf7e9b5e0b2435db0544737c
 2019-01-11 14:43:49 +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
Simon Detheridge
a107b0cc33 Merge pull request #1380 from sharelatex/ew-fix-project-getter-error 
fix callback is not a function error

GitOrigin-RevId: 1bbe80f4086a17576f21ca9fc7b96f59d1b0614c
 2019-01-11 14:43:34 +00:00
Simon Detheridge
4360a55fdc Merge pull request #1383 from sharelatex/spd-rate-limits 
Add rate limits to email-related endpoints

GitOrigin-RevId: 05a8b40eb65a55aba35788e2401e6988b672b389
 2019-01-11 14:43:29 +00:00
Brian Gough
eb5738886a Merge pull request #1382 from sharelatex/bg-fix-locking-for-copy 
fix locking for copy file method in ProjectEntityUpdateHandler

GitOrigin-RevId: a0c2a69f31bd17d8ae5cbfbc1047db22207f9bbe
 2019-01-11 10:27:20 +00:00
James Allen
ea415ea639 Merge pull request #1374 from sharelatex/as-fix-dash-user-fetch 
Include owners email in user fetch to show on dashboard if needed

GitOrigin-RevId: 7175700f77501723f48763b9ee9397c0448d4109
 2019-01-09 17:08:57 +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
Henry Oswald
68a0ff08ea Merge pull request #1366 from sharelatex/ho-bump-compile-size 
Bump compile size

GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b
 2019-01-08 16:37:00 +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
James Allen
8653a3d9cd Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports 
Handle UserStubs for project owner

GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04
 2019-01-08 13:02:14 +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
Ersun Warncke
c303af5d4d Merge pull request #1354 from sharelatex/ew-async-zip-download 
use async project history zip download api

GitOrigin-RevId: 847e22eb3bf89e2e9e3c86bcc9ae92f8c90b25b1
 2019-01-07 17:38:33 +00:00
James Allen
e624f697d2 Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes 
Handle import of zip files that include filenames with backslashes

GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41
 2019-01-07 11:33:35 +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
47ab15c39f Merge pull request #1318 from sharelatex/ja-hide-v1-dash-link 
Hide link back to v1 dash after we start force exporting to v2

GitOrigin-RevId: 1221bfc3d09224b09040604e0a3f6120d63d8946
 2019-01-07 11:33:25 +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
12a2d71ac9 Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing 
use different api to check if project is exporting

GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147
 2019-01-07 11:33:14 +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
ccb9ae6317 Merge pull request #1337 from sharelatex/mm-f1000-realrevisionurl 
Real revisionURL for F1000 exports

GitOrigin-RevId: 6a9284c36680824fcc0be3b2f926deff27cb7cf8
 2019-01-03 18:33:28 +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
c4d0cf9fd0 Merge pull request #1325 from sharelatex/ew-enable-collabratec-v2-for-all 
Enable collabratec v2 for all users

GitOrigin-RevId: 586dccdcfee8f9d219838b73e0a217b0e10550b8
 2019-01-03 15:25:26 +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
James Allen
df2dd2cb80 Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding 
Open in Overleaf: Fix character-encoding problems when passing content via 'snip' parameter

GitOrigin-RevId: d5d9faef8583696dfe7c94e4b5dfd88fc5bf6f4a
 2019-01-03 10:20:55 +00:00
James Allen
6bcf209fab Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta 
Take git-bridge out of beta-program

GitOrigin-RevId: ba95dcd1c818f11f44915ea3731d29aa50473622
 2019-01-03 10:20:44 +00:00
Ersun Warncke
7bf860cde5 Merge pull request #1312 from sharelatex/ja-add-rate-limits 
Add rate limits to adding emails and changing password

GitOrigin-RevId: e73c17985cc9c74d60f8856b3b47b28fecd0d489
 2018-12-21 12:22:56 +00:00
Alasdair Smith
7112e65dc5 Merge pull request #1303 from sharelatex/project-import-refactor 
Project import refactor

GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
 2018-12-20 12:06:15 +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
Simon Detheridge
b0b87a7b6e Merge pull request #1299 from sharelatex/spd-redirect-bypass-header 
Add support for header to allow bypass of redirects

GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2
 2018-12-19 16:02:29 +00:00
Chrystal Maria Griffiths
2b556df43c Merge pull request #1294 from sharelatex/mm-exportstatus-fields 
F1000 export fixes

GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af
 2018-12-19 10:38:29 +00:00
Ersun Warncke
bfeefe8406 Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects 
Support importing projects with collabratec users to v2

GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4
 2018-12-18 15:14:37 +00:00
Douglas Lovell
740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' 
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
 2018-12-18 13:42:56 +00:00
Paulo Jorge Reis
e139abb110 Merge pull request #1273 from sharelatex/ja-password-reset-v1 
Handle v1-only users in v2 password reset flow

GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3
 2018-12-18 11:48:53 +00:00
Paulo Jorge Reis
4563ce864c Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes 
History compare labels fixes

GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
 2018-12-18 11:48:49 +00:00
Alasdair Smith
1160620afc Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page 
Revert "Import status page"

GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
 2018-12-17 15:45:36 +00:00
Alasdair Smith
56784c4089 Merge pull request #1240 from sharelatex/as-import-status-page 
Import status page

GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
 2018-12-17 14:01:24 +00:00
Paulo Jorge Reis
d5c651c132 Merge pull request #1276 from sharelatex/pr-fix-history-v1 
Undo rename and removal of the v1 history list controller.

GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
 2018-12-17 12:16:20 +00:00
Paulo Jorge Reis
217bc180ac Merge pull request #1251 from sharelatex/pr-history-labels-compare 
History labels compare

GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
 2018-12-17 10:10:48 +00:00
Jessica Lawshe
7666c8a481 Merge pull request #1236 from sharelatex/jel-password-reset 
Reset password via API request to v1

GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
 2018-12-14 16:02:14 +00:00
Shane Kilkelly
a72b29efd8 Merge pull request #1259 from sharelatex/ja-sso-settings-link 
Add link from v2 settings page to manage linked accounts in v1

GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
 2018-12-13 15:09:59 +00:00
Shane Kilkelly
c423e483ba Merge pull request #1256 from sharelatex/sk-file-upload-retry 
Add a retry around `FileStoreHandler.uploadFileFromDisk`

GitOrigin-RevId: 2fc54036acdeda15c00a3d0222fd1a83683a5798
 2018-12-13 15:09:48 +00:00
Ersun Warncke
362c1f64db Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy 
upgrade to latest (forked) version of multer, proxy collabratec uploads

GitOrigin-RevId: 682caf12a81ee828e544a5e3903ea49bbd173fe0
 2018-12-13 13:09:26 +00:00
James Allen
3bc9ce995a Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create 
Set reversedHostname on user creation

GitOrigin-RevId: 35ba4a5ae6aa792ee1c46e8b2b99d2e6ed00af17
 2018-12-13 09:25:58 +00:00
James Allen
d0744d779e Merge pull request #1233 from sharelatex/ja-owner-userstubs 
Allow importing projects by non-owners

GitOrigin-RevId: b8e5597deef8229b22c5605965d246e6ed95d624
 2018-12-13 09:25:45 +00:00
Timothée Alby
6e25c872e3 Merge pull request #1255 from sharelatex/ta-remove-teams-redirect 
Remove /teams Route

GitOrigin-RevId: d520cae19fd41a1fbba7fb24dd67b5b9accce36f
 2018-12-13 02:00:36 +00:00
Timothée Alby
4861a86a21 Merge pull request #1254 from sharelatex/ta-fix-error-log 
fix var name in error logging

GitOrigin-RevId: 5cb11d033737faabb235101049f4c8c55e1f7600
 2018-12-13 02:00:30 +00:00
Brian Gough
e42a3d1dc5 Merge pull request #1227 from sharelatex/spd-better-project-name-parsing 
Handle embedded commands when parsing project name from title

GitOrigin-RevId: 09c1720897056a40d38b4f2f80f9d48caad4258b
 2018-12-10 09:51:42 +00:00
Brian Gough
bed59cf8f6 Merge pull request #1223 from sharelatex/bg-fast-import 
parallelise file uploads for v1 project import

GitOrigin-RevId: d4ae617b26e6d341bccd6202a1697a6ba3fc01ad
 2018-12-10 09:51:38 +00:00
Shane Kilkelly
95b3724e36 Merge pull request #1206 from sharelatex/sk-git-bridge-migrated-projects 
GitBridge: If a project is migrated from v1, add a `migratedFromId` to get-doc response
GitOrigin-RevId: 2ff3f4207b15ce811dd173e4fb44088e51a80d86
 2018-12-06 14:09:20 +00:00
Shane Kilkelly
231d89477b Merge pull request #1234 from sharelatex/ta-teamplate-without-brand-metrics 
Handle Access for Template Without Brands

GitOrigin-RevId: f1127298fcede8075b31f6b1bc7161f474817a7e
 2018-12-06 14:09:15 +00:00
Simon Detheridge
f3a10ac221 Merge pull request #1192 from sharelatex/ta-publisher-create 
Add Interface to Create Publishers

GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46
 2018-12-06 11:10:20 +00:00
Simon Detheridge
0097564754 Merge pull request #1220 from sharelatex/spd-open-in-overleaf-file-arrays 
Open in Overleaf: Add support for arrays of files

GitOrigin-RevId: 5ef6d1ace6b7c6c041f2846f2f433b39fb137372
 2018-12-06 11:10:08 +00:00
Jessica Lawshe
028ad9c05b Merge pull request #1209 from sharelatex/jel-mobile-improvements 
Mobile improvements

GitOrigin-RevId: 4b2fa8b1ab12b7ca23a0a64aeadea90f7cfc6f4d
 2018-12-05 17:59:47 +00:00
Timothée Alby
fde672542e Merge pull request #1193 from sharelatex/ta-template-metrics 
Template Metrics

GitOrigin-RevId: 0a8648aec3a9446426c70cd8220bb1f776313303
 2018-12-05 15:12:14 +00:00
James Allen
16e1980b41 Merge pull request #1225 from sharelatex/spd-ensure-zip-file-project-name-valid 
Ensure project names are valid when importing from zip

GitOrigin-RevId: db36dde6d756e6577d7e89f9f50f76c40575a5f0
 2018-12-05 12:32:36 +00:00
James Allen
12004962fb Merge pull request #1221 from sharelatex/ew-collabratec-zip-upload-api 
collabratec zip upload api

GitOrigin-RevId: cf93d47112404e9dcbecd723aa806fc213c057f3
 2018-12-05 12:32:31 +00:00
James Allen
e603afe106 Merge pull request #1217 from sharelatex/ja-download-zip-version 
Add option to download zip file of version in history

GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68
 2018-12-05 12:32:26 +00:00
Ersun Warncke
28c934e8ff Merge pull request #1194 from sharelatex/ew-collabratec-link-project-apis 
collabratec link/unlink apis, auth refactor

GitOrigin-RevId: dc901494197334e87d3e6702c789654ccef5e56a
 2018-12-04 11:38:57 +00:00
Jessica Lawshe
f02e3e604b Merge pull request #1172 from sharelatex/jel-portal-templates-link 
Link to portal templates from project dash

GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c
 2018-12-03 19:13:45 +00:00
Simon Detheridge
3138919cb7 Merge pull request #1184 from sharelatex/spd-zip-project-name-from-tex-content 
zip upload: Read project name from title in zip contents

GitOrigin-RevId: 27122674a0374f86a10c04485d787f4caaf21f5b
 2018-12-03 11:20:44 +00:00
Simon Detheridge
b69cc6ce77 Merge pull request #1211 from sharelatex/ta-fetch-v1-data-log-errors 
Log Errors in fetchV1Data

GitOrigin-RevId: 4b709430c2ad97ca369e93eaa4c4edf5ad7f3f52
 2018-12-03 11:20:37 +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
1070cd36bb Merge pull request #1163 from sharelatex/ja-zotero 
Add support for Zotero linked files

GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
 2018-11-28 11:35:27 +00:00
Timothée Alby
dffb6bc7a2 Merge pull request #1187 from sharelatex/ta-publisher-membership 
Add Publisher Entity for UserMemberships

GitOrigin-RevId: 862b1e4fe6d33b63ddfdaef47c02809c4558f9cc
 2018-11-28 10:17:36 +00:00
Timothée Alby
be6950292d Merge pull request #1190 from sharelatex/ta-team-importer-timeout-fix 
Team Importer Timeout Fix

GitOrigin-RevId: 4951262e3eb980b45e3ba5785c1d17c58aa5009e
 2018-11-28 10:17:30 +00:00
Simon Detheridge
05801085b0 Merge pull request #1185 from sharelatex/spd-better-unique-filenames 
Use numeric suffixes to disambiguate duplicate project names

GitOrigin-RevId: 489b080d0514a33bbbf775095dd587f5e1a254a4
 2018-11-26 16:53:42 +00:00
Simon Detheridge
50cba1a86f Merge pull request #1153 from sharelatex/spd-open-in-overleaf-local-storage 
Use browser local storage instead of session for tex snippets

GitOrigin-RevId: 9609dc882c37ccd2f58bf6d36ea851bbe746fa25
 2018-11-26 16:53:31 +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
Timothée Alby
210ebbeaf9 Merge pull request #1091 from sharelatex/ta-entity-authorization-refactor 
UserMembershipAuthorization Refactor

GitOrigin-RevId: 055cebcd9298ed6dace081198f68491a000cf4a3
 2018-11-26 13:42:58 +00:00
James Allen
38a2b9ee53 Merge pull request #1181 from sharelatex/ja-git-bridge-beta 
Open up v2 git bridge to beta users but only with v2 only projects

GitOrigin-RevId: 0895a4636ca9dbffcb112c2b1459773303ecc2cd
 2018-11-23 14:19:26 +00:00
Paulo Jorge Reis
794e6e146d Merge pull request #1180 from sharelatex/pr-ieee-basic-styling-fixed 
IEEE basic styling fixed

GitOrigin-RevId: 2f3fb3850435b52cea5228ac4a0dd2c1a874e36c
 2018-11-22 15:32:58 +00:00
Paulo Jorge Reis
2f551922d6 Merge pull request #1179 from sharelatex/revert-1167-pr-ieee-basic-styling 
Revert "IEEE basic styling"

GitOrigin-RevId: 1e473bddcfbc9b1a8aef6f4dd23ea3a716eddd71
 2018-11-22 13:30:47 +00:00
Paulo Jorge Reis
41c12e2c52 Merge pull request #1167 from sharelatex/pr-ieee-basic-styling 
IEEE basic styling

GitOrigin-RevId: 43a308fa8ce49d7b809b21fc95aefb41dcbaf46e
 2018-11-22 11:11:34 +00:00
James Allen
2fbbdb25be Merge pull request #1137 from sharelatex/as-allow-brand-variation-project-import 
Allow import of projects with brand variation

GitOrigin-RevId: 3ede6d1e34a30c42698f9010ed31741cbc341305
 2018-11-20 11:04: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
Hugh O'Brien
b3a957b8d8 Merge pull request #1141 from sharelatex/hb-v2-institutional-hub 
v2 Institutional Hub

GitOrigin-RevId: ff01ccf659a2369284a22deb79ca45433ca1a2e8
 2018-11-16 09:19:06 +00:00
Hugh O'Brien
bcd7a740ec Merge pull request #1154 from sharelatex/ta-display-institution-name 
display institution name on managment and metrics pages

GitOrigin-RevId: 302bffee358d9d5090877ca833584f50afc0ff7b
 2018-11-16 09:18:58 +00:00
Jessica Lawshe
dd41a50377 Merge pull request #1151 from sharelatex/jel-wiki-search-a11y 
Accessible Wiki Search

GitOrigin-RevId: af9b5444fe1be1ced16f3049bfc1ac731c8bebd5
 2018-11-15 17:41:27 +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
Paulo Jorge Reis
af2d959504 Merge pull request #1072 from sharelatex/spd-open-with-overleaf 
Implement v1 open-with-overleaf API in v2 (part 1)

GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12
 2018-11-15 10:04:33 +00:00
Paulo Jorge Reis
4c9eee51df Merge pull request #1114 from sharelatex/as-fix-sentry-reporting 
Fix Sentry reporting

GitOrigin-RevId: 1bbe598b520fe9edb136a148cc57af63df77cec4
 2018-11-15 10:04:23 +00:00
James Allen
8c70d680f4 Merge pull request #1145 from sharelatex/ew-collabratec-create-project2 
Collabratec create project api

GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884
 2018-11-14 14:44:17 +00:00
James Allen
95f7d3da24 Merge pull request #1118 from sharelatex/as-upgrade-ace-1.2.9 
Upgrade to Ace 1.2.9

GitOrigin-RevId: 8700f6decb530a0f0bbaefbe32a83893e8d91a90
 2018-11-14 14:30:12 +00:00
Shane Kilkelly
81b09c7800 Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2 
Enable git-bridge in v2

GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
 2018-11-14 11:29:35 +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
Chrystal Maria Griffiths
f1c8dcdf1e Merge pull request #1127 from sharelatex/as-keep-tags-archive 
Keep tags when archiving project

GitOrigin-RevId: 40b23895ef27a69500194cfc149a236ae615f271
 2018-11-13 10:54:18 +00:00
Chrystal Maria Griffiths
c4201ab158 Merge pull request #1133 from sharelatex/hb-team-notice-admin 
Add team name and notice to v2 admin

GitOrigin-RevId: 9f543a7be9beade2528f9ae378870aba93f99383
 2018-11-13 10:54:01 +00:00
Chrystal Maria Griffiths
afbeec3b02 Merge pull request #1099 from sharelatex/ta-management-ui-title 
Management UI Wording Tweaks

GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544
 2018-11-13 10:53:56 +00:00
Chrystal Maria Griffiths
6ea0b9cf46 Merge pull request #1097 from sharelatex/hb-fix-institutions-callbacks 
Fix multiple callback and silent failures on institutions controller

GitOrigin-RevId: 2883445a4d960e7aca2dfbab45b8e268437e4769
 2018-11-13 10:53:50 +00:00
Ersun Warncke
efaa77dbd7 Merge pull request #1143 from sharelatex/robots-noindex 
Add noindex, nofollow to editor pages (read/write and read only)

GitOrigin-RevId: b1bcd3c7203a0027d86aced3ea8371b077c4ac75
 2018-11-09 23:55:43 +00:00
Ersun Warncke
59a849d46e Merge pull request #1117 from sharelatex/ew-collabratec-project-metadata-api2 
Collabratec project metadata api

GitOrigin-RevId: 46f4b84bfb302f68c0a176a8a1686ce22829ba08
 2018-11-09 09:11:53 +00:00
Ersun Warncke
de4f1a5abd Merge pull request #1126 from sharelatex/mm-ensure-valid-rootdoc 
Ensure project's root doc is valid before exporting

GitOrigin-RevId: 6f15955015097df9464267f458b8dbb126c22173
 2018-11-09 08:26:24 +00:00
Jessica Lawshe
a18176b2fa Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op 
Change database operator to add user to team

GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6
 2018-11-08 16:11:58 +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
Paulo Jorge Reis
49388c868b Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui 
Editor cobranding UI

GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
 2018-11-07 11:43:31 +00:00
Simon Detheridge
baa5574669 Merge pull request #1120 from sharelatex/spd-bonus-page-facebook-link 
Use asynchronous initialisation for Facebook API

GitOrigin-RevId: 263817edcd8fee03d2d2bf62453e247f61128cdc
 2018-11-07 10:37:13 +00:00
Ersun Warncke
f3b92bbeec Collabratec Get Projects API (#1092) 
collabratec get projects api

GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495
 2018-11-06 13:48:49 +00:00
Brian Gough
2ea0644cfa Merge pull request #1082 from sharelatex/bg-fix-backslash-on-v1-and-template-import 
fix backslash on v1 and template import

GitOrigin-RevId: 8410a80a06ef48610f7b18f4556bd073253d4eb7
 2018-11-06 08:33:00 +00:00
Alasdair Smith
4733a7940d Merge pull request #1100 from sharelatex/as-html-lang-attr 
Add lang attribute to html tag

GitOrigin-RevId: ddc22ae6e742d9b501bac8d3c35d6640a7635b92
 2018-11-05 14:17:47 +00:00
Jessica Lawshe
81f027b4c3 Merge pull request #1104 from sharelatex/jel-content-bg-color 
Lighten .content-alt background color

GitOrigin-RevId: 3a1f73a469b1a2bb537a3f15722ce115f54e1ed0
 2018-11-01 17:48:20 +00:00
Jessica Lawshe
ce9cdffaa2 Merge pull request #1106 from sharelatex/mm-enable-exports-for-collaborators 
Allow project collaborators with write access to submit/export

GitOrigin-RevId: 13a0786c31aeccde6ca05d332fc3fbcfd11094e5
 2018-11-01 17:48:15 +00:00
Jessica Lawshe
49acb719db Merge pull request #1102 from sharelatex/mm-ensure-history-before-export 
Ensure project has history before exporting

GitOrigin-RevId: 688131fbbca1cd339433d3b9be57a03a32303b3e
 2018-11-01 17:48:09 +00:00
Ersun Warncke
365158f283 Merge pull request #1047 from sharelatex/ew-oauth-authorization 
add oauth middlewear

GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41
 2018-10-30 18:31:47 +00:00
Timothée Alby
0cfb765501 Merge pull request #1090 from sharelatex/spd-sharing-sl-sidebar 
Remove errant space before fullstop in 'sharing_sl' sidebar section

GitOrigin-RevId: 449cce021feebe2e0454d3cd0d7f60dd3df95ea4
 2018-10-30 14:38:32 +00:00
Timothée Alby
3c25fb2759 Merge pull request #1081 from sharelatex/ns-allow-ps-files 
allow for ps files fixes overleaf/sharelatex#1087

GitOrigin-RevId: dea77155d047becc3a8bad3a5958ad49969ec625
 2018-10-30 14:38:26 +00:00
Timothée Alby
c32a891cc8 Merge pull request #1077 from sharelatex/ta-create-institution 
Create Institution When Confirming New Domain

GitOrigin-RevId: c0f5f0edde558eed744e813d6edccfc1f5acf8f0
 2018-10-30 14:38:11 +00:00
Timothée Alby
92582fdc38 Merge pull request #1076 from sharelatex/ta-ui-error-handling 
Management UI Error Handling

GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
 2018-10-30 14:37:59 +00:00
Simon Detheridge
1a9bb5f4eb Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope 
Fix Scope Bug in Group Access Control

GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41
 2018-10-30 10:16:25 +00:00
Simon Detheridge
c18ca779ba Merge pull request #1073 from sharelatex/spd-bonus-page-ui 
Add links and update UI for Bonus page

GitOrigin-RevId: e993d4b7dc59f5ea145892e9cddb87f2193ae013
 2018-10-30 10:16:20 +00:00
Douglas Lovell
b1bda995a6 Merge branch 'deploy-20181029a' 
GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf
 2018-10-29 15:01:41 +00:00
Brian Gough
207b0d84c7 Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error 
handle failure in parallel copy

GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41
 2018-10-29 13:57:02 +00:00
Brian Gough
707a258d5b Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects 
allow creating v2 history for existing project without v2 history

GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909
 2018-10-29 13:56:55 +00:00
Timothée Alby
3d94be22b1 Merge pull request #1065 from sharelatex/ta-manage-group-members 
Manage Group Members

GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9
 2018-10-25 15:26:00 +00:00
Timothée Alby
aa549dd0d4 Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group 
Remove addUserToGroup Action

GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1
 2018-10-25 15:25:55 +00:00
Timothée Alby
aff47a4b11 Merge pull request #1062 from sharelatex/ta-metric-authorization 
Use UserMembership Authorization Middlewear for Metrics

GitOrigin-RevId: a145527723539696c2659baa16c507ab54f629a3
 2018-10-25 15:25:50 +00:00
Timothée Alby
2421e15d7a Merge pull request #1060 from sharelatex/ja-remove-v2-banner 
Remove unneeded v2 banner

GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87
 2018-10-25 15:25:35 +00:00
Alasdair Smith
27fd090075 Merge pull request #1064 from sharelatex/as-fix-500-on-teams 
Fix 500 on /teams route

GitOrigin-RevId: 9f554f9b77fb7fea64db1ad9c4d8635f47efff9e
 2018-10-25 12:51:18 +00:00
Timothée Alby
7af86b0704 Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller 
fix missing next argument

GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce
 2018-10-24 14:03:02 +00:00
Timothée Alby
b123f830ff Merge pull request #1042 from sharelatex/ta-user-membership-access 
User Membership Access Refactor

GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
 2018-10-24 14:02:55 +00:00
Brian Gough
d75d8ee079 Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes 
check the filetype before syncing file

GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
 2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e Merge pull request #1030 from sharelatex/spd-bonus-program 
Implement bonus program

GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
 2018-10-23 11:36:17 +00:00
Jessica Lawshe
7a03fbeb06 Merge pull request #1018 from sharelatex/jel-track-changes-info-page 
Styling for track changes info page and add existence checks for metadata

GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
 2018-10-19 14:12:30 +00:00
Paulo Jorge Reis
6dd9680af8 Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout 
Fix single-quotes breaking layout directive
 2018-10-19 11:30:59 +01:00
Paulo Reis
00a489a000 Fetch brand variation details for branded projects; inject details into the editor page front-end. 
Test brand variation details.

Rename BrandVariationsController to BrandVariationsHandler.

Use the V1 API helper.

Do not swallow errors when fetching brand details for project load.

Fix indentation.
 2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62 Avoid adding custom toggler attributes when the feature flag is false. 2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646 Avoid using Angular eval for user-provided strings in the layout directive. 2018-10-19 10:00:52 +01:00
Brian Gough
c6ec31c773 Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names 
avoid duplicate project names for templates and zips
 2018-10-18 13:51:05 +01:00
Simon Detheridge
6ad16c9406 Merge pull request #1028 from sharelatex/spd-no-github-for-new-users 
retry: Don't add old v1 features for new accounts
 2018-10-17 14:51:46 +01:00
Brian Gough
ad6b3a625a use generateUniquename to create names with timestamps 2018-10-16 14:43:40 +01:00
Hugh O'Brien
3b766bf523 Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id 
Create projects with brand variation id
 2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback 
Add affiliations on university domain confirmation
 2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52 Add additional tests for V1SubscriptionManager 
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.

bug: overleaf/sharelatex#1014
 2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605 Don't add old v1 features for new accounts 
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.

Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.

bug: overleaf/sharelatex#1014
 2018-10-16 09:45:16 +01:00
Simon Detheridge
ec9c38df57 Revert "Don't add old v1 features for new accounts" 2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f Merge pull request #1022 from sharelatex/spd-no-github-for-new-users 
Don't add old v1 features for new accounts
 2018-10-15 15:28:34 +01:00
Timothée Alby
c41fb5c9f4 Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation 
Email confirmation notification UI fixes
 2018-10-15 14:49:06 +02:00
Tim Alby
6f63cd7ca0 add notification to confirm unconfirmed emails 2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a refactor to use config file 2018-10-15 14:46:38 +02:00
Brian Gough
a640397052 make project names unique for zip uploads and template imports 2018-10-15 09:33:39 +01:00
Brian Gough
59cf0aa3cb fix bug in call to findAllUsersProjects 2018-10-15 09:33:39 +01:00
Simon Detheridge
48995d2d44 Don't add old v1 features for new accounts 
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.

Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.

bug: overleaf/sharelatex#1014
 2018-10-12 17:45:57 +01:00
Hugh O'Brien
b825f0b267 Merge branch 'master' into hb-v2-affiliations-callback 2018-10-11 17:14:35 +01:00
Timothée Alby
89590d5199 Merge pull request #1003 from sharelatex/cmg-split-screen-button 
Switch between pdf and editor with full-screen button
 2018-10-11 10:54:53 +01:00
Simon Detheridge
e7506489d1 Fix missing string in modals.pug 
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.

Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-10 15:06:37 +01:00
Paulo Reis
901fb0fc1e Unit test brand variation id. 2018-10-10 14:09:47 +01:00
Paulo Reis
29787c42c5 Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates. 2018-10-10 14:09:47 +01:00
Paulo Reis
a380feab98 Add brand variation id to the Project model. 2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22 Merge pull request #1005 from sharelatex/spd-no-more-asterisks 
Sanitize paths in all relevant ProjectEntityHandler methods
 2018-10-10 10:44:13 +01:00
Simon Detheridge
32149e652f Handle 'invalid element name' error in project list ui 
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.

Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7 update error message 2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800 add account merge error 2018-10-09 09:47:03 -04:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Chrystal Griffiths
7ae39a0f84 Revert to ng-show 2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7 Avoid duplicating code 2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412 Merge pull request #1008 from sharelatex/ta-fix-help-link 
fix link to link sharing help page
 2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c fix link to link sharing help page 2018-10-08 16:07:11 +01:00
Simon Detheridge
56dcbefb5b Check for safe paths in all ProjectEntityHandler methods 
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.

Added checks to all methods in ProjectEntityHandler that can create or rename a file.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-08 15:31:04 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
e66210d2af Add method to sanitize full paths 
For convenience, add a method to SafePath to break a path into components and verify the status of each one.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-08 14:48:17 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850 
Display password change form in Account Settings
 2018-10-08 13:59:04 +01:00
Simon Detheridge
9c189303c1 Merge pull request #1002 from sharelatex/spd-email-cta-links 
Add additional CTA link to emails
 2018-10-08 13:56:21 +01:00
Simon Detheridge
af9c9517f3 Merge pull request #999 from sharelatex/as-validate-password-length 
Validate password length
 2018-10-08 13:55:25 +01:00
hugh-obrien
f6307f9086 store reversedHostname property and update test accordingly 2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46 store reversed hostname and review fixes for v2 university domain confirmation 2018-10-08 12:08:29 +01:00
Jessica Lawshe
b78f362c53 Merge pull request #1000 from sharelatex/jel-meta-img-src 
Handle image_src in metadata layout
 2018-10-08 11:44:10 +01:00
Jessica Lawshe
f04212c96f Merge pull request #995 from sharelatex/ta-remove-confirmed-field 
remove unused confirmed field from user model
 2018-10-08 11:43:42 +01:00
Alasdair Smith
e129172553 Fix ordering of boolean check to be more readable 2018-10-08 11:25:24 +01:00
Alasdair Smith
04572f61bb Fix copy/paste error 2018-10-08 10:44:26 +01:00
Alasdair Smith
676557a051 Refactor to validate in AuthenticationManager 2018-10-08 10:44:25 +01:00
Alasdair Smith
44c86b3769 Refactor to use password strength options 2018-10-08 10:44:25 +01:00
Alasdair Smith
bf60fe7f6c Add error handling for InvalidError 2018-10-08 10:44:25 +01:00
Alasdair Smith
e99165b475 Validate password length when registering 2018-10-08 10:44:25 +01:00
Hugh O'Brien
cc962c3e6f Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal 
Generic Zip or Pdf Exports endpoint
 2018-10-08 10:13:18 +01:00
hugh-obrien
65ecdf84f4 cleanup and tests for v2 affiliations confirmation 2018-10-07 16:40:26 +01:00
hugh-obrien
af3cc01496 Lookup users by email hostname using new field 2018-10-06 17:22:39 +01:00
hugh-obrien
026f7eebcd Setting up hostname field and institution domain confirmation endpoint 2018-10-06 15:57:25 +01:00
Simon Detheridge
286f25529a Remove secondary CTA link from account merge confirmation email 
bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-05 13:19:05 +01:00
Simon Detheridge
d316a76106 Revert "add plain text link to email address confirmation emails" 
This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.
 2018-10-05 13:16:42 +01:00
Simon Detheridge
a2ef0e1ae5 Add additional CTA link to emails 
Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button.

bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-05 12:04:00 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout 
The CMS is already using `image`, which is an object based on data from the API.
 2018-10-05 11:06:21 +01:00
Shane Kilkelly
4c2a90966a Merge pull request #918 from sharelatex/sk-enable-sudo-mode-in-v2 
Enable sudo-mode for v2
 2018-10-05 10:05:24 +01:00
Simon Detheridge
2b8ce379f8 Lookup correct compiler when importing v1 templates 
bug: overleaf/sharelatex#981
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-04 16:42:03 +01:00
Shane Kilkelly
2c47da553b Add an error log if activating sudo-mode on login fails 2018-10-04 15:05:40 +01:00
Shane Kilkelly
778abaff6e Remove stray log 2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df WIP: trying to get acceptance tests to pass 2018-10-04 15:05:40 +01:00
Shane Kilkelly
f9ed367148 Move the auth mechanism for sudo-mode into SudoModeHandler 2018-10-04 15:05:40 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Chrystal Maria Griffiths
6b8eb0ac23 Merge pull request #996 from sharelatex/jel-meta-img 
Update default meta images
 2018-10-04 15:01:19 +01:00
Chrystal Maria Griffiths
e932eb074b Merge pull request #992 from sharelatex/as-fix-mathjax 
Fix mathjax incorrectly loading config
 2018-10-04 15:01:05 +01:00
Chrystal Griffiths
13843f82a0 Use settings appName 2018-10-04 09:57:51 +01:00
Jessica Lawshe
bbe847c16d Update default meta images 
Favicons are not picked up by social sites.
 2018-10-03 17:34:40 +01:00
Tim Alby
5ff66187a0 remove unused confirmed field from user model 2018-10-03 16:01:30 +01:00
Ersun Warncke
752658f773 Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api 
Use v1 Doc Info API for Token Access
 2018-10-03 09:22:41 -04:00
Timothée Alby
e3cfa36b56 Merge pull request #984 from sharelatex/ta-email-cta-link 
add plain text link to email address confirmation emails
 2018-10-03 14:20:05 +01:00
Timothée Alby
c74c782cee Merge pull request #961 from sharelatex/ta-account-sync-affiliations 
Add getInstitutionsPlan Function
 2018-10-03 14:19:56 +01:00
Alasdair Smith
fb8ed890f9 Correctly load Safe mathjax extention using provided config 2018-10-03 11:52:33 +01:00
Brian Gough
ecdd00ecb9 Merge pull request #980 from sharelatex/jel-viewport-metatag 
Add viewport metatag
 2018-10-03 10:10:22 +01:00
Brian Gough
2b738907aa Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error 
clean up broken project on error in ProjectDuplicator
 2018-10-03 10:04:30 +01:00
Ersun Warncke
642b45d0d6 use v1 doc info api 2018-10-02 11:16:46 -04:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Alasdair Smith
f90dd1b49a Merge pull request #986 from sharelatex/as-sign-in-from-v2-post 
Remove POST /docs custom handler, now handled by redirects
 2018-10-02 14:06:57 +01:00
Brian Gough
4621234220 clean up broken project on error in ProjectDuplicator 2018-10-02 12:14:22 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Alasdair Smith
062f26dda3 Remove POST /docs custom handler, now handled by redirects 
Implementing a system for signing into v1 via v2 using POSTs so the
unauthenticated route is no longer necessary
 2018-09-28 14:11:38 +01:00
Tim Alby
4e9737bf71 add plain text link to email address confirmation emails 2018-09-28 13:36:31 +01:00
Alasdair Smith
1330c8da73 Also check if v1 project exported if not found for read-only tokens 2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115 Check if v1 project was exported if not found 
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
 2018-09-28 11:47:14 +01:00
Brian Gough
6d5908f2f4 Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email 
Don't include the license name twice in invite emails
 2018-09-28 11:15:40 +01:00
Brian Gough
1f6abd4e69 fix invalid project names when opening templates 2018-09-28 10:38:25 +01:00
Brian Gough
8f8694ad94 iterate over owned projects in a more robust way 2018-09-28 09:48:15 +01:00
Brian Gough
6b80d3563d add support for creating unique project names 2018-09-28 09:48:15 +01:00
Alasdair Smith
45bd46bc01 Merge pull request #977 from sharelatex/as-encode-auth-with-v1-query-strings 
Encode redirects which will auth with v1 first
 2018-09-28 09:45:54 +01:00
hugh-obrien
52859cdfaa make the zip fetching endpoint for exports generic to either zips or pdfs 2018-09-27 16:11:11 +01:00
Alasdair Smith
4f2c91a59a Add new redirect option to auth with v1, which will urlencode the query string 
This is necessary for the GET /docs endpoint, which can be used to send
urls as part of query parameters. If these are not encoded before
redirecting, they can become corrupted.
 2018-09-27 12:19:16 +01:00
James Allen
0cb563816d Don't enable legacy blog in v2 2018-09-27 10:56:14 +01:00
Alasdair Smith
c2ecccfa02 Use correct setting 2018-09-26 17:35:55 +01:00
Alasdair Smith
f2fa83a218 Fix /teams redirect using wrong setting 2018-09-26 17:04:40 +01:00
Alasdair Smith
9c0a888d11 Add custom redirect for /docs 
We want to redirect POST and GET to different locations, but this is
unsupported by RedirectManager. Therefore we redirect GETs with
RedirectManager and POSTs with this custom route.
 2018-09-26 17:04:40 +01:00
Ersun Warncke
7b90fcb186 Merge pull request #969 from sharelatex/ew-check-doc-token-access 
check access for doc on read only token
 2018-09-25 08:35:56 -04:00
Ersun Warncke
eeed857dd9 change api path 2018-09-25 06:45:27 -04:00
Ersun Warncke
f0c0834b0f only do v1 access check when api config present 2018-09-25 05:42:04 -04:00
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
James Allen
1d657e1700 Merge pull request #968 from sharelatex/ja-show-register-button 
Show register button on OL v2
 2018-09-25 10:25:38 +01:00
James Allen
e2f90ba01a Merge pull request #966 from sharelatex/as-no-project-token-based 
Redirect logged out users to v1 if project is not found from token based url
 2018-09-25 10:25:30 +01:00
Alasdair Smith
298ee2dbb4 Fix v1 return to path 2018-09-25 10:06:24 +01:00
Alasdair Smith
ca895ae1b1 Redirect to v1 via sign in link 2018-09-25 09:37:22 +01:00
Brian Gough
89ba3912c0 Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads 
Replace ShareLaTeX with Overleaf in name of multiple project download file
 2018-09-25 09:33:53 +01:00
Brian Gough
5947294016 Merge branch 'bg-support-main-file-for-templates' 2018-09-25 09:32:14 +01:00
Brian Gough
0d4143205d strip quotes from mainFile 2018-09-25 09:05:49 +01:00
James Allen
19b97e953f Show register button on OL v2 2018-09-25 08:29:34 +01:00
Ersun Warncke
f89e85231a check access for doc on read only token 2018-09-24 18:03:28 -04:00
Alasdair Smith
d6350c963e Remove projectExists flag from higher access check 
Now that find project by read and read/write token methods check whether
the project exists, it is not neccessary to check whether the project
exists in the higher access check. Therefore it has been removed
 2018-09-24 19:00:10 +01:00
Alasdair Smith
99dec02266 If no project found for read/write token, redirect to v1 2018-09-24 19:00:10 +01:00
Alasdair Smith
237810509a If no project found for read token, redirect to v1 2018-09-24 19:00:10 +01:00
Christopher Hoskin
5c35cc9593 Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963) 2018-09-24 16:33:54 +01:00
Brian Gough
418bc10a18 allow getting doc paths by project id 2018-09-24 16:04:23 +01:00
Brian Gough
586e3814fe add missing require 2018-09-24 15:27:16 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Tim Alby
51c5228288 add getInstitutionsPlan function 2018-09-24 13:16:31 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850 
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
 2018-09-24 09:11:48 -03:00
hugh-obrien
5f4a36ca26 remove debug line 2018-09-24 10:49:01 +01:00
hugh-obrien
c0b32f031e force gallery items to use legacy OL v1 texlive image 2018-09-24 10:49:01 +01:00
Alasdair Smith
b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith
945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +01:00
James Allen
772ac42005 Fix messed up rebase 2018-09-21 10:42:20 +01:00
Alasdair Smith
3462b8042e Add /chrome redirect to match v1 behaviour 2018-09-21 10:35:43 +01:00
James Allen
2d9cadb487 Merge pull request #935 from sharelatex/as-teams-redirect 
Add route to handle /teams similar to v1
 2018-09-21 08:37:10 +01:00
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Jessica Lawshe
488886c1d2 Merge pull request #929 from sharelatex/jel-homepage 
Add Homepage
 2018-09-20 09:01:13 -05: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
d023150b0f Add v2 homepage 
Specific homepage filenames and redirect to login when not found

Move variables to shared file

Move circle image styling to shared file

Leaving float on plans page because of some layout differences
 2018-09-20 08:57:07 -05:00
Hugh O'Brien
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03:00
Hugh O'Brien
b377b89447 Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails 
fix exception when user has no emails field
 2018-09-19 11:33:03 +01:00
Hugh O'Brien
78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta 
Replace profile completion CTA with affiliations CTA
 2018-09-19 11:32:55 +01:00
Hugh O'Brien
18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification 
Add notification to confirm unconfirmed emails
 2018-09-19 11:32:44 +01:00
Shane Kilkelly
e1c3689aec Update the email-merge email template 2018-09-19 09:28:59 +01:00
Shane Kilkelly
2ec7747b60 Add a help link to the account-merge email in case of error 2018-09-19 09:28:59 +01:00
Shane Kilkelly
c95d925d56 When regenerating session, don't copy the __tmp key 2018-09-19 09:28:59 +01:00
Shane Kilkelly
c9e3418049 Working overleaf-side of account-merge 2018-09-19 09:28:59 +01:00
Shane Kilkelly
fcfcbdb4c5 Remove dead code 2018-09-19 09:28:59 +01:00
Shane Kilkelly
d0be98e89c Move the account-merge-finish page to the integration module 2018-09-19 09:28:59 +01:00
Shane Kilkelly
677b3c759d Remove old controller 2018-09-19 09:28:59 +01:00
Shane Kilkelly
843f1c6b35 Move AccountMergeEmailController to integration module 2018-09-19 09:28:59 +01:00
Shane Kilkelly
54a5c563fb Address feedback 2018-09-19 09:28:59 +01:00
Shane Kilkelly
b0e4b12714 Finish off the copy of the account-merge-finish page 2018-09-19 09:28:59 +01:00
Shane Kilkelly
5e17dfd1cb Also add the final email to the array of emails on the account 2018-09-19 09:28:59 +01:00
Shane Kilkelly
efb6018246 Add a rate-limit to the email-confirm endpoint 2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26 Roughly working account-merge-by-email callback endpoint 2018-09-19 09:28:59 +01:00
Shane Kilkelly
958c7a19b6 Add a skeleton of a callback endpoint for merging accounts via email 2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135 WIP: add email-based account merge flow to ShareLaTeX 2018-09-19 09:28:59 +01:00
Alasdair Smith
bdcc25805e Add route to handle /teams similar to v1 2018-09-18 17:14:37 +01:00
Brian Gough
02854274a7 2018-09-18 14:09:05 +01:00
Douglas Lovell
4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03:00
hugh-obrien
277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +01:00
Timothée Alby
b16cffe587 Merge pull request #932 from sharelatex/as-redirect-query-string 
Support passing through query params in redirects
 2018-09-18 12:35:21 +01:00
Timothée Alby
b6925647ef Merge pull request #922 from sharelatex/ta-forbid-null-query 
Prevent Calls to UserGetter.getUser with Null Query
 2018-09-18 12:24:19 +01:00
Timothée Alby
7981d867e8 Merge pull request #924 from sharelatex/ta-sign-in-v1 
Change Links to v1 to Sign User In
 2018-09-18 12:24:08 +01:00
Alasdair Smith
7e358ab318 Support passing through query params 2018-09-18 11:34:04 +01:00
hugh-obrien
2d40c3d21a Use existing notification styling 2018-09-18 11:01:10 +01:00
hugh-obrien
f76ff55b6f email alert styling 2018-09-18 10:54:20 +01:00
hugh-obrien
e343c04423 add notification to confirm unconfirmed emails 2018-09-18 10:54:20 +01:00
hugh-obrien
6f00d1f45a send required export fields for s1 submission 2018-09-18 10:05:35 +01:00
Jessica Lawshe
203c005f26 Merge pull request #928 from sharelatex/jel-content-updates 
Link mixin paths and universities list styling
 2018-09-17 13:16:52 -05:00
Jessica Lawshe
6fc7468b02 Thousands of templates 2018-09-17 10:47:57 -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
Jessica Lawshe
66bfbce45f Correct link mixin paths 2018-09-17 09:46:34 -05:00
James Allen
15103ac894 Support the same URL with multiple methods in redirects 2018-09-17 15:38:58 +01:00
James Allen
40f08d1592 Add additional functionality to RedirectManager 2018-09-17 15:38:45 +01:00
Chrystal Maria Griffiths
784984dd78 Merge pull request #923 from sharelatex/cmg-share-modal 
Show share button for collaborators
 2018-09-17 15:19:44 +01:00
Alasdair Smith
42cef8e393 Merge pull request #920 from sharelatex/mm-gallery-exports 
Add gallery fields to export controller and handler
 2018-09-17 09:42:26 +01:00
Alasdair Smith
e1e7091f30 Merge pull request #905 from sharelatex/as-project-intelligent-redirect 
Intelligently redirect to v1 if no v2 project found
 2018-09-17 09:40:52 +01:00
Douglas Lovell
7d10e64840 Alter endpoint for account settings, change password form submission. 2018-09-14 16:19:02 -03: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
Tim Alby
41b92d4647 prevent calls to UserGetter.getUser with null query 2018-09-14 12:46:00 +01:00
Chrystal Griffiths
6334066d2d Merge branch 'master' into cmg-share-modal 2018-09-14 12:09:10 +01:00
Chrystal Griffiths
915bd18058 Read-only collaborators table 2018-09-14 11:47:18 +01:00
Michael Mazour
79dc415064 Slightly refactor exports controller body handling 
1. Move all body parsing together
2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.
 2018-09-14 11:02:51 +01:00
Michael Mazour
10fcdd6daf Add optional gallery fields to export request 
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
 2018-09-14 11:02:51 +01:00
Chrystal Griffiths
3b43cf9075 Slight copy change 2018-09-13 17:57:11 +01:00
Tim Alby
0051e59309 remove unused call to UserGetter.getUser 2018-09-13 17:39:30 +01:00
Chrystal Griffiths
b51fc01bde Remove temporary solution 2018-09-13 17:17:18 +01:00
James Allen
ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
hugh-obrien
26defd0833 reword CTA 2018-09-13 13:54:43 +01:00
hugh-obrien
8697edc149 replace profile completion CTA with affiliationa adding CTA 2018-09-13 12:34:18 +01:00
Chrystal Griffiths
57ac858004 Style the notice 2018-09-13 12:19:44 +01:00
Alasdair Smith
f37040e4a4 Only redirect if has overleaf setting 2018-09-13 12:09:19 +01:00
Alasdair Smith
8a969d1c25 Redirect directly from controller instead of via handler 2018-09-13 12:09:19 +01:00
Alasdair Smith
9d600afdf8 Fix failing tests for token access 
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
 2018-09-13 12:09:19 +01:00
Alasdair Smith
24495f3340 Also redirect not found read tokens to v1 2018-09-13 12:09:19 +01:00
Alasdair Smith
e0ce988d32 Intelligently redirect to v1 if no v2 project found for token 2018-09-13 12:09:19 +01:00
James Allen
5dbebc0693 Translate 'by' 2018-09-13 10:38:52 +01:00
James Allen
dd4b85b809 Combine v1 and v2 projects into item.pug 2018-09-13 10:38:52 +01:00
James Allen
225d30ffd2 Add missed lines from rebase 2018-09-13 10:38:52 +01:00
James Allen
c072961183 Update project-list list to a table and show last updated user 2018-09-13 10:38:52 +01:00
James Allen
ab10336110 Record last update time and user from project-history 2018-09-13 10:38:52 +01:00
Hugh O'Brien
24c479e984 Merge pull request #885 from sharelatex/hb-ip-matcher-notifications 
IP matcher affiliation CTA notifications
 2018-09-13 08:59:25 +01:00
Brian Gough
6d54e843e8 fix typo in Errors, only two underscores in __proto__ 2018-09-12 10:45:50 +01:00
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03:00
Ersun Warncke
7d3e17651f set options and method for request, pass cookies and form body 2018-09-10 06:10:36 -04:00
hugh-obrien
1e04a09ec6 remove unnecessary error returns and ip fetching 2018-09-07 18:15:32 +01:00
Chrystal Griffiths
46eadfada4 Conditionally show sharing bits 2018-09-07 17:23:03 +01:00
Jessica Lawshe
aa2f6ad0dd Merge pull request #880 from sharelatex/jel-v2-launch-plans 
Launch v2 Plans Page
 2018-09-06 08:51:05 -05:00
Shane Kilkelly
3d369b725c Add another confirmation checkbox to account-delete. 
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
 2018-09-06 11:35:28 +01:00
hugh-obrien
8ef90a0dcb move call for creating ip matched notifcation to project controller 2018-09-05 15:40:59 +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
Jessica Lawshe
65b2715e62 Remove unused layout for v2 plans 2018-09-05 08:14:05 -05:00
Jessica Lawshe
a4956294c1 Remove plans redirect 2018-09-05 08:14:05 -05:00
Tim Alby
9ec60a128a add userHasSubscriptionOrIsGroupMember alias 2018-09-05 11:37:37 +01:00
hugh-obrien
5605e1c5c3 update copy for ip match notifications 2018-09-05 11:22:26 +01:00
hugh-obrien
23e6292fd7 updating tests for ip matcher logic 2018-09-05 11:22:26 +01:00
hugh-obrien
f20d27986b create ip match notifications without forcing replacement 2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f use new routes and params from v1 ip matcher endpoint 2018-09-05 11:22:26 +01:00
hugh-obrien
bf2ea4e7b3 test against ip matcher for notification on login if different from previous ip 2018-09-05 11:22:26 +01:00
hugh-obrien
38faa5c25e correctly create and display ip matched affiliations 2018-09-05 11:22:25 +01:00
hugh-obrien
fa23ea75b8 Call university ip matcher api when checking notifications 2018-09-05 11:22:25 +01:00
James Allen
24f60bf791 Don't include the license name twice in invite emails 2018-09-05 11:05:38 +01:00
Shane Kilkelly
d432b6799f Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix 
Don't Regard v1 Teams as Paid Subscriptions
 2018-09-05 10:22:46 +01:00