github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
8345 commits 3 branches 7 tags 201 MiB
Commit graph

7997 commits

Author SHA1 Message Date
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
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
e9b18af2e1 Merge pull request #1389 from sharelatex/hb-publisher-summary 
Adds summary section to publishers hub

GitOrigin-RevId: 1257b4d478cad97c07bf4407176136d58248bdba
 2019-01-17 15:15:39 +00:00
Timothée Alby
5169b4a73f Merge pull request #1415 from sharelatex/ta-trial-fix 
Check if Trial is Current in Subscription Page

GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1
 2019-01-17 15:15:33 +00:00
Shane Kilkelly
126edeb4bb Merge pull request #1396 from sharelatex/as-cleanup-eslint 
Cleanup some unused eslint config

GitOrigin-RevId: 6579ad615188ea32a8817964bf95c5c9b121faef
 2019-01-17 10:11:46 +00:00
Shane Kilkelly
539f2c3d1a Merge pull request #1385 from sharelatex/sk-fix-references-auto-parse 
When we upload or create a bib file, re-index and load citations

GitOrigin-RevId: 2dbf73e8d33147a76e22db7519cd18b165598ca9
 2019-01-17 10:11:38 +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
Alasdair Smith
79078ac1bb Merge pull request #1402 from sharelatex/jel-wiki-search-url 
Wiki search URL path and section anchors

GitOrigin-RevId: 93565d54c3c352f25b20c03e51efd257b5412021
 2019-01-16 11:31:28 +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
0879226f74 Merge pull request #1330 from sharelatex/as-fix-prettier-ignore 
Fix linting ignoring index.js files in modules

GitOrigin-RevId: 8ac9fa8f8655553680678b206848d1a66718d821
 2019-01-15 10:55:36 +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
8717ddffad Merge pull request #1331 from sharelatex/as-publish-modal-tests 
Publish modal tests

GitOrigin-RevId: 7e068ce05c02d61793419a5344501ca0ea51ed5f
 2019-01-11 14:44:05 +00:00
Simon Detheridge
97d6f81d7c Merge pull request #1335 from sharelatex/spd-account-delete-email 
Make email check on account deletion modal case-insensitive

GitOrigin-RevId: 3dd80e9390e069b5c2f30632e61dc8c4bc39d9ad
 2019-01-11 14:43:58 +00:00
Simon Detheridge
7807435c2d Merge pull request #1353 from sharelatex/spd-incorrect-test-description 
Fix incorrect test description (copy-paste error)

GitOrigin-RevId: f45b5baec2c65d459324668e9cfca02c946c07f3
 2019-01-11 14:43:54 +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
f49523f6bc Merge pull request #1375 from sharelatex/spd-open-in-overleaf-brand-variation-ids 
open-in-overleaf: Add support for 'brand_variation_id' parameter
GitOrigin-RevId: 65c7732c3a3b85e524e9ac1ae6f13cd322ef8ccb
 2019-01-11 14:43:44 +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
Ersun Warncke
d30c0a964c Merge pull request #1367 from sharelatex/ew-remove-duplicate-v1-ids 
remove duplicate v1 ids

GitOrigin-RevId: 9edc94e992f4a8ac653a7cd79490207a0154b3ae
 2019-01-10 08:14:53 +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
Jessica Lawshe
a521a86fb7 Merge pull request #1340 from sharelatex/jel-sanitize-html-options 
HTML sanitize options for icons and tables

GitOrigin-RevId: 1f2cc444120ebbefb9583eda95e8edfba4e7d1d8
 2019-01-07 16:15:57 +00:00
Jessica Lawshe
c6879a2184 Merge pull request #1339 from sharelatex/jel-single-wiki-index 
Update contact form to use main wiki index

GitOrigin-RevId: 5fd4f6ef0a38e1e11e0fa4367fd6b21d1afbccc9
 2019-01-07 16:15:51 +00:00
