Commit Graph
26853 Commits
Author SHA1 Message Date
Paulo Reis c2df5dc01c Apply Chrome's accent input workaround in Safari version 10.1. 2017-04-03 16:26:20 +01:00
Paulo Reis 20732ed571 Add Safari user-agent detection in Ace useragent lib. 2017-04-03 16:24:19 +01:00
Shane Kilkelly 043520fc28 Remove the Metrics module, use metrics-sharelatex 2017-04-03 16:18:30 +01:00
James Allen 7a64f040f1 Test and fix _mongoDocToS3Doc 2017-04-03 16:04:54 +01:00
James Allen bf187f30ec Add tests for _s3DocToMongo 2017-04-03 15:50:33 +01:00
Shane Kilkelly 9a9f0f5c4d Remove the Metrics module, use metrics-sharelatex 2017-04-03 15:17:29 +01:00
James Allen 335f8f78f0 Merge pull request #445 from sharelatex/pr-new-logo
PR New logo
2017-04-03 14:05:51 +01:00
Brian Gough 5d6d33966b Merge pull request #27 from sharelatex/bg-retry-web-api-request
use requestretry to work around web api timeouts
2017-04-03 14:05:07 +01:00
Brian Gough cd1d0cc1f4 Merge pull request #26 from sharelatex/bg-error-check-on-unlock
improve error handling of releaseLock
2017-04-03 14:04:59 +01:00
James Allen 6b03e4b2a1 Merge pull request #470 from sharelatex/pr-fix-high-cpu-firefox
Set video source only when the onboarding prompt is shown.
2017-04-03 14:04:27 +01:00
James Allen efac6b70f4 Merge pull request #468 from sharelatex/ja-allow-overlapping-comments
Allo overlapping comments
2017-04-03 14:04:14 +01:00
James Allen 1675185f37 Merge pull request #474 from sharelatex/pr-project-name-tooltip
Project name tooltip
2017-04-03 14:04:02 +01:00
James Allen 8161b0ff1e Merge pull request #472 from sharelatex/pr-fix-resolved-comments-order
Use ISO strings instead of of date type in locally resolved comments.
2017-04-03 14:03:25 +01:00
Paulo Reis 4a86ff4b44 Merge branch 'master' into pr-new-logo 2017-04-03 11:17:39 +01:00
Brian Gough 7237467cb4 use requestretry to work around web api timeouts 2017-04-03 11:06:50 +01:00
Paulo Reis 6b9b8480a8 Only show the tooltip if the project name is truncated. 2017-03-31 16:36:58 +01:00
Paulo Reis 5b8c36dfc0 Add a project name tooltip. 2017-03-31 16:13:23 +01:00
Brian Gough b0b05d1e1b improve error handling of releaseLock
ported from docupdater
2017-03-31 15:17:13 +01:00
Shane Kilkelly 49de7bf315 mock out metrics in test 2017-03-31 14:54:20 +01:00
Shane Kilkelly 60b298d9ee upgrade to latest metrics 2017-03-31 14:43:19 +01:00
Paulo Reis 855d37289b Use ISO strings instead of of date type in locally resolved comments. 2017-03-31 14:29:28 +01:00
Shane Kilkelly bee62400a6 Merge branch 'master' into sk-upgrade-metrics 2017-03-31 14:08:12 +01:00
Shane Kilkelly b10f3adf2b mock out metrics in tests 2017-03-31 11:33:25 +01:00
Shane Kilkelly 9a84798293 Upgrade to latest metrics 2017-03-31 11:32:59 +01:00
Shane Kilkelly b14039715f Stub out logger in tests 2017-03-31 11:25:23 +01:00
Shane Kilkelly f7bc400f22 upgrade to most recent metrics 2017-03-31 11:18:31 +01:00
Shane Kilkelly 62e3cb41a2 Merge branch 'master' of github.com:sharelatex/docstore-sharelatex 2017-03-31 11:03:26 +01:00
Shane Kilkelly cc81eca902 Account for error being null 2017-03-31 10:46:13 +01:00
Shane Kilkelly 2c62acee0b Cleaner error reporting for addFolder endpoint 2017-03-31 10:31:03 +01:00
Shane Kilkelly 15d0a40f85 When error occurs, unset state.inflight 2017-03-31 10:30:28 +01:00
Shane Kilkelly 49446afb82 Remove duplicate line 2017-03-31 10:30:10 +01:00
Brian Gough fe5711ef07 Merge pull request #31 from sharelatex/bg-error-check-on-unlock
add error check on unlock
2017-03-31 09:29:53 +01:00
James Allen f94e33a3a9 Merge branch 'master' into ja-archive-ranges
Conflicts:
	app/coffee/DocArchiveManager.coffee
	test/acceptance/coffee/ArchiveDocsTests.coffee
2017-03-30 17:19:42 +01:00
James Allen a9ab7b739d Archive ranges as well as doc lines 2017-03-30 17:13:43 +01:00
Paulo Reis e9a5c37fb6 Adjust grey tone in error pages. 2017-03-30 16:46:04 +01:00
Paulo Reis 5ae7baccf5 New logo with better spacing. 2017-03-30 16:39:44 +01:00
Brian Gough 5583764d05 fix callback prototype in getLock 2017-03-30 15:31:47 +01:00
Brian Gough c11618b475 improve unlock error handling 2017-03-30 15:31:34 +01:00
Brian Gough b2b4bc44df upgrade logger-sharelatex to v1.5.6 2017-03-30 14:16:35 +01:00
Brian Gough 5989d8f27f Merge pull request #25 from sharelatex/bg-error-on-out-of-order-ops
return error when out-of-order ops detected
2017-03-30 14:00:23 +01:00
Brian Gough 8bb3dd07a4 continue when ops are out of order 2017-03-30 13:37:11 +01:00
Brian Gough 20d27024b6 Merge pull request #30 from sharelatex/bg-log-pushed-ops
log op versions pushed to track changes
2017-03-30 13:33:02 +01:00
Brian Gough d29141d583 return error when out-of-order ops detected 2017-03-30 11:48:26 +01:00
Brian Gough 527c02a00b log op versions pushed to track changes 2017-03-30 11:20:50 +01:00
Paulo Reis 250d19163b Set video source only when the onboarding prompt is shown. 2017-03-30 10:35:16 +01:00
Brian Gough 70bb95fb36 update logger-sharelatex to v1.5.6 2017-03-30 09:41:42 +01:00
Brian Gough 9d6101e365 Merge pull request #3 from sharelatex/bg-rate-limit
rate limit on logging
2017-03-29 16:26:16 +01:00
Brian Gough 42009093ef Merge pull request #469 from sharelatex/bg-fix-tikzfeynman-code-check
handle the \feynmandiagram command in code check
2017-03-29 15:57:34 +01:00
Brian Gough 13492c7fc4 handle the \feynmandiagram command in code check
pulled from our ace repository https://github.com/sharelatex/ace
commit baeb9aff561d048b8a839683261ffdf149ecd4ef
2017-03-29 15:27:10 +01:00
Brian Gough 9c7494eb67 fix off-by-one error in error count 2017-03-29 13:38:07 +01:00