Shane Kilkelly
4efdddbbac
Add CHKTEX_ULIMIT_OPTIONS
2016-09-23 15:32:37 +01:00
Brian Gough
4f9826c87b
show beta program link for everyone on /settings
2016-09-23 15:28:15 +01:00
Brian Gough
0eaa359f6c
use syntax validator for beta programme users only
2016-09-23 15:19:40 +01:00
Brian Gough
975b70e4fe
add latex syntax highlighting
2016-09-23 15:19:40 +01:00
Brian Gough
d152095920
destroy ace sessions when no longer in use
...
also set mode to "latex" when session is created, to avoid setting mode
to "text" (default) and then to "latex" which causes the text worker to
be unnecessarily created and destroyed.
2016-09-23 15:19:40 +01:00
Brian Gough
0a350c8e3f
infrastructure for using ace syntax checking
2016-09-23 15:19:40 +01:00
Shane Kilkelly
02587377a2
Remove ReferalMiddleware
, dead code.
2016-09-23 14:42:57 +01:00
Shane Kilkelly
6e8185aeaf
Merge branch 'master' into sk-passport
2016-09-23 10:28:35 +01:00
Shane Kilkelly
6c716ca252
Fix acceptance tests by updating invite-accept url
2016-09-23 10:28:17 +01:00
Shane Kilkelly
72ca1d6316
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00
James Allen
2b317cab6c
Merge pull request #320 from sharelatex/ja-validate-filenames
...
Don't allow files to be created with / or * characters
2016-09-23 09:42:48 +01:00
Paulo Jorge Reis
f4ff72a2e4
Merge pull request #318 from sharelatex/ja-invite-emails-once
...
Ja invite emails once
2016-09-22 17:36:10 +01:00
James Allen
e15976be21
Use token in URL to force its precense when invite and allow easy dynamic notifications
2016-09-22 17:24:06 +01:00
Shane Kilkelly
dbac4bd008
update session when user settings change
2016-09-22 16:58:25 +01:00
Shane Kilkelly
7e449c60ed
fix tests
2016-09-22 16:04:42 +01:00
Shane Kilkelly
636b1fe9e2
Copy to session.user
, for compatibility
2016-09-22 15:49:09 +01:00
Shane Kilkelly
a0f156e1a9
wipe out more session access
2016-09-22 15:33:50 +01:00
James Allen
21f88bb20e
Use ide.validFileRegex, not hard coded regex
2016-09-22 14:57:59 +01:00
James Allen
9506797384
Update log parser to better handle Runaway argument errors
2016-09-22 14:47:48 +01:00
Shane Kilkelly
ff1c72ee14
Fix up more session access
2016-09-22 14:30:34 +01:00
James Allen
638359e052
Don't delete knitr cache files
2016-09-22 14:14:29 +01:00
Shane Kilkelly
c959e0c65d
Set req.user
2016-09-22 13:54:13 +01:00
Shane Kilkelly
6df569253a
Fix session touch
2016-09-22 13:48:09 +01:00
Shane Kilkelly
7f24dd6f55
Fix tests for UserInfoController.
2016-09-22 13:37:27 +01:00
Henry Oswald
1fca396be2
fix comments for user create
2016-09-22 12:45:45 +01:00
Henry Oswald
1c3be11b8c
Update docker-compose.yml
2016-09-22 12:32:25 +01:00
Henry Oswald
5e1f7d86fd
make errors more clear
2016-09-22 12:30:43 +01:00
Shane Kilkelly
a3ace1fccd
Increase timeout because slow tests
2016-09-22 11:33:54 +01:00
Shane Kilkelly
3b73d97931
Use getLoggedInUserId
2016-09-22 11:33:38 +01:00
James Allen
cce93b95a5
Fetch updates before doc content when building a diff
2016-09-22 11:19:05 +01:00
James Allen
05a048db9a
Add in a little more logging
2016-09-22 11:19:05 +01:00
Shane Kilkelly
64c9a3ae18
Fix logic, was wrong way around
2016-09-22 11:16:50 +01:00
ShareLaTeX
22a3225e70
added check db init script
2016-09-21 17:10:27 +00:00
ShareLaTeX
046faae590
added contacts runit
2016-09-21 17:09:53 +00:00
ShareLaTeX
ea7f7af88d
added notificaitons service
2016-09-21 17:09:23 +00:00
Henry Oswald
b32cdab053
spell check notifications
2016-09-21 17:54:46 +01:00
Henry Oswald
e98a23759c
install texcount on default image
2016-09-21 16:59:37 +01:00
James Allen
4386ab1225
Don't allow files to be created with / or * characters
...
Requires the following translations:
"files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters",
"invalid_file_name": "Invalid File Name"
2016-09-21 16:31:55 +01:00
Henry Oswald
e0d548a284
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
2016-09-21 15:24:32 +01:00
Henry Oswald
cb90144ae5
moved run.sh to run
2016-09-21 15:24:07 +01:00
Brian Gough
fe1caa806a
Merge pull request #319 from sharelatex/fix-pdf-renderer-for-edge
...
disable pdfjs fontface on Microsoft Edge
2016-09-21 15:20:56 +01:00
Shane Kilkelly
41cc9e68b5
update npm shrink-wrap
2016-09-21 15:15:44 +01:00
James Allen
4c04a5df3f
Sanitize resource path along with rootResourcePath
2016-09-21 15:09:01 +01:00
Brian Gough
de2e0478c6
disable pdfjs fontface on Microsoft Edge
2016-09-21 13:58:14 +01:00
ShareLaTeX
66dcbb9b96
move settings file to early on
2016-09-21 12:47:07 +00:00
Shane Kilkelly
c12450f533
Merge branch 'master' into sk-passport
2016-09-21 13:17:54 +01:00
Shane Kilkelly
dde5b7b830
Regenerate session on login, protect against session-fixation attack.
2016-09-21 13:03:37 +01:00
Henry Oswald
1e81ab7bef
throw errors in grunt when checking
2016-09-21 12:43:58 +01:00
Henry Oswald
2443aa9e75
added check make back in and list of make grunt tasks
2016-09-21 12:08:11 +01:00
James Allen
d904e50041
Make project invite notification dynamic and accept via ajax request
...
Needs translations:
"joining": "Joining",
"notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>",
"notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>",
"open_project": "Open Project"
2016-09-21 11:59:35 +01:00