Commit graph

17992 commits

Author SHA1 Message Date
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
James Allen
2a1e82ce46 Delete unused public dir 2016-12-15 15:30:00 +00:00
James Allen
457fdd7fd6 Merge branch 'ja-track-changes' 2016-12-15 14:07:43 +00:00
James Allen
3007759902 Add missing test script 2016-12-15 14:07:26 +00:00
James Allen
ce506f0675 Merge pull request #3 from sharelatex/ja-track-changes
Clean up dead code and add acceptance tests
2016-12-15 13:58:17 +00:00
Brian Gough
2583a28087 rollout linter math mode to all users
ace repo commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9
2016-12-15 13:28:00 +00:00
Henry Oswald
6c81d18627 bumped up rlimit-nproc to 600 2016-12-14 18:15:09 +00:00
Henry Oswald
d41bf2e974 result path not in final cb 2016-12-14 18:11:28 +00:00
James Allen
f94de71093 Add acceptance runner 2016-12-14 17:44:02 +00:00
James Allen
6ac2aa77a8 Clean up dead code and add acceptance tests 2016-12-14 17:38:14 +00:00
Henry Oswald
4bba56ed28 added missing files 2016-12-14 17:14:15 +00:00
Henry Oswald
676d832b2f Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex 2016-12-14 17:02:19 +00:00
Henry Oswald
27139bc433 increased rlimit-nproc and added health check for converting image 2016-12-14 16:47:53 +00:00
James Allen
5717cafcec Create comments via comment ops 2016-12-13 17:57:46 +00:00
James Allen
898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +00:00
James Allen
59a06cd798 Accept comments with thread id as an op type 2016-12-13 15:51:47 +00:00