Commit graph

3266 commits

Author SHA1 Message Date
Paulo Reis
270bf81667 Cleanup. 2016-09-27 16:12:45 +01:00
Paulo Reis
b6d237e189 More granular tracking, in metabase. 2016-09-27 16:01:56 +01:00
Paulo Reis
38d04e27c9 Restrict AB test to newly registered users. 2016-09-27 11:50:34 +01:00
Paulo Reis
6ccf7288e6 Register conversions. 2016-09-26 16:18:37 +01:00
Paulo Reis
d97313d22c Horizontal layout. 2016-09-26 16:09:27 +01:00
Paulo Reis
23671c7b18 Label styling. 2016-09-26 15:03:04 +01:00
Paulo Reis
9208fe7c30 Basic mark-up for AB testing labels. 2016-09-26 15:02:54 +01:00
Shane Kilkelly
fb6f6c13c9 Merge branch 'master' into sk-passport 2016-09-26 09:43:19 +01:00
Brian Gough
bba6008e4d Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change
Ace syntax validator minimal change
2016-09-26 09:25:50 +01:00
Shane Kilkelly
ab4916067e Merge branch 'master' into sk-passport 2016-09-26 09:18:24 +01:00
Shane Kilkelly
dd14e51713 Handle null, undefined and false in isUserLoggedIn 2016-09-23 16:53:07 +01:00
Shane Kilkelly
f9030a0a38 get user_id directly 2016-09-23 16:25:23 +01:00
Shane Kilkelly
7384a08cb4 Pass req to function. 2016-09-23 16:21:07 +01:00
Henry Oswald
67f8ec756c Revert "wip"
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
2016-09-23 16:19:11 +01:00
Henry Oswald
7c0e338352 fix bug where users are always shown downgrade option when not required 2016-09-23 16:18:22 +01:00
Henry Oswald
5c2fbaafd3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-09-23 15:45:42 +01:00
Henry Oswald
0802ab6ddc wip 2016-09-23 15:44:47 +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
Shane Kilkelly
ff1c72ee14 Fix up more session access 2016-09-22 14:30:34 +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
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
Shane Kilkelly
64c9a3ae18 Fix logic, was wrong way around 2016-09-22 11:16:50 +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
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
Brian Gough
de2e0478c6 disable pdfjs fontface on Microsoft Edge 2016-09-21 13:58:14 +01: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
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
James Allen
779ace2fb7 Merge branch 'master' into ja-invite-emails-once 2016-09-21 10:48:43 +01:00
James Allen
2478a95bcb Don't watch files as grunt default 2016-09-21 10:48:23 +01:00