Shane Kilkelly
4c092e7ff1
Remove deprecated "projectSharedWithYou" email.
2016-10-28 10:37:10 +01:00
Shane Kilkelly
751a116921
add plainTextTemplate to all emails
2016-10-27 14:41:13 +01:00
Shane Kilkelly
1538f140f3
update test timestamp
2016-10-27 09:41:51 +01:00
Shane Kilkelly
dfd13e0815
Update AB test timestamp
2016-10-26 14:24:00 +01:00
Shane Kilkelly
d912c3b487
Merge branch 'master' into sk-plans-tidy
2016-10-26 13:47:26 +01:00
Brian Gough
bb06b97b3c
avoid exception in logging null user
2016-10-25 15:01:59 +01:00
Shane Kilkelly
6069d4dba3
Merge branch 'master' into sk-plans-tidy
2016-10-25 13:14:44 +01:00
Henry Oswald
450946212a
log out health check failures
2016-10-21 18:59:28 +01:00
Shane Kilkelly
8c1d110688
Remove debug logs
2016-10-21 16:21:21 +01:00
Shane Kilkelly
d5a7514923
Add AB test for plans (+15 squashed commits)
...
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
2016-10-21 16:17:37 +01:00
Henry Oswald
1beca53b3d
project name should be clickable href in invite email
2016-10-18 15:53:56 +01:00
Henry Oswald
a02da61cb0
fixed email sender tests looking for wrong settings
2016-10-14 16:43:59 +01:00
Henry Oswald
bfeb7e082f
added textEncoding option for email
2016-10-13 14:22:08 +01:00
Henry Oswald
65e48652ee
don't add second slash into uni redirect
2016-10-10 15:36:12 +01:00
Henry Oswald
adc6b429e6
record when a subscription is canceled
2016-10-10 15:29:54 +01:00
Henry Oswald
92e3101d81
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-10-10 15:29:06 +01:00
Shane Kilkelly
c4fd9f3bce
Merge branch 'master' into sk-session-button
2016-10-10 14:49:55 +01:00
Shane Kilkelly
9d3baf488f
Use the query operator for existence check
2016-10-10 13:28:03 +01:00
Shane Kilkelly
a722646040
Remove un-used module
2016-10-10 11:05:14 +01:00
Henry Oswald
101896a754
redirect to /i/ university
2016-10-07 17:10:58 +01:00
Shane Kilkelly
25dd998107
clear-sessions page (+4 squashed commits)
...
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
2016-10-07 16:47:00 +01:00
Brian Gough
2d1a0b34d5
Merge pull request #333 from sharelatex/support-package-versions
...
Support package versions
2016-10-07 15:04:59 +01:00
Shane Kilkelly
894c549ec6
WIP: display sessions on a page
2016-10-06 15:49:47 +01:00
Brian Gough
9177544ed9
add left menu for syntax validator
2016-10-06 11:51:24 +01:00
Brian Gough
8b6425317f
introduce PackageVersions module
...
put all package versions in one central place
2016-10-05 14:54:42 +01:00
Shane Kilkelly
95a66bbf00
Merge pull request #328 from sharelatex/sk-plain-text-email
...
Sk plain text email
2016-10-05 10:04:08 +01:00
Henry Oswald
3141f91b59
Merge pull request #322 from sharelatex/ho-password-limits
...
Ho password limits
2016-10-05 10:03:54 +01:00
Shane Kilkelly
e699fcb1fa
Add plain-text component to the project-invite email
2016-10-03 15:25:38 +01:00
Shane Kilkelly
b42a3b9188
Fix logging typo
2016-10-03 15:25:18 +01:00
Henry Oswald
6141eb4a44
null check user_id
2016-09-26 17:25:11 +01:00
Henry Oswald
8558ce1f75
improve error handling in update merger
2016-09-26 13:57:57 +01:00
Shane Kilkelly
dd14e51713
Handle null, undefined and false in isUserLoggedIn
2016-09-23 16:53:07 +01:00
Henry Oswald
8a2b7d0461
server side protect passwords which are too long
2016-09-23 16:51:46 +01:00
Henry Oswald
0d0f0e8604
wip
2016-09-23 16:38:46 +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
Shane Kilkelly
02587377a2
Remove ReferalMiddleware, dead code.
2016-09-23 14:42:57 +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
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
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
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
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
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
a93c939dbc
Send invite email and notification in the background
2016-09-21 10:11:35 +01:00
