Commit graph

22607 commits

Author SHA1 Message Date
James Allen
898d20a6fc Fix signature of call to unresolveComment 2017-01-05 10:34:28 +01:00
Winston Li
af49325b88 Make submodule test more verbose 2017-01-04 22:35:48 +00:00
Paulo Reis
1599c41670 Sizing adjustments. 2017-01-04 15:34:24 +00:00
James Allen
60152e219b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-04 16:26:08 +01:00
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Paulo Reis
fdafcf9677 Restyle insertions and deletions - increasing info density. 2017-01-04 15:24:49 +00:00
James Allen
1ff920e1b5 Add endpoints for resolving and reopening threads 2017-01-04 14:58:08 +01:00
Henry Oswald
c6153c5b44 - added option to set lang code
- removed commeted out learn header code
- increased max pass length to 150
2017-01-04 11:41:38 +00:00
Winston Li
e498dd3a2a Merge pull request #22 from overleaf/javadoc-merge-submodule
Javadoc Merge, Improved JavaDocs/logging, Basic Auth Fixes, Submodule
2016-12-22 13:42:30 +00:00
Winston Li
9c63f06d4e Change InvalidGitRepository message 2016-12-22 13:40:12 +00:00
Shane Kilkelly
fa29f0f19d Fix the header-nav links option 2016-12-21 14:57:47 +00:00
Shane Kilkelly
453311136f Move the filtering-out of /register links to web 2016-12-21 13:51:05 +00:00
Shane Kilkelly
7bbbfe20b9 If external auth is used, remove /register items from header nav.
(logic moved from docker-image settings file)
2016-12-21 13:50:13 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Henry Oswald
bcf9a17fb3 Merge branch 'master' into node-4.2 2016-12-20 15:23:02 +00:00
Shane Kilkelly
4bf529ef9b Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image 2016-12-20 10:29:06 +00:00
Shane Kilkelly
8f37d7dd2c add restrictInvitesToExistingAccounts option 2016-12-20 10:28:54 +00:00
Shane Kilkelly
b585560dd0 Remove cruft. 2016-12-20 10:28:37 +00:00
Shane Kilkelly
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Henry Oswald
e0f39da616 null check fsPath on unlink file 2016-12-19 14:48:09 +00:00
Henry Oswald
9e8c27f46b don’t shutdown filestore on uncaught exception 2016-12-19 14:47:54 +00:00
Henry Oswald
eadfb316b4 chown /var/www/ to www-data 2016-12-19 14:17:39 +00:00
Shane Kilkelly
d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Henry Oswald
bf93fc3f50 run health check max 1 a at a time 2016-12-19 13:26:21 +00:00
Winston Li
6d563ed40e Better javadoc, improve handling of submodules 2016-12-19 12:56:58 +00:00
Henry Oswald
fd99887753 running check in background 2016-12-19 12:29:08 +00:00
Shane Kilkelly
535e489ae5 Add an example redis.ratelimiter config. 2016-12-19 12:17:58 +00:00
Shane Kilkelly
9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Winston Li
46d0f55781 Merge branch 'master' into javadoc-merge 2016-12-17 16:09:16 +00:00
Winston Li
76eb0a3200 Improve javadoc and logging 2016-12-17 16:09:01 +00:00
Winston Li
d3fd17aab5 Improve javadocs around swapping/repos 2016-12-17 15:20:08 +00:00
Winston Li
bde4c35c4b Merge pull request #21 from overleaf/gitignore
Ignore .gitignore files on git.overleaf.com repos (fix #1281)
2016-12-17 11:38:06 +00:00
Paulo Reis
d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
James Allen
cb88e1e41b Add in support for threads for comments 2016-12-16 16:52:50 +00:00
James Allen
5e730b33b2 Support new comment op format 2016-12-16 16:44:08 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
Paulo Reis
869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Brian Gough
e5160d9a36 log client id when disconnecting on otUpdateError
only log errors for connected clients
2016-12-16 14:43:51 +00:00
Brian Gough
3a8a12fcb3 Revert "rollout linter math mode to all users"
This reverts commit 0ac0a11d3028cabac53d1e347b2509cb9e785f9f.
2016-12-16 14:07:47 +00:00
Paulo Reis
0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Shane Kilkelly
637fcb5784 Merge branch 'master' into sk-learn-anchor-links 2016-12-16 11:20:43 +00:00
Shane Kilkelly
fdcf97f877 Disable angular html5Mode. 2016-12-16 10:26:25 +00:00
Paulo Reis
7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00
Paulo Reis
47a5eb5382 Add a new layout and body template for e-mails. 2016-12-15 17:22:39 +00:00
Shane Kilkelly
faf740d224 Disable link rewriting. 2016-12-15 16:23:10 +00:00