Shane Kilkelly
a869c99c60
Begin testing UserSessionsManager
.
2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3
check sessions on login and logout.
2016-07-04 09:27:38 +01:00
Paulo Reis
11f198d970
Merge branch 'master' into sprites
2016-07-01 16:27:09 +01:00
Paulo Reis
64a73b0356
Disable default 4px margin on grunt-sprity, also add the built files.
2016-07-01 16:02:40 +01:00
Paulo Reis
4f49a25639
Use a figure element instead of an img, as there is no src attribute.
2016-07-01 16:02:01 +01:00
Shane Kilkelly
6f20f565fe
Add early-return guards
2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02
Add ip_address
and session_created
to the session user object.
2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7
Refactor method names in UserSessionsManager
2016-07-01 15:33:59 +01:00
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +01:00
Shane Kilkelly
6938f1d055
No need to build extra string
2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f
Clear out sessions
2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94
Fix logging.
2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1
set expiry on the user sessions set.
2016-07-01 11:24:46 +01:00
Shane Kilkelly
ab26edb44b
Adjust UserController unit tests
2016-07-01 10:20:22 +01:00
Shane Kilkelly
88bef5c5ea
Add revokeAllSessions
handler, when password is reset
2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255
Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers
...
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 15:16:28 +01:00
Brian Gough
73ad1fde5c
comment out disabling of per user compiles
2016-06-30 15:15:37 +01:00
Henry Oswald
7cb266d904
removed imagemin
2016-06-30 14:59:05 +01:00
Brian Gough
c04e00026b
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 14:43:03 +01:00
James Allen
882e28a811
Don't choke on null projects
2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314
Remove a user from being a collaborator when their account is deleted
2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed
Skip null user objects when getting collaborators
2016-06-30 13:56:21 +01:00
Paulo Reis
d93c96d43c
Improve log hints ids.
2016-06-30 11:30:43 +01:00
Paulo Reis
c5f53ef431
Track log hints feedback.
2016-06-30 11:30:30 +01:00
Henry Oswald
05dedeebb8
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-29 15:36:53 +01:00
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5
save the session key string, rather than just the id
2016-06-29 15:12:12 +01:00
Paulo Reis
536c1ac65e
Merge branch 'pr-project-filepath-regex'
2016-06-29 14:19:37 +01:00
Paulo Reis
36e09e3b0c
Make the user id portion of the path optional.
2016-06-29 14:19:16 +01:00
Brian Gough
16b58a9420
Merge pull request #268 from sharelatex/per-user-containers-part-3
...
add support for on-demand viewing of pdfs for per-user compiles
2016-06-29 14:16:24 +01:00
Shane Kilkelly
db213c0621
Begin keeping record of user sessions in reds.
2016-06-29 11:35:25 +01:00
Paulo Reis
d037cb93a9
Wiki styles clean-up.
2016-06-29 10:42:51 +01:00
Paulo Reis
5ad0c06770
Regex now matches new folder nomenclature.
2016-06-28 17:19:02 +01:00
Henry Oswald
8f14526354
added custom footer in email option
2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884
hook notifications handler up to make request which doesn't make request if url not set
2016-06-28 16:52:27 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126
Dynamically determine if the files dropdown should drop up or drop down.
2016-06-28 15:48:11 +01:00
Shane Kilkelly
9e16f250f9
Merge branch 'sk-subscription-address'
2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf
set postal_code as zip
2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe
Test the createSubscription action (+4 squashed commits)
...
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
2016-06-28 13:59:52 +01:00
Paulo Reis
4263d3f8c6
Merge branch 'master' into pr-overflowing-images-wiki
2016-06-28 11:58:58 +01:00
Paulo Reis
86a8a180a8
Merge branch 'master' into pr-toggle-comment-keybinding-windows
2016-06-28 11:37:46 +01:00
Brian Gough
e0d262a6d8
fix shrinkwrap file
2016-06-28 11:18:20 +01:00
Paulo Reis
616fd5daf6
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619
Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds
...
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-28 10:49:33 +01:00
Brian Gough
afc89d8d27
added missing package grunt-execute
2016-06-28 10:42:36 +01:00
Brian Gough
6e187e3996
added npm shrinkwrap file
2016-06-28 10:42:36 +01:00
James Allen
883a9b512a
Merge pull request #265 from MCribbin/patch-1
...
Update HumanReadableLogsRules.coffee
2016-06-28 10:33:24 +01:00
Shane Kilkelly
e194de50cf
test _paypal.checAccountExists
.
2016-06-28 10:17:06 +01:00