Jessica Lawshe
e619185569 Merge pull request #1347 from sharelatex/jel-sanitize-html-options-del 
Allow <del> in sanitize HTML default options

GitOrigin-RevId: 212c13e77e62717abc85248d0255c6e9729031a9
 2019-01-07 16:15:45 +00:00
Jessica Lawshe
fc6cec5758 Merge pull request #1349 from sharelatex/jel-screen-reader-del 
Add accessibility styling for <del>

GitOrigin-RevId: 85a52f777d05a7da886075e03ccaaa52d2aa2382
 2019-01-07 16:15:40 +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
258ce15d91 Merge pull request #1334 from sharelatex/spd-password-tweaks 
Make password verification on backend match frontend when changing passwords

GitOrigin-RevId: e15aa103549d4d5753118b09cd0fc0551efa2654
 2019-01-03 15:25:31 +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
93bf6fcb19 Merge pull request #1323 from sharelatex/spd-open-in-overleaf-documentation 
Open in Overleaf: Add '/devs' documentation page

GitOrigin-RevId: 4ab5a296570bee147cd79bccb436392f941c076b
 2019-01-03 10:20:50 +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
Christopher Hoskin
95c8e29e66 Merge pull request #1322 from sharelatex/csh-issue-1309-node-6.15.1 
Bump node to 6.15.1

GitOrigin-RevId: 7ae516d1231cd79baf0ff29768768a53b1f5f080
 2019-01-02 16:03:52 +00:00
Ersun Warncke
c313b255bb Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2 
Add more acceptance tests for git-bridge api

GitOrigin-RevId: 404c857fb73686d7073cd314dd4ee050a5b2e3bc
 2018-12-21 12:23:02 +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
James Allen
2cf7fefaeb Merge pull request #1307 from sharelatex/pr-git-bridge-modal 
Redo the git bridge trial modal.

GitOrigin-RevId: 9ddb61a84a018459fa040ab1514dc35085c93d4e
 2018-12-20 15:48:58 +00:00
James Allen
5a7f72c9f9 Merge pull request #1302 from sharelatex/jel-cms-iframe-attr 
Allow style attribute on iframes

GitOrigin-RevId: f6a88f544eab665fecc00b8c89e87d489f39b88d
 2018-12-20 15:48:52 +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
0c1e754736 Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2 
Add support for labeled-versions in git-bridge api.

GitOrigin-RevId: 94858627034ffd000d49b92ba5c7ab45e7294840
 2018-12-20 10:55:59 +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
531f5fb6ee Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions 
open-in-overleaf: Add support for partner and client_media_id parameters
GitOrigin-RevId: a4c18a03affa62a1ef2cfb0c595766724ba8969b
 2018-12-19 16:02:47 +00:00
Simon Detheridge
d2465f8d6a Merge pull request #1297 from sharelatex/ja-rate-limit-v2-login 
Add rate limit to v2 login end point

GitOrigin-RevId: 81b14387e4a6381f4c0eae17e43af84b2af7fea5
 2018-12-19 16:02:38 +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
366dbbd54f Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff 
Make comments cancel when you cancel them on firefox

GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
 2018-12-19 10:38:35 +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 Reis
4ff98f0237 Import history compare controller. 
GitOrigin-RevId: 61d9a3f340703b07046bb6d7a6d67905befd6faa
 2018-12-17 12:54:07 +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
bd8642cedd Merge pull request #1272 from sharelatex/jel-login-password-error-view 
Add password reset link when password wrong/missing

GitOrigin-RevId: b0b5b5c0f8019d73e028890543da51e5e474a883
 2018-12-14 21:12:19 +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
1836932256 Merge pull request #1247 from sharelatex/sk-git-bridge-acceptance-tests 
Git bridge acceptance tests (initial)

GitOrigin-RevId: 66736ed568296674046b368861446eeb6eae664b
 2018-12-13 15:09:53 +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
65c1943c63 Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2 
Move to running acceptance tests in same process as web server

GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd
 2018-12-13 09:25:50 +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
Ersun Warncke
42c3ffbca4 Merge pull request #1218 from sharelatex/hb-publishers-hub-v2 
Publishers hub v2

GitOrigin-RevId: 532d7afde471a39ec2e63a045d40769c7c37d06f
 2018-12-10 20:12:20 +00:00
Simon Detheridge
22cd3f9273 Merge pull request #1237 from sharelatex/spd-open-in-overleaf-zip_uri 
Add zip_uri and publisher_slug to Open In Overleaf API

GitOrigin-RevId: 2be4b7a0fe521fc4a4415100ac20190bf6e0df6a
 2018-12-10 13:28:06 +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
Timothée Alby
e0148bf69b Merge pull request #1213 from sharelatex/ta-fix-mocks 
Fix Missing Mocks

GitOrigin-RevId: 1ef7359eb65dd7dc0a4b48547b0a8b47e5dc318e
 2018-12-05 15:12:05 +00:00
Simon Detheridge
2973302e73 Merge pull request #1230 from sharelatex/spd-fix-projectrootdocmanager-tests 
Fix tests in ProjectRootDocManager

GitOrigin-RevId: b68c4b597f24a009c35a0f83f4573fdf84959cd7
 2018-12-05 13:40:16 +00:00
James Allen
79a7a596b0 Merge pull request #1228 from sharelatex/ja-fix-subscription-tests 
Remove redundant sandboxed module require in tests

GitOrigin-RevId: 957af70aacefed34f853549ef2357f59c01a4b3e
 2018-12-05 12:32:41 +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
James Allen
fc069c1752 Merge pull request #1216 from sharelatex/ja-remove-only-from-tests 
Remove stray 'only' in acceptance tests

GitOrigin-RevId: 37417cfb98a512584723f5eaf6c3c684b5c60f68
 2018-12-03 18:02:11 +00:00
Simon Detheridge
eed29c0adc Merge pull request #1189 from sharelatex/spd-open-in-overleaf-zip-files 
open-in-overleaf: Zip file support
GitOrigin-RevId: 06442e44d5333fab5df3e48e76fc13c5bcbbd7ba
 2018-12-03 11:20:49 +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
Jessica Lawshe
e8b7ab1f8a Merge pull request #1195 from sharelatex/jel-portal-ieee 
Add IEEE portal

GitOrigin-RevId: 7f3ba43be0874791cfd32bb8bf3004aac61b22d3
 2018-11-29 15:27:09 +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
03b37b0289 Merge pull request #1177 from sharelatex/jel-active-tab-css 
Fix active tab link styling

GitOrigin-RevId: ec8da3ccb7514f70b1b5021e65a6ef60ba920318
 2018-11-26 16:53:37 +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
Ersun Warncke
87409d4b6a Merge pull request #1152 from sharelatex/ew-collabratec-delete-project-api 
collabratec delete project api

GitOrigin-RevId: f40a8cb7ce13f559842c8f22380976780a1c0ef7
 2018-11-26 15:44:56 +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
Paulo Jorge Reis
80dde39e56 Merge pull request #1169 from sharelatex/pr-ignore-unhandled-rejection-error 
Ignore unhandled rejection error globally

GitOrigin-RevId: 29574973e78f44caeb965b70b3dc43681275e05d
 2018-11-22 11:11:29 +00:00
Jessica Lawshe
c20a506f0e Merge pull request #1161 from sharelatex/jel-extend-sanitize-options-cms 
Extend sanitize HTML options

GitOrigin-RevId: da9dd1741ca31f095e4fafe91c1beb9abd019567
 2018-11-20 18:05:36 +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
392be7cb44 Merge pull request #1165 from sharelatex/ja-fix-undefined-id-error 
Fixes an undefined _id error when looking for project owner for new project

GitOrigin-RevId: 6ad5230380431b4a5866088911ce27175633dbbb
 2018-11-19 16:02:07 +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
