github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
8663 commits 3 branches 7 tags 206 MiB
Commit graph

8315 commits

Author SHA1 Message Date
Miguel Serrano
27985458ea Uploading an empty zipfile throws specific error (#1909) 
Added a counter for the total files extracted from a zip. If no files are extracted a specific error is thrown.

GitOrigin-RevId: 391bb669500c86e2e7fecebd90e2201248a8afd3
 2019-07-02 10:58:58 +00:00
Simon Detheridge
67c0a3c2a4 Merge pull request #1933 from overleaf/spd-leave-project-without-tags 
Fix crash when leaving a project with no tags

GitOrigin-RevId: fcbbea5907d3e967785e3f21de039f02bc2123c0
 2019-07-02 09:16:28 +00:00
Simon Detheridge
b86f46a4f8 Merge pull request #1885 from overleaf/sk-dep-upgrades-2019-06 
Update logger, metrics, and redis client

GitOrigin-RevId: fa425f37c9065dc644da44f62e89a9955ce09f66
 2019-07-02 09:16:23 +00:00
Hugh O'Brien
f84c43a7b7 Merge pull request #1913 from overleaf/jel-v1-logout 
Remove the v1-logout endpoint

GitOrigin-RevId: 4a31f277c2cf1fa0f8c76c546728dae3eb7665c7
 2019-07-01 15:31:08 +00:00
Timothée Alby
b1e8cb9cf0 Merge pull request #1924 from overleaf/ta-full-error 
Don't Callback with String

GitOrigin-RevId: 82e3efb055ef197d95ff9c8a876bee0d6a0327a3
 2019-07-01 14:06:54 +00:00
Timothée Alby
c86910a5ef Merge pull request #1912 from overleaf/ta-invite-404 
Better Handling of Invites not Found

GitOrigin-RevId: 6fddd1dca772bb4b5108fef433044720fb78c4e9
 2019-07-01 14:06:49 +00:00
Timothée Alby
e029616ed4 Merge pull request #1914 from overleaf/jel-no-pw-message 
Check for password on delete modal

GitOrigin-RevId: a2ec40b9c73e92490a9dfd0377b10f9d1831f56f
 2019-07-01 14:06:42 +00:00
Timothée Alby
e73a5d9103 Merge pull request #1923 from overleaf/ta-error-log-level 
Reduce Log Level

GitOrigin-RevId: 63a8859e6b78cb0774a28069089f4bce73eb91ec
 2019-07-01 14:06:36 +00:00
Brian Gough
cf940cc835 Merge pull request #1916 from overleaf/ta-join-project-404 
Return 404 on JoinProject When Project Is Not Found

GitOrigin-RevId: cd87ce6e2564fd4a80faa66e8b22edec7b0c783c
 2019-07-01 09:25:41 +00:00
Miguel Serrano
0e52453931 Merge pull request #1908 from overleaf/as-remove-tags-on-leave 
Remove tags when leaving project

GitOrigin-RevId: 833412264d09348b02f57fb60cd0f07d81cfc037
 2019-06-27 10:32:12 +00:00
Miguel Serrano
dc54a261e3 Merge pull request #1907 from overleaf/as-fix-tag-project-count 
Fix tag project count

GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
 2019-06-27 10:32:01 +00:00
Miguel Serrano
f8ad17c01b Merge pull request #1910 from overleaf/msm-project-cleanedup-after-failed-upload 
Project is cleaned up after zip upload fails

GitOrigin-RevId: a09bb51161d0565a5c7eb55a5e29530f8ec65eb6
 2019-06-27 10:31:48 +00:00
Miguel Serrano
8a825bb065 Merge pull request #1902 from overleaf/msm-return-429-tdps-update-too-many-connections 
Project on cooldown returns 429 on TDPS update

GitOrigin-RevId: b8da35a61be7508bc56d7798d233c186f694c364
 2019-06-27 10:31:38 +00:00
Brian Gough
30d8247d54 Merge pull request #1911 from overleaf/bg-block-non-bmp-characters 
block null and non-BMP characters in Ace

GitOrigin-RevId: cdeaffc88e128a62463229d5cb55143028f23112
 2019-06-26 11:07:20 +00:00
Simon Detheridge
bd3f59c22a Merge pull request #1895 from overleaf/jel-oauth-db-flip 
Add setting var for OAuth data source

GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
 2019-06-25 11:22:17 +00:00
Simon Detheridge
aa5f45e128 Merge pull request #1891 from overleaf/revert-1889-as-fix-cached-icons 
Switch back to better icon naming scheme

GitOrigin-RevId: f41e01b2fec2d3af35603ef6b6120f4cafa1b981
 2019-06-25 11:22:08 +00:00
Simon Detheridge
14c176a832 Merge pull request #1896 from overleaf/as-remove-v1-return-message-flag 
Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05
 2019-06-25 11:21:58 +00:00
Miguel Serrano
ab07761eef Merge pull request #1863 from overleaf/msm-refactor-project-upload-manager-promises 
Refactored ProjectUploadManager to support Promises

GitOrigin-RevId: 1d747f5ca07164299060bb27c6f14fa9e2968fdf
 2019-06-24 13:31:35 +00:00
Simon Detheridge
757ae39487 Merge pull request #1899 from overleaf/spd-implicit-return-tests 
Decaf cleanup: Remove implicit return from 'it' and 'describe' in tests

GitOrigin-RevId: f297820e6212dddc0d60697a2fe1612ef27403b6
 2019-06-21 13:58:57 +00:00
Simon Detheridge
6fc507aea3 Merge pull request #1883 from overleaf/as-remove-rttc-beta-program 
Move rich text track changes out of the beta program

GitOrigin-RevId: 4b23a42f3b2ef53012b5c6cca310fe82de5d9a0c
 2019-06-21 13:58:52 +00:00
Simon Detheridge
6e238a8345 Merge pull request #1898 from overleaf/as-tags-archived-projects 
Clean up decaffeinated project list code

GitOrigin-RevId: ae2408b8768eb8be02b4cf80be5400bb707fff66
 2019-06-21 13:58:46 +00:00
Simon Detheridge
d1e587a51e Merge pull request #1864 from overleaf/ta-analytics-backoff-strategy 
Update Analytics Backoff Strategy

GitOrigin-RevId: 9a3dc11ee19ff03432730a36617208ac7f58c5be
 2019-06-21 10:10:52 +00:00
Simon Detheridge
c30e83a4ed Merge pull request #1877 from overleaf/em-filestore-range-request 
Get file size before truncating files for preview

GitOrigin-RevId: 0822691d75bd8bfe3d6cfd23f9ca4b1c3be20585
 2019-06-20 11:30:50 +00:00
Simon Detheridge
1e14f75e08 Merge pull request #1872 from overleaf/hb-autocomplete-braces 
Autocomplete braces bugfixes

GitOrigin-RevId: 9b3af30b71b85cf95288b0388c9af7792b87ca80
 2019-06-20 11:30:44 +00:00
Alasdair Smith
350e2ac38f Merge pull request #1886 from overleaf/as-upgrade-ace-1.4.5 
Upgrade to Ace v1.4.5

GitOrigin-RevId: 7ab7ba24c0bfc927567fbd4196e05a1c3f26d283
 2019-06-20 09:21:27 +00:00
Ersun Warncke
fb55063c2f remove collabratec v1 deps, and user stubs for oauth 
GitOrigin-RevId: c4bc497a07658eb580b0bfdb011fea32ea1657e1
 2019-06-19 11:42:21 +00:00
Ersun Warncke
aec0ea5b08 remove sharelatex auth 
GitOrigin-RevId: 7c72b7f80ff0b15d994423f552c67359cac03634
 2019-06-19 11:42:15 +00:00
Ersun Warncke
8cc9bc5335 write to v1/v2 on register, password change and reset 
GitOrigin-RevId: 29045912319d1d387613ec55c6620852d8857614
 2019-06-19 11:06:21 +00:00
Alasdair Smith
d6651183b5 Merge pull request #1889 from overleaf/as-fix-cached-icons 
Temporarily rename icons to bust cache

GitOrigin-RevId: 4dc496bbc2f61de1051068f4cbb7ded982fc999f
 2019-06-19 09:53:48 +00:00
Alasdair Smith
f83ab4ec3b Merge pull request #1767 from overleaf/as-color-contrast 
Improve colour contrast

GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976
 2019-06-19 09:01:43 +00:00
Simon Detheridge
ab5b1b6dc4 Merge pull request #1870 from overleaf/spd-invalid-intent-sso 
Fix invalid intent errors when logging in with OAuth

GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b
 2019-06-18 15:48:29 +00:00
Simon Detheridge
93386bcb8c Merge pull request #1859 from overleaf/spd-sl-user-password-copy 
Copy old SL hashed passwords to a new field

GitOrigin-RevId: 28e7ff57e8753a1e887c54e9ed63cb17984e2fd4
 2019-06-18 08:46:14 +00:00
Simon Detheridge
3ce74a3877 Merge pull request #1868 from overleaf/bg-sanitise-error-for-google-analytics 
sanitise error sent to google analytics

GitOrigin-RevId: 6307b7a54f18b9e8a1da31f45a5a148e1321db62
 2019-06-18 01:56:02 +00:00
Simon Detheridge
08861187d5 Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder 
display warning if synctex fails to return filename

GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d
 2019-06-17 15:14:31 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
Simon Detheridge
321d66f804 Merge pull request #1869 from overleaf/ns-uprade-task-decaf-bug 
.../js/... -> .../src/...

GitOrigin-RevId: d93cc4c34010ea7b318778a456e59bd702faa739
 2019-06-17 15:14:18 +00:00
Simon Detheridge
d189dad162 Merge pull request #1865 from overleaf/ta-group-invite-self-view 
Return User Data when Inviting Self in Group

GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e
 2019-06-17 15:14:11 +00:00
Simon Detheridge
7e1b4195c5 Merge pull request #1875 from overleaf/sk-fix-multi-script 
Fix the password-removal script, pass the `multi` flag to update

GitOrigin-RevId: 753f0911304cfe02e97e03e2e018a826c176e780
 2019-06-17 15:13:57 +00:00
Simon Detheridge
4b0a445337 Merge pull request #1876 from overleaf/spd-cleanup-stubs-no-user 
Handle user stubs with no user in cleanup script

GitOrigin-RevId: 810134f0876bc595f2d749921929b52dae4e7958
 2019-06-17 15:13:48 +00:00
Ersun Warncke
b46d855487 backing account creation fixes: (#1866) 
* fix requires for decaf
* add error handling for missing v1 profile
* truncate names
* create random password for users without password

GitOrigin-RevId: 0efc4b742d9295a83e126b1df1d4ce2700d7a333
 2019-06-14 09:48:49 +00:00
Brian Gough
4134c32f8d Merge pull request #1861 from overleaf/bg-check-existing-import 
check if project already imported

GitOrigin-RevId: 6dbca42fd524c34bb79a86b7449fe6ed3d542b43
 2019-06-13 08:47:58 +00:00
Brian Gough
c242a8d4c1 Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout 
enable sharejs hash checking

GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
 2019-06-13 08:47:52 +00:00
Eric Mc Sween
9ca3b68efc Merge pull request #1858 from overleaf/em-fix-file-preview 
Fix a typo that breaks file preview

GitOrigin-RevId: d7aa7e8090bfe36414455741c3dd970bc6835d92
 2019-06-11 18:35:28 +00:00
Timothée Alby
4583c25b1b Merge pull request #1843 from overleaf/ta-limit-affiliation-rate 
Limit the Number of Affiliations Created Simultaneously

GitOrigin-RevId: 242d3f3a2859eb2114f43091e7ca52534b282396
 2019-06-11 13:34:18 +00:00
Timothée Alby
e659703745 Merge pull request #1842 from overleaf/ta-remove-v1-sync 
Remove v1 Sync on Features Refresh

GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
 2019-06-11 13:34:11 +00:00
Timothée Alby
8caea13193 Merge pull request #1845 from overleaf/ta-invite-self 
Don't Send Invite when Group Manager Invite Self

GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9
 2019-06-11 13:34:00 +00:00
Timothée Alby
f6c2cfe727 Merge pull request #1848 from overleaf/sk-increase-compile-timeout-hard-limit-10 
Increase compile socket timeout to 10 minutes

GitOrigin-RevId: 93712c493c67bf54022df43175d331557b7cf49a
 2019-06-11 13:33:53 +00:00
Eric Mc Sween
0cc4f6d329 Merge pull request #1857 from overleaf/em-fix-linked-files 
Revert "Decaffeination fixes"

GitOrigin-RevId: e36e6c2b0f5430cfbd1d1bfac8de055b4db10b77
 2019-06-11 11:45:33 +00:00
Eric Mc Sween
4dc1e97d27 Merge pull request #1844 from overleaf/em-no-pdf-eps-previews 
Do not try to preview PDF or EPS files

GitOrigin-RevId: fd4fcd1c57573e9bc5fa1eed74e3430188482be4
 2019-06-07 16:16:32 +00:00
Jessica Lawshe
81c3f1919e Merge pull request #1818 from overleaf/jel-trial-impression-timeout 
Send timeout trial impression event

GitOrigin-RevId: 6931c3063c094cff843ffa7fac5a513af8f6b8f5
 2019-06-06 15:48:48 +00:00
Jessica Lawshe
f0e39f7a86 Merge pull request #1847 from overleaf/spd-cleanup-userstubs 
Add user-stub cleanup script

GitOrigin-RevId: 3a1dab4aeec74fe5d42732db52737d880a86002e
 2019-06-06 15:48:43 +00:00
Jessica Lawshe
0fe129f3f5 Merge pull request #1812 from overleaf/jel-trial-impression-history 
Send history trial impression event

GitOrigin-RevId: 7256738eda99bae2b2be11459e5eba164afdc2f4
 2019-06-06 15:48:37 +00:00
Ersun Warncke
48b5c7e209 do not log warning in dev/tests (#1830) 
do not log warning in dev/tests

GitOrigin-RevId: c46664779fe939ad0f39466f43eb24381a245b55
 2019-06-06 13:01:45 +00:00
Ersun Warncke
35138e6763 remove v1 oauth (#1846) 
remove oauth token v1 fallback

GitOrigin-RevId: 621e75024d8ae877c821b9bfed9b2a19fdbbf9f7
 2019-06-06 13:01:38 +00:00
Eric Mc Sween
15db8d3711 Merge pull request #1828 from overleaf/msm-fix-zip-upload-ignored-extensions-js 
Fixes files with full name equals to an ignored extension being ignored (JS version)

GitOrigin-RevId: 94d84c2b3e6c7e7219397b0a982117f9c88bcf5d
 2019-06-05 16:19:31 +00:00
Eric Mc Sween
5d2d7b894a Merge pull request #1833 from overleaf/em-edit-subscription-admin 
Change admin button in subscription admin page

GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d
 2019-06-05 16:19:26 +00:00
Timothée Alby
2f14426876 Merge pull request #1839 from overleaf/ns-add-vref 
add vref

GitOrigin-RevId: aa311141873f818830dcfa5ea63f0420549b5dd9
 2019-06-04 11:24:11 +00:00
Timothée Alby
a8edafe104 Merge pull request #1825 from overleaf/ta-institutions-staff-hub 
Create Institutions Staff Hub

GitOrigin-RevId: 6926406951796d2e7dd0903c3d3c4dae87545390
 2019-06-04 11:24:02 +00:00
Timothée Alby
14cbeef31d Merge pull request #1806 from overleaf/ta-use-billing-name 
Use Billing Name when Creating Subscription

GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
 2019-06-04 11:23:55 +00:00
Timothée Alby
2deac5f3a1 Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder 
Don't Build Recurly XML Requests Manually

GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860
 2019-06-04 11:23:49 +00:00
Timothée Alby
0b8a2b0157 Merge pull request #1832 from overleaf/ta-fix-test-typo 
Fix typo in UserMembershipAuthorization tests

GitOrigin-RevId: ccb6e88297367a2986ffa6c6c74cd8f26089298e
 2019-06-04 11:23:43 +00:00
Timothée Alby
8330c6ae61 Merge pull request #1835 from overleaf/hb-analytics-template-ids 
Set template ids on cloned projects on creation

GitOrigin-RevId: 6b7ef72d148774c3d5ea7b65cde0e6a8fdfa2ceb
 2019-06-04 11:23:37 +00:00
Timothée Alby
f9e82003b3 Merge pull request #1817 from overleaf/sk-git-bridge-refuse-projects-with-dot-git 
GitBridge: refuse to process a project if it has a `.git` entity at t…
GitOrigin-RevId: 83d87ecd9c1a7661a77dd00c29236f4f43435158
 2019-06-04 11:23:30 +00:00
nate stemen
642081dd17 Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked 
OAuth provider check and capitalize button text

GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
 2019-06-03 18:32:13 +00:00
nate stemen
1a3b21b3f1 Merge pull request #1826 from overleaf/ta-fix-bin-scripts 
Fix test_unit_app and test_unit_module bin scripts

GitOrigin-RevId: 18e67564fab54cd19310f81422ed1a1560c4cf29
 2019-06-03 18:32:01 +00:00
nate stemen
113670f864 Merge pull request #1838 from overleaf/ns-ref-highlighting 
highlight arguments of known ref commands

GitOrigin-RevId: 6c95ff5a973c28788c569fe71da024692df2d69e
 2019-06-03 18:31:54 +00:00
Miguel Serrano
9226237a36 Merge pull request #1837 from overleaf/msm-revert-commit-by-error-master 
Revert "disabled logging during acceptance test execution"

GitOrigin-RevId: 5d613ef0abeb00b2c4b42a660fac95876aebcd46
 2019-06-03 09:38:54 +00:00
Miguel Serrano
df026f9f81 disabled logging during acceptance test execution 
GitOrigin-RevId: 185077cc0f0c8791bc063bd8da6dd755f94c74d6
 2019-06-01 01:57:49 +00:00
Eric Mc Sween
bebd0f25e6 Merge pull request #1824 from overleaf/as-remove-max-len-rule 
Remove unnecessary max-len rule

GitOrigin-RevId: 10ad77498e51022c8d9ab7eb7a5633b90395c692
 2019-05-30 12:40:37 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend 
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
 2019-05-29 09:32:21 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account 
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
 2019-05-28 15:51:27 +00:00
Hugh O'Brien
29408b301c Merge pull request #1750 from overleaf/cmg-project-metadata 
Preserve project metadata when deleting

GitOrigin-RevId: 38efb139406d6111f5b6186d82c3fbfb5ab9b2b9
 2019-05-28 15:51:21 +00:00
Alasdair Smith
b84c24520c Merge pull request #1804 from overleaf/msm-removed-collaborator-as-first-step-transfer-ownership 
Removing user as collaborator as a pre-step for project ownership transfer

GitOrigin-RevId: dbfe1553ae7277863908341fdd2af709dc019692
 2019-05-28 11:25:43 +00:00
Alasdair Smith
56839ae6fb Merge pull request #1797 from overleaf/msm-disable-spellcheck-on-readonly 
Disabled spell checker on read-only

GitOrigin-RevId: fff76f8fae5ea9c3035902b2abf1c7c54ad556bf
 2019-05-28 11:25:33 +00:00
Alasdair Smith
a3bcc71df9 Merge pull request #1807 from overleaf/as-global-sinon-chai 
Globally load sinon-chai

GitOrigin-RevId: b0175e021b98d6338171108c6778de80ee58479a
 2019-05-28 11:25:26 +00:00
Alasdair Smith
4e8facf3cc Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow 
History filenames overflow + full history for admins

GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c
 2019-05-28 11:25:17 +00:00
Simon Detheridge
d999cd5030 Merge pull request #1810 from overleaf/jel-sso-unlink 
Include CSRF token in POST request

GitOrigin-RevId: 9371993971e81ad3f7301427d1a5ed7be5bb1a01
 2019-05-28 09:33:37 +00:00
Simon Detheridge
ff4e0013cd Merge pull request #1809 from overleaf/ns-escape-archive-translation 
treat translate call as var, not string

GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0
 2019-05-28 09:33:31 +00:00
Simon Detheridge
45f3f74d0b Merge pull request #1811 from overleaf/ns-code-check-fail-invisible 
check for light theme to set autocompile status color

GitOrigin-RevId: d77cbb965ccb0bd05cd237717e29ebe0e1d68681
 2019-05-28 09:33:22 +00:00
Simon Detheridge
d5556c55a9 Merge pull request #1813 from overleaf/spd-verbose-merge-logging 
Add very verbose logging to SL user merging

GitOrigin-RevId: 802a9295240c23f48c133fabb5895501f1c9a49f
 2019-05-28 09:33:15 +00:00
Simon Detheridge
6488fd1284 Merge pull request #1814 from overleaf/spd-missing-callback-returns 
Add missing return statements to callbacks in SubscriptionGroupHandler

GitOrigin-RevId: 05ff67bd8e4997fde01c6cf9f4558d3caa261590
 2019-05-28 09:33:06 +00:00
Simon Detheridge
561f54c1a3 Merge pull request #1816 from overleaf/spd-user-delete-newsletter 
Don't fail to delete a user if unsubscribing from newsletter fails

GitOrigin-RevId: 8764717220d906a20a7dd0a90879a45d9dd8a7ce
 2019-05-28 09:32:57 +00:00
Simon Detheridge
40316b0735 Merge pull request #1815 from overleaf/spd-mongoose-debugging 
Allow very verbose debugging of mongo queries via env var

GitOrigin-RevId: ad132ef0cc6df892b4c879948094f67497cc9a48
 2019-05-28 09:32:50 +00:00
Simon Detheridge
deb9e656a9 Merge pull request #1801 from overleaf/ew-module-unit-test 
add ability to unit test a single module

GitOrigin-RevId: 584708066dea3c8d6afa1483953bbae252b48fa7
 2019-05-23 13:25:39 +00:00
Simon Detheridge
a0adde3573 Merge pull request #1803 from overleaf/spd-email-login-url 
Fix path to login URL in account migration emails

GitOrigin-RevId: 609445ad5f214deb7da3966806ff512c4a7a3d55
 2019-05-23 13:25:29 +00:00
Alasdair Smith
a3894ac9b4 Merge pull request #1794 from overleaf/as-upgrade-ace-1.4.4 
Upgrade Ace to v1.4.4

GitOrigin-RevId: 26681bcf255537f8eb09fa0ac1c98009cf964496
 2019-05-23 08:49:13 +00:00
Timothée Alby
d86abf49e6 Merge pull request #1729 from overleaf/ta-show-last-modified 
Show LastUpdatedBy on Dashboard

GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
 2019-05-21 13:39:29 +00:00
Timothée Alby
759392047d Merge pull request #1789 from overleaf/as-fix-reference-search-cut-off 
Fix reference search hint cutting off last suggestion

GitOrigin-RevId: a8b3e32e1173b27602b0576c1b00afcc1cbf7683
 2019-05-21 13:39:23 +00:00
Timothée Alby
2895a6878c Merge pull request #1796 from overleaf/ta-institution-subscriptions-fix 
Ignore Trials when Listing Subscriptions on Institution Hub

GitOrigin-RevId: 9121b08fc16fd3d18fff4a0403354fecec2d4666
 2019-05-21 13:39:16 +00:00
Jessica Lawshe
8c2da6afab Merge pull request #1673 from overleaf/jel-cms-table-style 
Styling for features table

GitOrigin-RevId: a8c37cf9bcda7c93d3d910036cd08f3cba06209e
 2019-05-20 16:10:56 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts 
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
 2019-05-20 16:10:46 +00:00
Simon Detheridge
004272619e Merge pull request #1781 from overleaf/ta-institution-subscriptions 
List Institution Subscriptions

GitOrigin-RevId: b259b4729f031bb6a50b27f6740df3df21017818
 2019-05-20 12:18:57 +00:00
Simon Detheridge
efd7cf5b01 Merge pull request #1793 from overleaf/fix-name-removed-transfer-ownership 
Fix name removed transfer ownership

GitOrigin-RevId: ccbc681746033017686c4e36040a71ab7f98ad16
 2019-05-20 12:18:49 +00:00
Simon Detheridge
02c4edcb1c Merge pull request #1780 from overleaf/sk-script-remove-password-fields 
Add a script to remove `hashedPassword` fields from non-sl user records

GitOrigin-RevId: d7c6fdbc138d4c5452e6e3a7f2ad639f049f122f
 2019-05-20 12:18:40 +00:00
Paulo Jorge Reis
3486f61b5b Merge pull request #1784 from overleaf/revert-1782-pr-as-ace-diagnostics 
Revert "Ace diagnosis"

GitOrigin-RevId: db782b4df6d3f2d773eb063b6b1e498875126dfb
 2019-05-17 10:19:07 +00:00
Alasdair Smith
1ec05a0fab Merge pull request #1782 from overleaf/pr-as-ace-diagnostics 
Ace diagnosis

GitOrigin-RevId: 5a4c1d49887594686f810fedc06266bdbb7175c5
 2019-05-17 08:55:44 +00:00
Simon Detheridge
e06a68ace6 Merge pull request #1779 from overleaf/spd-update-shrinkwrap 
Update npm-shrinkwrap

GitOrigin-RevId: 93fc86aea307a0e631aebb03a0779862813d1eff
 2019-05-16 10:59:59 +00:00
Simon Detheridge
c07c44f366 Merge pull request #1644 from overleaf/spd-reconcile-accounts 
Add account-reconciliation script

GitOrigin-RevId: e20a8b9531126d91baaa9da5c77ab6e971b43e67
 2019-05-16 10:59:53 +00:00
Simon Detheridge
6a45be9ccd Merge pull request #1773 from overleaf/ew-create-backing-accounts-for-sl-users 
Create backing accounts for sl users

GitOrigin-RevId: d7400ace3d26b7f5e3314ba2a9dcbbb32edc424a
 2019-05-16 10:59:48 +00:00
Timothée Alby
0e38ca1fd7 Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm 
Check User Exists Before Confirming Email

GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97
 2019-05-16 07:34:23 +00:00
Timothée Alby
276310bd23 Merge pull request #1778 from overleaf/hb-password-reset-sl 
Handle users who haven't migrated better on password reset

GitOrigin-RevId: f123a6fe4a5a958f558e3cf34c3180e8fc96d159
 2019-05-16 07:34:18 +00:00
Brian Gough
c6c948e9f9 Merge pull request #1769 from overleaf/bg-record-date-for-doc-deletion 
record timestamp for doc deletion

GitOrigin-RevId: 3ae38c94918d3400ad9aa821e1e1ef1bcde6373b
 2019-05-15 12:41:42 +00:00
Brian Gough
e252c64996 Merge pull request #1763 from overleaf/bg-preserve-file-hash-on-copy-and-delete 
preserve file hash on copy and delete

GitOrigin-RevId: 2dc000255dcfe875a30a7e7f878aaa09fea367dc
 2019-05-15 12:41:37 +00:00
Brian Gough
833caf4acd Merge pull request #1765 from overleaf/bg-avoid-exception-in-token-access 
handle exception in crypto.timingSafeEqual when checking token

GitOrigin-RevId: ba23aa4d4fe1e212c776965c0a58a90ecd846052
 2019-05-15 12:41:31 +00:00
Brian Gough
c7ce214f8c Merge pull request #1770 from overleaf/ns-tags-and-tikz 
handle math in \tag* and \tikz commands

GitOrigin-RevId: 6a71100409f405d58e04d12403acd3f4f24360c7
 2019-05-15 12:41:26 +00:00
Timothée Alby
7e32ed5158 Merge pull request #1766 from overleaf/ta-dropbox-duplicates-script 
Add Script to Unlink all Duplicate Dropbox uids

GitOrigin-RevId: 6db73dee9f04e9006d0aec558cf370b5079df671
 2019-05-15 07:29:00 +00:00
Timothée Alby
bd722dda8e Merge pull request #1759 from overleaf/sk-disable-bcrypt-rounds-upgrade 
Temporarily de-activate automatic upgrade of bcrypt rounds

GitOrigin-RevId: 66dbe344c00253e4b6a8f883735e61d9133da62e
 2019-05-15 07:28:54 +00:00
Jessica Lawshe
77de78e70b Merge pull request #1771 from overleaf/jel-new-file-controller-scope 
Pass in missing scope to NewFileModalController

GitOrigin-RevId: 41de974c8ff93bb41d42ef2d17e0c0732ba12ffb
 2019-05-14 15:58:49 +00:00
Jessica Lawshe
7763427cea Merge pull request #1761 from overleaf/jel-trial-impression-collab 
Send event on collaborator trial impression event

GitOrigin-RevId: f19feaf2a00ef5728d7a190f0736efe76e417230
 2019-05-14 13:12:38 +00:00
Jessica Lawshe
59cce6b52e Merge pull request #1752 from overleaf/jel-trial-impression-events 
Send event on mendeley/zotero trial impression

GitOrigin-RevId: a308afd063e11308297be48933ad308d9120c327
 2019-05-14 13:12:32 +00:00
Ersun Warncke
6513cc7b7a Revert "Revert "complete v2 collabratec api"" 
This reverts commit 378825fae46cef6f19c8f908a1d6cf9c837cd1d6.

GitOrigin-RevId: cf38aa3b4ec53ec6741389885ebe882476cb9297
 2019-05-14 10:24:11 +00:00
Ersun Warncke
8377005187 Revert "Revert "oauth and collabratec migration"" 
This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a.

GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304
 2019-05-14 10:24:04 +00:00
Ersun Warncke
8e916a830d Revert "Revert "fix auth error response and use 401 for malformed header"" 
This reverts commit 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee.

GitOrigin-RevId: d5cc2fd2e7a676cad637717d77d1a69a7fe6453c
 2019-05-14 10:23:57 +00:00
Ersun Warncke
7883554d73 Revert "Revert "add oauth2-server"" 
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.

GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
 2019-05-14 10:23:51 +00:00
Ersun Warncke
9b24ed6daa Revert "Revert "add thirdPartyIdentifiers to User model and add manager class"" 
This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5.

GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e
 2019-05-14 10:23:46 +00:00
Ersun Warncke
934b70e96a Revert "add thirdPartyIdentifiers to User model and add manager class" 
This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70.

GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5
 2019-05-13 15:52:47 +00:00
Ersun Warncke
a00f4b219e Revert "add oauth2-server" 
This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae.

GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda
 2019-05-13 15:52:41 +00:00
Ersun Warncke
6d4b67d1ee Revert "fix auth error response and use 401 for malformed header" 
This reverts commit 6dc4d10c25db7710b3e4e8e876d425a1e84574c8.

GitOrigin-RevId: 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee
 2019-05-13 15:52:36 +00:00
Ersun Warncke
89ee728514 Revert "oauth and collabratec migration" 
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.

GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
 2019-05-13 15:52:30 +00:00
Ersun Warncke
4189f2e6ec Revert "complete v2 collabratec api" 
This reverts commit 9c75b657c11f98e3f927dd01a422157f53a5672d.

GitOrigin-RevId: 378825fae46cef6f19c8f908a1d6cf9c837cd1d6
 2019-05-13 15:52:25 +00:00
Ersun Warncke
65cbfbaeae complete v2 collabratec api 
* remove proxies to v1
* allow oauth tokens with user stubs
* add profile/unlink end points
* fix Makefile issue

GitOrigin-RevId: 9c75b657c11f98e3f927dd01a422157f53a5672d
 2019-05-13 12:05:04 +00:00
Ersun Warncke
935877222a oauth and collabratec migration 
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge

GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
 2019-05-13 12:04:56 +00:00
Ersun Warncke
c0ab195eed fix auth error response and use 401 for malformed header 
GitOrigin-RevId: 6dc4d10c25db7710b3e4e8e876d425a1e84574c8
 2019-05-13 12:04:51 +00:00
Ersun Warncke
dc06069dff add oauth2-server 
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
 2019-05-13 12:04:46 +00:00
Ersun Warncke
8f339603f4 add thirdPartyIdentifiers to User model and add manager class 
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
 2019-05-13 12:04:40 +00:00
Brian Gough
07b7566466 Merge pull request #1089 from overleaf/bg-compute-filestore-hash 
compute filestore hash

GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e
 2019-05-13 08:49:42 +00:00
Brian Gough
c989179517 Merge pull request #1758 from overleaf/as-remove-unused-middleware-file 
Remove unused TemplatesMiddlewear file

GitOrigin-RevId: 00cf49c970171f1f99d133ee4876f2a35c89c023
 2019-05-13 08:49:36 +00:00
Brian Gough
d1cc605855 Merge pull request #1755 from overleaf/bg-admin-resync-project-history 
add button to resync history for project in admin page

GitOrigin-RevId: e52e85ee6d1f7dea7930bf3dee0ec70b28b8a6c2
 2019-05-13 08:49:29 +00:00
Henry Oswald
69ccac8f49 log out job in tpdsupdate sender 
GitOrigin-RevId: 8ff4665f62a1f36580c5864f2185ddf1a792f6cf
 2019-05-11 01:54:39 +00:00
Alasdair Smith
dc09095ae7 Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf 
Resize Ace when toggling PDF view

GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
 2019-05-10 08:56:21 +00:00
Alasdair Smith
51a4c33e91 Merge pull request #1748 from overleaf/hb-fix-change-plan-vat-display 
Use two decimal places for inc-vat change plan prices

GitOrigin-RevId: 6dd46c42693345ba0aaca5cfe061bc907a112a68
 2019-05-09 13:03:09 +00:00
Alasdair Smith
36035e8ccd Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3 
Pass build-id when downloading pdf

GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b
 2019-05-08 09:09:11 +00:00
Alasdair Smith
cbab60476a Merge pull request #1747 from overleaf/hb-graphics-autocomplete-additions 
Make image autocomplete file type case insensitive

GitOrigin-RevId: 8a39a600340d8cea7bbfda08d8cc95343c8002ad
 2019-05-08 09:09:05 +00:00
Alasdair Smith
9b94b32b83 Merge pull request #1751 from overleaf/as-fix-cite-auto-complete 
Don't show shortened arguments in cite autocomplete

GitOrigin-RevId: 75e86e1b97adb7632f30960a50ad775511868d5b
 2019-05-08 09:08:57 +00:00
Timothée Alby
986378932f Update README.md 
GitOrigin-RevId: ea14f37a281d6d1fafcee0d17d92b0d50fb74d24
 2019-05-07 17:04:40 +00:00
Christopher Hoskin
8aa8840db0 Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3 
Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
 2019-05-07 10:58:52 +00:00
Paulo Jorge Reis
d613d7e1a2 Merge pull request #1647 from sharelatex/as-upgrade-ace-1.4.3 
Upgrade Ace to v1.4.3

GitOrigin-RevId: 810350080a6b89fd9817ebcacde7e9817097d99a
 2019-05-06 09:02:03 +00:00
Timothée Alby
5b7b9fc97b Store lastUpdatedBy Value on Projects (#1727) 
Store lastUpdatedBy Value on Projects

GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39
 2019-05-02 14:17:41 +00:00
Timothée Alby
5b7974065d Prevent registration of new accounts with existing secondary emails (#1696) 
Prevent registration of new accounts with existing secondary emails

GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15
 2019-05-02 14:17:34 +00:00
Brian Gough
f583ffdbff Merge pull request #1740 from sharelatex/spd-captcha-on-register 
Don't add captcha fields to register form if captcha is disabled

GitOrigin-RevId: 7ac3a3b41734377243ac1e31a99b3778c9a2e77d
 2019-05-02 10:18:57 +00:00
Alasdair Smith
5049dc083e Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page 
add button to upgrade history in project admin page

GitOrigin-RevId: a5f2a64028ccb002cbb96da0f910b7b494f75eb8
 2019-05-01 09:38:35 +00:00
Alasdair Smith
028c3bc94c Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room 
remove unnecessary callback on emitToRoom

GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883
 2019-05-01 09:38:30 +00:00
Alasdair Smith
2c30ae0f8a Merge pull request #1738 from sharelatex/spd-dumpfolder 
Ensure dump folder exists before opening templates

GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1
 2019-05-01 09:38:24 +00:00
Brian Gough
77a711f7a3 Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element 
make removeElementFromMongoArray atomic

GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966
 2019-04-29 09:31:09 +00:00
Simon Detheridge
5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting 
Check for password from v1 before showing password change form

GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
 2019-04-25 14:37:38 +00:00
Simon Detheridge
16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags 
Color-code tags/folders

GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
 2019-04-25 14:37:32 +00:00
Simon Detheridge
d2de6d8e87 Merge pull request #1689 from sharelatex/revert-1684-revert-1637-as-clear-undo-stack-remote-edit 
Bring back clearing of undo stack when remote change is received

GitOrigin-RevId: f18b1b4c1af0ab0c8563c3670c73d75afa6d8345
 2019-04-25 14:37:27 +00:00
Simon Detheridge
9808eb7f55 Merge pull request #1722 from sharelatex/jel-password-descriptive-message 
Use descriptive error message for password reset

GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff
 2019-04-25 14:37:21 +00:00
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page 
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
 2019-04-25 14:37:15 +00:00
Simon Detheridge
6c04bc8712 Merge pull request #1728 from sharelatex/jel-feature-event 
Track events that display "Start Free Trial" buttons

GitOrigin-RevId: 4890d8f1da8b0cd47d7c97eab322e6048f774d30
 2019-04-25 14:37:08 +00:00
Simon Detheridge
cc96ecfd74 Merge pull request #1734 from sharelatex/spd-delete-user-crash 
Don't fail in refreshFeatures if the v1 user doesn't exist

GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706
 2019-04-25 14:36:58 +00:00
Brian Gough
e1ec01eb0f Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots 
Show and restore doc snapshots from admin panel

GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab
 2019-04-24 13:24:46 +00:00
Timothée Alby
967973f354 Only show label version button for users with write permission (#1665) 
Only show label version button for users with write permission

GitOrigin-RevId: f0a6504b51c1e9018942592ad6784599694c571a
 2019-04-23 14:35:32 +00:00
Timothée Alby
d3f0285fd2 Ensure project name is unique when transferring to another user (#1712) 
Ensure project name is unique when transferring to another user

GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859
 2019-04-23 14:35:27 +00:00
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720) 
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
 2019-04-23 14:35:21 +00:00
Timothée Alby
44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723) 
Fix Wording in Subscription Cancellation Flow

GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
 2019-04-23 14:35:14 +00:00
Timothée Alby
2a73d8106b Send Email on Subscription Reactivation (#1721) 
Send Email on Subscription Reactivation

GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e
 2019-04-23 14:35:05 +00:00
Timothée Alby
54186d9db1 Add linked accounts section to user settings page (#1705) 
Add linked accounts section to user settings page

GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
 2019-04-23 14:34:55 +00:00
Timothée Alby
e2793f659c Don't Sanitize Undefined Team Notices (#1725) 
Don't Sanitize Undefined Team Notices

GitOrigin-RevId: 540316d71bc4047d25100bb0ef524d5d2adba0b1
 2019-04-23 14:34:48 +00:00
Timothée Alby
6232854ff7 Remove User Memberships on Deletion (#1688) 
Remove User Memberships on Deletion

GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1
 2019-04-23 14:34:40 +00:00
Jessica Lawshe
1306de81e1 Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie 
Fix review panel toggles in IE11.

GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8
 2019-04-17 14:14:27 +00:00
Jessica Lawshe
f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm 
Reconfirm user accounts

GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
 2019-04-17 14:14:19 +00:00
Paulo Jorge Reis
f2fbdcc078 Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link 
Revert "Add survey link in the projects list sidebar."

GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2
 2019-04-17 10:45:15 +00:00
Paulo Jorge Reis
8b7b49f72a Merge pull request #1693 from sharelatex/cmg-clone-owners 
Return new project data from api when cloning

GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786
 2019-04-17 10:26:11 +00:00
Paulo Jorge Reis
5a6cdf0999 Merge pull request #1679 from sharelatex/cmg-dashboard-owner 
Fix ordering by Owner on the dashboard

GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767
 2019-04-17 10:26:03 +00:00
Paulo Jorge Reis
6c6bc1216a Merge pull request #1670 from sharelatex/pr-fix-contrast-issues 
Fix contrast issues (and others)

GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec
 2019-04-17 10:25:55 +00:00
nate stemen
bec56ccafa Merge pull request #1713 from sharelatex/ns-captchas-two 
turn off captchas for project invite

GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c
 2019-04-16 18:47:56 +00:00
Brian Gough
1078688895 Merge pull request #1716 from sharelatex:bg-fix-merge-conflict 
fix incorrect merge conflict

GitOrigin-RevId: 55e19f025a433e8abbde16bd68ccbc3e21f7964f
 2019-04-16 10:05:38 +00:00
Brian Gough
5864e90794 Merge pull request #1698 from sharelatex/bg-send-hash-when-debugging 
send sha1 hash when in debug mode

GitOrigin-RevId: 7a906deb15f1be0ac2e41d4ff2e1f105018b22f6
 2019-04-16 09:06:23 +00:00
Brian Gough
f3960db1ad Merge pull request #1701 from sharelatex/bg-send-last-version 
send last version to docupdater

GitOrigin-RevId: fab3415fdb1f37982d8089a9d0b35fd06f7459ae
 2019-04-16 08:34:44 +00:00
Brian Gough
d82f679fd7 Merge pull request #1699 from sharelatex/bg-improve-logging 
improve logging

GitOrigin-RevId: 0d87db74c62aa5c887412250c26f5acccdf73acf
 2019-04-16 08:34:37 +00:00
Brian Gough
0eaf6db2d6 Merge pull request #1703 from sharelatex/bg-handle-send-before-rejoin 
handle error gracefully when client has not yet joined project

GitOrigin-RevId: 21e337f6adbbb23a2126eaf4fa026c78178efef0
 2019-04-16 08:34:31 +00:00
Hugh O'Brien
9644ff4f51 Merge pull request #1714 from sharelatex/spd-middlewear-oops 
Fix spelling in UserMembershipAuthorization

GitOrigin-RevId: cca5e5d13d7eb33e12f73be9172bc5cbe90312c0
 2019-04-15 16:09:26 +00:00
Hugh O'Brien
5edead4446 Merge pull request #1694 from sharelatex/hb-clear-ip-notifications 
Remove notification for university enrolment on affiliation add

GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287
 2019-04-15 16:09:16 +00:00
Shane Kilkelly
0773311805 Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip 
Change the wording on emails from 'default' to 'primary'

GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15
 2019-04-13 01:57:15 +00:00
Shane Kilkelly
f3dd61abce Merge pull request #1657 from sharelatex/sk-rate-limit-join-project 
Add a rate-limit to joinProject

GitOrigin-RevId: 27edd8b56ae80868b5fcd0b803d0e042dce26f31
 2019-04-13 01:57:10 +00:00
Chrystal Maria Griffiths
36d0e8e199 Merge pull request #1654 from sharelatex/ns-add-status-page 
add status.overleaf.com to 500 page

GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82
 2019-04-10 09:52:46 +00:00
Chrystal Maria Griffiths
5d6a307234 Merge pull request #1664 from sharelatex/as-fix-read-only-comment 
Only show add comment button if user has permission

GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f
 2019-04-10 09:52:41 +00:00
Chrystal Maria Griffiths
ab6565beb8 Merge pull request #1697 from sharelatex/cmg-leave-archived 
Leave an archived project

GitOrigin-RevId: c1da7fdff9ae90b9992ed99dbcff3e7ee31ec4d9
 2019-04-10 09:52:36 +00:00
Brian Gough
f8066349c4 Merge pull request #1700 from sharelatex/bg-simplify-queue 
simplify queuing code

GitOrigin-RevId: 9c6ce66e9a3272dea28284d3cbf1dc65c9cbc825
 2019-04-09 11:01:42 +00:00
Paulo Jorge Reis
9c5c6922b9 Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection 
History drag and drop selection

GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01
 2019-04-09 10:11:13 +00:00
Jessica Lawshe
ca9e6044c8 Merge pull request #1683 from sharelatex/jel-gallery-layout 
Gallery list column styling

GitOrigin-RevId: 9ec3207dcd867894a5318a8d71c48be175615480
 2019-04-08 16:11:14 +00:00
nate stemen
2ae27fbc6a Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas 
Revert "allow toggling of captchas via setting"

GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613
 2019-04-08 15:20:49 +00:00
nate stemen
5aac144d5b Merge pull request #1650 from sharelatex/ns-toggle-captchas 
allow toggling of captchas via setting

GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
 2019-04-08 13:53:54 +00:00
Paulo Jorge Reis
144d936141 Merge pull request #1691 from sharelatex/cmg-tag-duplicates 
Stop duplicate tags being created

GitOrigin-RevId: 7e2b4228dc6ec7ebc2a4e30e18a6d5dcbd5cb6c8
 2019-04-08 10:31:16 +00:00
Paulo Jorge Reis
9e63211a17 Merge pull request #1680 from sharelatex/cmg-hide-unarchive 
Only show unarchive button for project owners

GitOrigin-RevId: 5990be70cfcd9cf0708248d78845dc163a59a8b3
 2019-04-08 10:31:10 +00:00
Paulo Jorge Reis
e6943e8e71 Merge pull request #1667 from sharelatex/pr-add-post-integration-survey-link 
Add survey link in the projects list sidebar.

GitOrigin-RevId: 085f969336e81d546c51043c3ab9dc63585f97fb
 2019-04-08 10:14:19 +00:00
Alasdair Smith
9ff021cc88 Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943 
Upgrade PDFjs to v2.0.943

GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb
 2019-04-01 09:27:32 +00:00
Alasdair Smith
b1a615bad9 Merge pull request #1684 from sharelatex/revert-1637-as-clear-undo-stack-remote-edit 
Revert "Clear undo stack when remote change is received"

GitOrigin-RevId: ac313f008e54696f548e6396851fe22568248055
 2019-03-29 12:24:42 +00:00
Simon Detheridge
61cd448832 Merge pull request #1672 from sharelatex/ns-input-autocomplete 
improve autocomplete when inserting over existing arguments

GitOrigin-RevId: 8d1401cca141348dd33b965c92e120cf66350d7e
 2019-03-28 15:14:35 +00:00
Simon Detheridge
385da07930 Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui 
Display more descriptive errors when uploading a project fails

GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8
 2019-03-28 15:14:30 +00:00
Simon Detheridge
88446ffa9b Merge pull request #1677 from sharelatex/spd-hide-heapdump 
Move 'heapdump' endpoint to private API router

GitOrigin-RevId: 581cc13b60ee944b3e1ad21a973d70ebab606a5b
 2019-03-28 15:14:22 +00:00
Brian Gough
ce556499c0 remove unnecessary comparison in queue logic 
GitOrigin-RevId: 4dd8d1892ca090bd9ac93940d985cb21437f1ae1
 2019-03-28 10:32:01 +00:00
Brian Gough
9a48142919 Merge pull request #1671 from sharelatex/bg-reorder-messages 
queue incoming out of order updates to avoid out of sync errors

GitOrigin-RevId: ed666bedea442facc92e88227abe68fdce0aebd8
 2019-03-27 14:27:54 +00:00
Alasdair Smith
7b1832a96e Merge pull request #1668 from sharelatex/jel-plans-group-modal-selected 
Set group plan options via query

GitOrigin-RevId: 730d9a0721f2866a0720baa873ffd6c15b857c2b
 2019-03-27 10:21:15 +00:00
Simon Detheridge
bb81a47d58 Merge pull request #1641 from sharelatex/spd-soft-delete-users 
Add initial support for soft-deletion of users

GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7
 2019-03-26 13:59:49 +00:00
Simon Detheridge
364561d5fb Merge pull request #1666 from sharelatex/cmg-rttc-typo 
Remove duplicate text on review panel

GitOrigin-RevId: 20d37f392ed28ebbe31bae4f66892414b2966b87
 2019-03-25 16:34:18 +00:00
Simon Detheridge
d9522f563d Merge pull request #1631 from sharelatex/ho-remove-recurly-sign 
remove RecurlyWrapper.sign and recurly private api key

GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152
 2019-03-25 15:52:54 +00:00
Simon Detheridge
f9594707ca Merge pull request #1662 from sharelatex/as-fix-wrong-favicon 
Fix missed favicon path update and make track-changes page inherit from layout

GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3
 2019-03-25 15:52:44 +00:00
Simon Detheridge
cd9ed1dd6b Merge pull request #1663 from sharelatex/cmg-rttc-typo 
Fix lack of whitespace typo on review panel

GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275
 2019-03-25 15:52:38 +00:00
Shane Kilkelly
90cb50f4ac Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3 
Upgrade bcrypt to version 3, and specify minor-version of hash function

GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca
 2019-03-25 09:50:41 +00:00
Simon Detheridge
db162cfe0a Merge pull request #1656 from sharelatex/cmg-reintroduce-beta-fix-path 
Use path.join() in reintroduce beta script to pass linting

GitOrigin-RevId: 4936de04b389571e73de3ddcae8ee611634efcaf
 2019-03-22 13:02:21 +00:00
Simon Detheridge
d2e053f456 Merge pull request #1610 from sharelatex/cmg-reintroduce-beta 
Revive the beta program in the settings area

GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43
 2019-03-22 12:28:36 +00:00
Simon Detheridge
2bf6e4e072 Merge pull request #1638 from sharelatex/spd-delete-user-rate-limit 
Add rate limit to user deletion

GitOrigin-RevId: 4269277ea88b32b93f897a2b2709385ab379e479
 2019-03-22 12:28:30 +00:00
Simon Detheridge
d184087a53 Merge pull request #1643 from sharelatex/spd-transfer-projects 
Add support for transferring project ownership

GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258
 2019-03-22 12:28:24 +00:00
Shane Kilkelly
a5ad2e48d4 Merge pull request #1629 from sharelatex/sk-censor-token-prefix 
Censor `tokens.readAndWritePrefix` when building project model

GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee
 2019-03-22 10:27:56 +00:00
Shane Kilkelly
49a5056e78 Merge pull request #1637 from sharelatex/as-clear-undo-stack-remote-edit 
Clear undo stack when remote change is received

GitOrigin-RevId: 1a1d1e34827e002e08a264bffa467d77701ce758
 2019-03-22 10:27:51 +00:00
Shane Kilkelly
a51fefae6c Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import 
Allow deleted v1 user when importing project invite inviter

GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
 2019-03-22 10:27:45 +00:00
Brian Gough
0305ba0c6b Merge pull request #1639 from sharelatex/bg-add-message-ids 
include a unique id in every message published to redis

GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d
 2019-03-21 16:17:37 +00:00
Henry Oswald
494f749e72 Merge pull request #1651 from sharelatex/ho-check-exit-codes 
Check exit codes of parallel build tasks

GitOrigin-RevId: fb242722d8a886c64b61876cfdcbece9bfa987e6
 2019-03-21 11:14:37 +00:00
Timothée Alby
983b1a0f57 Merge pull request #1648 from sharelatex/ho-simple-client-build 
Simple client build

GitOrigin-RevId: d7107104960c97bad7ec1316b5e6720a6c1017b6
 2019-03-20 17:12:10 +00:00
Timothée Alby
27251bc1ac Merge pull request #1646 from sharelatex/ho-fail-lint 
Remove `set -e` from build process and wait for each previous task

GitOrigin-RevId: 4ece4b70c729e8de654adae0053fdb28f0f86799
 2019-03-20 17:12:02 +00:00
Timothée Alby
5de25032d8 Merge pull request #1634 from sharelatex/ta-no-institution-autocreate 
Don't Auto-Create Institutions

GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861
 2019-03-19 23:51:53 +00:00
Henry Oswald
991cbf3fee Merge pull request #1636 from sharelatex/ho-fail-lint 
throw error in bash quickly on error

GitOrigin-RevId: 03df23aff25583f3af122f9a643c8faef64c5c46
 2019-03-18 15:37:03 +00:00
Alasdair Smith
e6e3c023ed Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax 
Fix broken messages in chat due to mathjax XSS filtering

GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647
 2019-03-18 12:12:10 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss 
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
 2019-03-18 10:37:15 +00:00
Brian Gough
c704312c85 Merge pull request #1625 from sharelatex/bg-move-entities-safely 
move project entities safely without losing data on error

GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e
 2019-03-18 09:30:28 +00:00
Timothée Alby
429709dfcb Merge pull request #1621 from sharelatex/ns-update-spam-regexes 
allow hyphen in email hostname and ' in project name

GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1
 2019-03-14 16:02:45 +00:00
Timothée Alby
ca2c854452 Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt 
Add unit test for 'real' bcrypt

GitOrigin-RevId: 670282b5235484ac03d3451dc2685af18d84a4e3
 2019-03-14 16:02:38 +00:00
Timothée Alby
1edf1964c8 Merge pull request #1607 from sharelatex/spd-succserror 
Don't show 'No errors' message if PDF generation fails

GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79
 2019-03-14 16:02:32 +00:00
Timothée Alby
970ca2e122 Merge pull request #1604 from sharelatex/ns-fix-capitalization 
improve project invite email wording

GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37
 2019-03-14 16:02:27 +00:00
Timothée Alby
e4c684786d Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2 
Fix Publisher Creation Form Take2

GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985
 2019-03-14 13:43:12 +00:00
Jessica Lawshe
a1e16c9676 Merge pull request #1600 from sharelatex/as-rttc-text-markers 
Switch delete track change markers to use bookmark system to improve performance

GitOrigin-RevId: 865003ba30728f7104ad4c1b9e114998aa7d66a0
 2019-03-13 16:52:11 +00:00
Jessica Lawshe
4652b69488 Merge pull request #1617 from sharelatex/ho-logger-use-metrics-name 
use METRICS_APP_NAME for the logger

GitOrigin-RevId: 536a76119f7b4be92985f62d4e007a88c36cd430
 2019-03-13 16:52:03 +00:00
Jessica Lawshe
0b841aacef Merge pull request #1605 from sharelatex/jel-portal-team-data 
Refactor portals

GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230
 2019-03-13 16:51:52 +00:00
Brian Gough
32925f0c4e Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely 
allow reserved names safely

GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
 2019-03-13 11:18:06 +00:00
Brian Gough
0f22a626c8 Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request 
remove old project version request

GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77
 2019-03-13 09:12:42 +00:00
Henry Oswald
0c5346460f log ops in filestore error 
GitOrigin-RevId: 008722ba2ff335ebedb2e17e9413737d0244f78e
 2019-03-12 11:48:51 +00:00
Timothée Alby
5b5b06307a Merge pull request #1596 from sharelatex/ja-more-client-error-logging 
Increase the number and type of events we log

GitOrigin-RevId: 5384beb86f095d673deebe7b17d76668137fc912
 2019-03-11 11:08:20 +00:00
Timothée Alby
b86a949f50 Merge pull request #1485 from sharelatex/cmg-comments-track-changes 
Add comments highlighting to rich text track changes

GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5
 2019-03-11 11:08:10 +00:00
Timothée Alby
8187eb7fcb Merge pull request #1592 from sharelatex/ew-clean-stray-containers 
Clean Up Containers

GitOrigin-RevId: 334f5458981b68432f0e0d086176f508ee83e836
 2019-03-11 11:07:59 +00:00
Timothée Alby
89f31d71e3 Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working 
Don't use multipart/form-data for admin panel buttons

GitOrigin-RevId: 97c265a1c0addbddf5628d5e0c70fedb38bda75d
 2019-03-11 11:07:45 +00:00
Timothée Alby
e1fb28ae28 Merge pull request #1598 from sharelatex/jel-wiki-search 
Stop search bar clearing on enter

GitOrigin-RevId: 54d0de33fc196ea97b3f8628442704475aa959dd
 2019-03-11 11:07:34 +00:00
Timothée Alby
72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes 
Fixes for unsubscribing from metrics email

GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
 2019-03-11 11:07:20 +00:00
nate stemen
f699877959 Merge pull request #1540 from sharelatex/ns-less-spam-mail 
add spam checkers on project invite emails

GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
 2019-03-11 11:07:09 +00:00
Simon Detheridge
f5ecc5ad85 Merge pull request #1585 from sharelatex/spd-bin-run 
Add bin/run wrapper to web

GitOrigin-RevId: e324256fdca6b334d25385148e7517b4c4c5e702
 2019-03-11 11:06:57 +00:00
Brian Gough
01fd6e9c8a Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version 
use atomic project structure version

GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8
 2019-03-11 11:06:45 +00:00
Douglas Lovell
b9e88c7998 Merge remote-tracking branch 'origin/bg-accept-larger-document-size-on-api-requests' 
GitOrigin-RevId: b06511daa7000878646f5cb8132d6077304f5f8c
 2019-03-11 11:06:23 +00:00
Douglas Lovell
f090eb6d06 Merge remote-tracking branch 'origin/pr-update-files-to-hash' 
GitOrigin-RevId: dec35961f496f14357757248a62fe4c7d7fc1def
 2019-03-11 11:06:10 +00:00
Douglas Lovell
24da4799ed Merge remote-tracking branch 'origin/jel-payment-countries' 
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
 2019-03-11 11:05:58 +00:00
Douglas Lovell
ce8695c951 Merge branch 'dcl-i1261b' 
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
 2019-03-11 11:05:47 +00:00
Douglas Lovell
44dd7c1c75 Merge remote-tracking branch 'origin/as-fix-email-address' 
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
 2019-03-11 11:05:36 +00:00
Douglas Lovell
eadc6b838b Merge branch 'dcl-i1507e' 
GitOrigin-RevId: 6368f274c2b19d12c571cf065291805a4ff50a4e
 2019-03-11 11:05:26 +00:00
Simon Detheridge
3553fb2d9d Merge pull request #1581 from sharelatex/spd-wearing-middle 
Fix spelling of "middleware"

GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
 2019-03-11 11:05:12 +00:00
Simon Detheridge
939922485c Merge pull request #1555 from sharelatex/spd-email-escape-html 
HTML-escape user-supplied data in HTML emails

GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91
 2019-03-11 11:05:01 +00:00
Simon Detheridge
96759a90f4 Merge pull request #1578 from sharelatex/jel-student-disclaimer 
Show disclaimer on student subscription trials

GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
 2019-03-11 11:04:46 +00:00
Simon Detheridge
97145847ef Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge 
When a document is updated externally via git-bridge, don't show warning

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
 2019-03-11 11:04:35 +00:00
Simon Detheridge
870f183595 Merge pull request #1476 from sharelatex/spd-character-sets 
Detect encoding of non-utf8 files and convert during load

GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
 2019-03-11 11:04:22 +00:00
Henry Oswald
68c7cc6fa3 Merge pull request #1577 from sharelatex/ho-jenkins-github-connection 
point to the web-sharelatex-internal repo for github-> jenkins

GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
 2019-03-11 11:04:10 +00:00
Hugh O'Brien
491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out 
v2 metrics email opt out and last sent tracking

GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
 2019-03-11 11:03:39 +00:00