github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-23 02:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity
17886 commits 3 branches 7 tags 188 MiB
Commit graph

17886 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Shane Kilkelly
8e25bbf61a Merge pull request #48 from overleaf/sk-extend-request-timeouts 
Extend http request timeouts
 2018-12-17 10:48:26 +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
Shane Kilkelly
40add6985f Remove override of connect timeout 2018-12-17 09:39:19 +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
Shane Kilkelly
2195af88dd Set timeouts on Post requests too 2018-12-14 16:34:48 +00:00
Shane Kilkelly
46904bfe73 Set timeouts on http requests to 3 minutes, up from the default of 20 seconds. 2018-12-14 16:13:58 +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
Henry Oswald
a2ed182942 add process.env['LOG_LEVEL'] varable to let us change the logging level 2018-12-14 14:30:01 +00:00
Christopher Hoskin
424a8c3d2a Merge pull request #106 from sharelatex/csh-prom-metrics 
Use promethus metrics
 2018-12-14 10:21:40 +00:00
Shane Kilkelly
0bc82e6936 Merge pull request #46 from overleaf/sk-increase-push-timeout 
Change push timeout to three minutes
 2018-12-14 09:46:46 +00:00
Shane Kilkelly
26ff545415 Merge pull request #47 from overleaf/sk-print-good-error-when-404 
When user clone/pull/etc a project which doesn't exist, print a nice message
 2018-12-14 09:46:26 +00:00
Nate Stemen
f6ef1cd6a3 d'oh add individual decaffed files before committing 2018-12-13 16:59:55 -05:00
Nate Stemen
9c44a2c9fc download rc files in script and quote filenames 2018-12-13 16:55:47 -05:00
Christopher Hoskin
392884356e Revert "Bump buildscript to 1.1.10" 
This reverts commit 38874f9169abfb1bcc7297988abe22c012a4c107.
 2018-12-13 17:37:16 +00:00
Christopher Hoskin
45a7adab6e Revert "Initialise metrics at begining of app" 
This reverts commit 855f26c5205039e96cfea8d224eff5ebb743e046.
 2018-12-13 17:33:45 +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
Christopher Hoskin
b49de8e57c Bump buildscript to 1.1.10 2018-12-13 14:45:40 +00:00
Christopher Hoskin
f9b0ac0e80 Initialise metrics at begining of app 2018-12-13 14:24:44 +00:00
Christopher Hoskin
533ec9128e Bump metrics-sharelatex to v2.0.12 2018-12-13 14:21:32 +00:00
Henry Oswald
f0fd0299fe Merge pull request #15 from sharelatex/ho-profiler 
add google profiler
 2018-12-13 14:18:35 +00:00
Christopher Hoskin
2559b63f04 Bump metrics-sharelatex.git to v2.0.11 2018-12-13 14:15:19 +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
Henry Oswald
2505be283a turn down logging, use logger.info for less important data 2018-12-13 12:46:10 +00:00
Shane Kilkelly
9ee39ae930 Wrap the generic repository-missing message correctly 
Now appears to the client as:

```
fatal: remote error: no git access
This Overleaf project currently has no git access, either because
the project does not exist, or because git access is not enabled
for the project.
```
 2018-12-13 12:37:42 +00:00
Shane Kilkelly
abcaf8242e Include message along with error description lines 2018-12-13 12:37:21 +00:00
Shane Kilkelly
a766482a00 Remove stray import 2018-12-13 12:37:09 +00:00
Shane Kilkelly
bf7be6071d Handle GitUserException, with multiple lines of output 2018-12-13 11:41:07 +00:00
Shane Kilkelly
2f18feb136 Keep the default constructor for MissingRepositoryException 2018-12-13 11:40:08 +00:00
Shane Kilkelly
27e1152095 Fix wording of the generic-error when a repository is missing 2018-12-13 10:34:09 +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
Henry Oswald
dfead32d69 Update package.json 2018-12-13 09:19:05 +00:00
Henry Oswald
1a34f3db1b Update package.json 2018-12-13 08:46:58 +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
Henry Oswald
287effb139 use ENABLE_PROFILE_AGENT 2018-12-12 21:17:12 +00:00
Henry Oswald
db4ae84bda require logger 2018-12-12 21:05:33 +00:00
Henry Oswald
a86c4d8abd add profiler 2018-12-12 20:11:40 +00:00
Shane Kilkelly
a72146aa8d Better report to user on push timeout 2018-12-12 10:38:26 +00:00
Henry Oswald
9eac49ad84 add some logging in 2018-12-11 16:07:34 +00:00
Henry Oswald
c257482e15 add ENABLE_DEBUG_AGENT and don't require modules unless they are enabled 2018-12-11 15:46:29 +00:00
Henry Oswald
06babdf789 remove inline maps 2018-12-11 14:49:29 +00:00
Henry Oswald
7358f91ea9 inline source maps, remove grunt, clean dev deps 2018-12-11 14:43:39 +00:00
Henry Oswald
b68d7d46a2 update coffeescript 2018-12-11 14:36:35 +00:00