Commit graph

22519 commits

Author SHA1 Message Date
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
Henry Oswald
8b4911625c Merge pull request #22 from sharelatex/deletefailedfiles
* delete both file and converted file if there is an error
2016-12-13 14:34:30 +00:00
Henry Oswald
b166c86197 added missing originalFsPath 2016-12-13 14:29:04 +00:00
Henry Oswald
b38e7d3078 * delete both file and converted file if there is an error
* increase timeout of optpng
2016-12-13 12:43:57 +00:00
Henry Oswald
33df3346f8 Merge branch 'master' of https://github.com/sharelatex/spelling-sharelatex 2016-12-13 09:14:31 +00:00
Henry Oswald
a695fd33b2 write cache into cache dir 2016-12-13 09:14:09 +00:00
James Allen
47b19818ff Add in new comment op type 2016-12-12 17:53:43 +00:00
Paulo Jorge Reis
a772b268aa Merge pull request #385 from sharelatex/pr-style-announcements
Announcements styling
2016-12-12 15:19:40 +00:00
Brian Gough
3a7731b33b Merge pull request #384 from sharelatex/bg-syntax-checker-mathmode
update latex syntax checker to include mathmode
2016-12-12 15:09:45 +00:00
Brian Gough
6e8ee826dc update latex syntax checker to include mathmode
from our ace commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9

provide it as a beta release first
2016-12-12 10:10:49 +00:00
James Allen
0a6a6c3c28 Keep files ordered in overview panel in the same was as the file tree 2016-12-09 16:17:28 +00:00
James Allen
293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen
0174495f75 Add an end point to get all the ranges in a project 2016-12-09 14:37:24 +00:00
Shane Kilkelly
17d2d4561d Fix daft typos 2016-12-09 12:34:08 +00:00
Shane Kilkelly
bef595eced Add error var 2016-12-09 11:13:20 +00:00
Shane Kilkelly
6e99800298 Fix ldap settings 2016-12-09 11:01:01 +00:00
Shane Kilkelly
779bbfa261 Remove the starttls option 2016-12-09 10:40:43 +00:00
Shane Kilkelly
799cca1d6d Update to new ldap config 2016-12-09 09:22:31 +00:00
James Allen
1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen
1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
James Allen
e3fee1a1d1 Rename 'track changes entries' -> 'ranges' 2016-12-08 12:31:43 +00:00
James Allen
bf2620ee0c Return ranges from docupdater to client 2016-12-08 11:37:31 +00:00
James Allen
5d377713d6 Try to fix issue with acceptance tests timing out 2016-12-08 11:25:25 +00:00
James Allen
7bade0a8bb Merge branch 'master' of github.com:sharelatex/real-time-sharelatex 2016-12-08 11:16:22 +00:00