Paulo Jorge Reis
02eb683298 Merge pull request #1113 from sharelatex/pr-compile-only-ol-dark-dev 
Move LESS compilation process to Makefile

GitOrigin-RevId: 5a3871759eda2685ec0690899b0904d45c7db0a6
 2018-11-16 12:02:47 +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
0bf66e8b99 Merge pull request #1150 from sharelatex/sk-add-git-bridge-public-base-url 
Add `gitBridgePublicBaseUrl` to default settings

GitOrigin-RevId: 19aeb6b9cf2e04e38ec24c15538fed1bcab9c784
 2018-11-15 10:04:39 +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
9d4c3039e7 Merge pull request #1123 from sharelatex/as-fix-missing-dates 
Don't show missing dates and show confirmed emails in admin console

GitOrigin-RevId: 6866d7869ec852de89be35b7b3d0725dcc195e6e
 2018-11-15 10:04:28 +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
e0e6a72374 Fix the gitignore pattern for index.js in modules 
GitOrigin-RevId: c5fef305f47a5e738790c079b17cef330f858d4c
 2018-11-14 12:17:23 +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
6cd35d66d5 Set tax type to digital in Recurly plans script 
GitOrigin-RevId: 3f30aadc1dd27a7b7e37ca096404a9d12a68d29e
 2018-11-13 15:02:30 +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
568273ba14 Merge pull request #1134 from sharelatex/issue-pr-templates 
Add issue and PR templates

GitOrigin-RevId: 777a322d77be482233b7e3b02f533e47b735436a
 2018-11-13 10:54:10 +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
ecd7e1d0c2 Merge pull request #1129 from sharelatex/jel-accessible-focus 
Focus styling for menu and contact form

GitOrigin-RevId: e8288308f8284eae1374fb774d8290b190c47d3a
 2018-11-08 16:12:08 +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
9752aa2fad Merge pull request #1054 from sharelatex/jel-wiki-mobile-and-link-style 
Wiki mobile and link style

GitOrigin-RevId: 6556d63d8662de115d634f59655c6479494ec407
 2018-11-08 16:11:54 +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
7006e30d7f Merge pull request #1110 from sharelatex/jel-tab-focus-accessibility 
Fix tab focus styling

GitOrigin-RevId: bb94e07b0d8dfd9c20cf2b0ef9db3d33d9c333db
 2018-11-07 10:37:23 +00:00
Simon Detheridge
b39cdbc874 Merge pull request #1116 from sharelatex/as-fix-history-error 
Fix error thrown when viewing history with non-default font size

GitOrigin-RevId: f4f561bfe25537663cddf79d1867393bd209dd38
 2018-11-07 10:37:18 +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
Alasdair Smith
221acb8207 Merge pull request #1111 from sharelatex/as-fix-spell-check 
Fix bug where read only editor would crash

GitOrigin-RevId: ed8ac8ddcec118b57e20916afaddb50d5062b2cf
 2018-11-05 14:17:40 +00:00
Alasdair Smith
659242b457 Merge pull request #1037 from sharelatex/as-decaffeinate 
Decaffeinate frontend

GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de
 2018-11-05 10:19:25 +00:00
Simon Detheridge
4842a45d8c Merge pull request #1109 from sharelatex/spd-module-gitignore 
Remove .gitignore files from modules and add to main ignore file

GitOrigin-RevId: e71d07e8e4915077a89d824a68514c0936d9612c
 2018-11-02 15:01:21 +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
23a57f3aa0 Merge pull request #1079 from sharelatex/ta-fix-metrics-style 
Minor Metrics Style Fix

GitOrigin-RevId: 102d8d19f42d570e7ae64e2b9c634e4bb8f8e601
 2018-10-30 14:38:20 +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
8a6b7df071 Merge pull request #1080 from sharelatex/as-fix-linting 
Fix linting not running on modules

