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
Shane Kilkelly
bb71433727
Remove getLoggedInUser
2016-09-21 09:27:51 +01:00
James Allen
c2e14ded13
Add null checks for fileRefs and docs, which are not present when calling mkdirp
2016-09-20 16:55:12 +01:00
Henry Oswald
1a67e4982e
change blog regex to look for src's which start with a slash
2016-09-20 15:43:36 +01:00
Henry Oswald
21ca9697ca
log user_id not user
2016-09-20 15:11:14 +01:00
Henry Oswald
777cbf1c80
move comment for user is false next to if statment
2016-09-20 14:51:51 +01:00
Henry Oswald
d4863ae148
don't use cdn for blog posts which have a http on them
2016-09-20 14:48:35 +01:00
Shane Kilkelly
4eada48638
Merge branch 'master' into sk-passport
2016-09-19 15:40:25 +01:00
James Allen
0917fe10ca
Return type when finding element by path so that we don't need a heuristic
2016-09-19 14:35:25 +01:00
Shane Kilkelly
97a6ac0f00
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee
2016-09-15 14:48:51 +01:00
Shane Kilkelly
2119dcbb58
Finalise login workflow, works with login form again.
2016-09-15 14:36:11 +01:00
James Allen
53b3e3831d
Update cancellation survey link
2016-09-14 10:51:19 +01:00
James Allen
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
Shane Kilkelly
438ac45854
fix unit tests
2016-09-07 16:40:49 +01:00
Shane Kilkelly
8e0103a1bc
wip: fix unit tests for AuthenticationController
2016-09-07 14:05:51 +01:00
Shane Kilkelly
cc5ddc92bb
use getSessionUser
rather than getLoggedInUser
2016-09-07 10:30:58 +01:00
Shane Kilkelly
3a5b3a8e8d
wip: acceptance tests working
2016-09-06 15:55:34 +01:00
Shane Kilkelly
b0a10c948c
wip refactor
2016-09-06 15:22:13 +01:00
Shane Kilkelly
749658a916
WIP: fixing acceptance tests
2016-09-06 13:21:22 +01:00
Shane Kilkelly
6aef092dce
fix typo
2016-09-06 09:29:58 +01:00
Shane Kilkelly
ab2c1e82fb
WIP: refactor
2016-09-05 15:58:31 +01:00
Shane Kilkelly
e6c7aa25ec
barely functional login and logout
2016-09-05 10:28:47 +01:00
Shane Kilkelly
e4f4325150
Basic passport integration
2016-09-02 16:17:37 +01:00
Brian Gough
1592ca7623
Merge pull request #309 from sharelatex/fix-compile-check
...
clean up compile check
2016-08-31 16:27:36 +01:00
Brian Gough
e82411ac79
clear serverid on every compile check
2016-08-31 16:10:24 +01:00
Shane Kilkelly
47b1a5099a
Better logging when plan is null.
2016-08-31 10:40:30 +01:00
Shane Kilkelly
f59d5d836d
Check plan, return error if not valid.
...
This prevents a crash later when we refer to properties
of the plan object, which can end up being `null` when
the `planCode` is either missing, or not a valid code.
2016-08-31 10:18:53 +01:00
Shane Kilkelly
1b29e0e8ec
Merge branch 'master' of github.com:sharelatex/web-sharelatex
...
# Conflicts:
# app/coffee/Features/Notifications/NotificationsBuilder.coffee
2016-08-31 09:48:19 +01:00
Henry Oswald
960ed520b6
fix notifications builder @key bug
2016-08-31 09:42:43 +01:00
Shane Kilkelly
1399ee4689
Fix reference to @key
in log expression.
2016-08-31 09:34:20 +01:00
Brian Gough
c44f33ce99
allow negative values for synctex positions
2016-08-30 16:45:21 +01:00
Shane Kilkelly
4a76fcd13b
Change first param of getMemberSubscriptions
to user_or_id
, to match semantics of usage.
...
This function works whether a user object, or an ObjectId is passed, but the `user_id`
param name is confusing.
2016-08-30 14:26:57 +01:00
Henry Oswald
ddc0023c64
make forceCreate the default for creating notifications
2016-08-30 13:07:37 +01:00
Henry Oswald
26a4076c22
add redirect to /i/university for ab test
2016-08-25 10:48:29 +01:00
Henry Oswald
114dbf9f3f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-08-23 15:34:55 +01:00
James Allen
bcc8bfbe6c
Redirect to working update billing details end point that shows a nice message
2016-08-22 17:36:33 +01:00
Shane Kilkelly
11ec486c13
Merge pull request #300 from sharelatex/pr-subscription-improvements
...
Pr subscription improvements
2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1
Add debug query string origin
to invocations of the updateSubscription endpoint.
2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6
track when users accept invites
2016-08-19 18:33:03 +01:00
Shane Kilkelly
c02854c9d8
Improve log messages
2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64
Add an expect404
option to apiRequest.
...
Suppress error generation when 404 response is encountered.
2016-08-19 11:52:04 +01:00
James Allen
c653f59705
Add error handling to mkdir_p
2016-08-18 17:48:33 +01:00
Shane Kilkelly
4a6df04c21
Merge branch 'master' into pr-subscription-improvements
2016-08-18 12:53:56 +01:00
Shane Kilkelly
ece0491e3d
Refactor. Handle republishing of notifications on resend.
2016-08-17 16:27:15 +01:00
Shane Kilkelly
85f49d6c9c
Make whole 'red button' in email a link
2016-08-17 10:37:44 +01:00
Shane Kilkelly
4805c96584
Merge branch 'master' into pr-email-tokens
2016-08-17 08:52:24 +01:00
Shane Kilkelly
fc068b62a2
defend against undefined plan_code
2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716
Improve error handling
2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3
Add counts to log message
2016-08-16 11:33:14 +01:00