9d3baf488f
Use the query operator for existence check
2016-10-10 13:28:03 +01:00
a722646040
Remove un-used module
2016-10-10 11:05:14 +01:00
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
894c549ec6
WIP: display sessions on a page
2016-10-06 15:49:47 +01:00
95a66bbf00
Merge pull request #328 from sharelatex/sk-plain-text-email
...
Sk plain text email
2016-10-05 10:04:08 +01:00
3141f91b59
Merge pull request #322 from sharelatex/ho-password-limits
...
Ho password limits
2016-10-05 10:03:54 +01:00
e699fcb1fa
Add plain-text component to the project-invite email
2016-10-03 15:25:38 +01:00
b42a3b9188
Fix logging typo
2016-10-03 15:25:18 +01:00
6141eb4a44
null check user_id
2016-09-26 17:25:11 +01:00
8558ce1f75
improve error handling in update merger
2016-09-26 13:57:57 +01:00
dd14e51713
Handle null, undefined and false in isUserLoggedIn
2016-09-23 16:53:07 +01:00
8a2b7d0461
server side protect passwords which are too long
2016-09-23 16:51:46 +01:00
0d0f0e8604
wip
2016-09-23 16:38:46 +01:00
f9030a0a38
get user_id directly
2016-09-23 16:25:23 +01:00
7384a08cb4
Pass req to function.
2016-09-23 16:21:07 +01:00
02587377a2
Remove ReferalMiddleware, dead code.
2016-09-23 14:42:57 +01:00
72ca1d6316
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00
e15976be21
Use token in URL to force its precense when invite and allow easy dynamic notifications
2016-09-22 17:24:06 +01:00
dbac4bd008
update session when user settings change
2016-09-22 16:58:25 +01:00
636b1fe9e2
Copy to session.user, for compatibility
2016-09-22 15:49:09 +01:00
a0f156e1a9
wipe out more session access
2016-09-22 15:33:50 +01:00
ff1c72ee14
Fix up more session access
2016-09-22 14:30:34 +01:00
c959e0c65d
Set req.user
2016-09-22 13:54:13 +01:00
3b73d97931
Use getLoggedInUserId
2016-09-22 11:33:38 +01:00
64c9a3ae18
Fix logic, was wrong way around
2016-09-22 11:16:50 +01:00
c12450f533
Merge branch 'master' into sk-passport
2016-09-21 13:17:54 +01:00
dde5b7b830
Regenerate session on login, protect against session-fixation attack.
2016-09-21 13:03:37 +01:00
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
a93c939dbc
Send invite email and notification in the background
2016-09-21 10:11:35 +01:00
bb71433727
Remove getLoggedInUser
2016-09-21 09:27:51 +01:00
c2e14ded13
Add null checks for fileRefs and docs, which are not present when calling mkdirp
2016-09-20 16:55:12 +01:00
1a67e4982e
change blog regex to look for src's which start with a slash
2016-09-20 15:43:36 +01:00
21ca9697ca
log user_id not user
2016-09-20 15:11:14 +01:00
777cbf1c80
move comment for user is false next to if statment
2016-09-20 14:51:51 +01:00
d4863ae148
don't use cdn for blog posts which have a http on them
2016-09-20 14:48:35 +01:00
4eada48638
Merge branch 'master' into sk-passport
2016-09-19 15:40:25 +01:00
0917fe10ca
Return type when finding element by path so that we don't need a heuristic
2016-09-19 14:35:25 +01:00
97a6ac0f00
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee
2016-09-15 14:48:51 +01:00
2119dcbb58
Finalise login workflow, works with login form again.
2016-09-15 14:36:11 +01:00
53b3e3831d
Update cancellation survey link
2016-09-14 10:51:19 +01:00
cc9791d3f4
Redirect to login with a redirect back to the page we want if not logged in
2016-09-13 11:23:47 +01:00
438ac45854
fix unit tests
2016-09-07 16:40:49 +01:00
8e0103a1bc
wip: fix unit tests for AuthenticationController
2016-09-07 14:05:51 +01:00
cc5ddc92bb
use getSessionUser rather than getLoggedInUser
2016-09-07 10:30:58 +01:00
3a5b3a8e8d
wip: acceptance tests working
2016-09-06 15:55:34 +01:00
b0a10c948c
wip refactor
2016-09-06 15:22:13 +01:00
749658a916
WIP: fixing acceptance tests
2016-09-06 13:21:22 +01:00
6aef092dce
fix typo
2016-09-06 09:29:58 +01:00
ab2c1e82fb
WIP: refactor
2016-09-05 15:58:31 +01:00
e6c7aa25ec
barely functional login and logout
2016-09-05 10:28:47 +01:00
Shane Kilkelly