GitOrigin-RevId: 12a27fc9e1c9b41202e04b6272e5b42289603f3a
 2018-10-30 10:16:29 +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
edd832b1f2 Merge pull request #1067 from sharelatex/ta-add-missing-mock 
Add Missing Test Mock

GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f
 2018-10-25 15:25:44 +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
Timothée Alby
fd8b7fbb6c Merge pull request #1068 from sharelatex/jel-link-to-tab 
Fix .link-to-tab when link within a tab

GitOrigin-RevId: b2d5482771caef5abc4afa4d270f64598f72f0d7
 2018-10-25 15:25:29 +00:00
Alasdair Smith
f442fd65e3 Merge pull request #1043 from sharelatex/as-increase-heading-line-height 
Increase line-height of headings

GitOrigin-RevId: 57d1c87f4c480fb6de0a1ca24f7e80edfe748a68
 2018-10-25 12:51:28 +00:00
Alasdair Smith
39a7c80b07 Merge pull request #1066 from sharelatex/as-add-templates-nav 
Fix navbar collapsing too late at small screen sizes

GitOrigin-RevId: 8bfe1dbe89cf8721bc72b0a632533776873459b7
 2018-10-25 12:51:23 +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
27475bd980 Merge pull request #1059 from sharelatex/ja-ignore-modules-makefiles 
gitignore module makefiles

GitOrigin-RevId: e8473b8e23f59ecfb27b449a503f8a7b023533a2
 2018-10-24 14:03:16 +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
Timothée Alby
3abfe36279 Merge pull request #1057 from sharelatex/ja-update-git-ignore 
Don't gitignore new module directories

GitOrigin-RevId: f6c4a65af6fa98c879c0ceb952f3161d6f395dee
 2018-10-24 12:49:53 +00:00
James Allen
eecbbc045d Merge pull request #1044 from sharelatex/ja-merge-modules 
Merge modules into web monorepo

GitOrigin-RevId: 742df73bff72010b01c93e20759a489969b04ed3
 2018-10-24 10:29:57 +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
24a2cafc33 Merge pull request #1038 from sharelatex/jel-style-improvements 
Content pages style improvements

GitOrigin-RevId: 6cb212deba561ebfa6349bdfcf16e309679be275
 2018-10-19 14:12:35 +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
James Allen
1aecd0be3d Merge pull request #1039 from sharelatex/ja-copybara 
Sync to OSS repo using copybara

GitOrigin-RevId: 5ce0c08d614f3d84e7c3e1f9b3413681e5049103
 2018-10-19 12:46:51 +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
Jessica Lawshe
a1fa48b3ed Merge pull request #1033 from sharelatex/jel-portal-default-bg 
Add default portal background
 2018-10-18 10:31:07 -05:00
Jessica Lawshe
96b24a80ca Merge pull request #944 from sharelatex/jel-linkable-tabs 
Linkable tabs directive
 2018-10-18 10:30:58 -05: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
Jessica Lawshe
88f3fce26e Add default portal background 2018-10-17 17:00:50 -05:00
Jessica Lawshe
1362da710b Watch for hash change for tabs 2018-10-17 09:31:48 -05:00
Jessica Lawshe
97fdf72346 If hash not empty and remove unused file 2018-10-17 09:31:48 -05:00
Paulo Reis
1424ae686a Add scrollIntoView behaviour. 2018-10-17 09:31:48 -05:00
Paulo Reis
399a9ed604 Create bookmarkable tabs directive. 2018-10-17 09:31:48 -05:00
Alasdair Smith
baf8b599d7 Handle hash-bang urls used sometimes in v1 2018-10-17 09:31:48 -05:00
Jessica Lawshe
8e99142537 Add main CMS controller 
Main is in index now, and blog controller moved to separate file
 2018-10-17 09:31:48 -05:00
Jessica Lawshe
bec50892de Linkable tabs 2018-10-17 09:31:48 -05: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