Henry Oswald
72e528e9d1
if you are alread in the group show the custom group page
2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d
if a user is elelable to be part of a group subscription and they go to
...
/user/subscription it should redirect them to the group subscription invite
2015-05-27 15:35:31 +01:00
Henry Oswald
1d21bddcf5
fix Onetime token handler path
2015-05-27 15:06:36 +01:00
Brian Gough
cdbd7af500
Merge branch 'fix-leak-in-smoke-tests'
2015-05-26 16:33:51 +01:00
Brian Gough
a5d14f4ffb
handle unexplained case where smokeTestModule is undefined
2015-05-26 16:33:02 +01:00
Henry Oswald
481bd67fbd
changed paths to use hyphens and add succesfull join page
2015-05-26 15:26:45 +01:00
Henry Oswald
94b26e71a4
ignore test script
2015-05-26 15:25:24 +01:00
Henry Oswald
841231dbf8
make PasswordResetTokenHandler generic so it can be used for invites
2015-05-26 15:24:09 +01:00
Henry Oswald
a715d60e1c
Merge pull request #184 from sharelatex/fix-leak-in-smoke-tests
...
port leak fixes from smoke-test-sharelatex module
2015-05-26 11:07:51 +01:00
Brian Gough
e51cdb81bd
port leak fixes from smoke-test-sharelatex module
2015-05-26 10:54:55 +01:00
Henry Oswald
12bf268978
Merge branch 'master' into emailverification
2015-05-25 11:51:46 +01:00
Henry Oswald
d774ca7e0a
added sigma-master
2015-05-25 11:37:53 +01:00
Henry Oswald
cad8d8a23b
v1 basic invite works, not pretty or tested
2015-05-22 13:57:15 +01:00
Brian Gough
cc9c8fdc94
freeze Date in Recurly tests before all calls
...
beforeEach freezes and resets for each subtest, which does not give
the desired result as the time increases between each subtest, we want
to freeze once at the beginning and reset at the end using before/after.
2015-05-19 15:00:30 +01:00
Henry Oswald
f5c39efcac
patched xss hole with messages not setting the content type correctly
2015-05-19 11:04:52 +01:00
Henry Oswald
47d4ed9631
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-05-18 16:10:07 +01:00
Henry Oswald
2bc39ddf0b
added sigma.js lib used for module spike
2015-05-18 16:09:47 +01:00
Brian Gough
3051d7dab6
modify LockManager test to avoid dependence on timing
2015-05-18 09:14:28 +01:00
James Allen
844b75cd21
Merge pull request #181 from dpasqualin/master
...
Update bcrypt to 0.8.3
2015-05-15 10:53:58 +01:00
Diego Giovane Pasqualin
7c6ed0ff77
Update bcrypt to 0.8.3
...
This new version compiles successfully on nodejs newer than 0.10.
2015-05-11 16:43:29 -03:00
Brian Gough
1bb7ae3996
always remove the spinner, even if it is not spinning
2015-05-11 14:12:24 +01:00
Brian Gough
92836f49fc
avoid unnecessary spell checks on session change
2015-05-11 10:07:11 +01:00
Henry Oswald
8fc41e9e05
added templateLinks property to example config for ShareLaTeX server pro
2015-05-10 13:10:03 +01:00
Brian Gough
3ad517e1c2
Merge pull request #177 from sharelatex/fix-ace-extension-errors
...
prevent loading error for ace language tools extension in development
2015-05-05 14:47:44 +01:00
Brian Gough
6014085e8e
prevent loading error for ace language tools extension in development
2015-05-05 14:33:18 +01:00
Henry Oswald
72af6748c9
Merge pull request #157 from oskanberg/patch-1
...
Rename 'javscript' to 'javascript'
2015-05-05 14:28:27 +01:00
Henry Oswald
bb071e99fa
make startup message consistent
2015-04-30 15:03:07 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +01:00
Henry Oswald
312c56a24e
allow password resets to be performed when site is not public by adding routes into white list
2015-04-30 11:58:26 +01:00
Henry Oswald
a7640b5bbd
changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist
2015-04-30 11:57:40 +01:00
Henry Oswald
635f79d2f6
added password strength check to change password
2015-04-28 18:30:19 +01:00
Henry Oswald
65b91930d1
field != feild
2015-04-28 17:50:06 +01:00
Henry Oswald
11a5c009a6
make default password rules very permisive
2015-04-28 17:42:30 +01:00
Henry Oswald
a1e24eb064
Merge branch 'passwordStrength'
2015-04-28 17:39:46 +01:00
Henry Oswald
cdbc239a62
config the password options via the settings
2015-04-28 17:39:35 +01:00
Henry Oswald
f385a7a4b5
open chat links in new window
2015-04-28 16:20:24 +01:00
Henry Oswald
fa4a51b5a3
email address is not allowed as part of password
2015-04-28 16:20:12 +01:00
Brian Gough
82c35d9b82
example of using controller to access other fields
2015-04-27 16:38:40 +01:00
Henry Oswald
639f73ea74
mvp for password validation
2015-04-27 14:42:32 +01:00
Henry Oswald
7d109ce77d
null check error in pdf view
2015-04-23 10:40:11 +01:00
Henry Oswald
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Henry Oswald
31a51b73d8
improved linkify so data is correctly sanitized, used inbuilt angular lib
...
don't know how I missed that last time!
2015-04-22 17:58:33 +01:00
Henry Oswald
7a46b98c82
fixed unit tests for deleting files sent from tpds
2015-04-22 15:08:29 +01:00
James Allen
6c585adb3c
Merge branch 'buffer_sharejs_ops'
2015-04-22 13:59:19 +01:00
Brian Gough
d0c759c6fb
always send the latest position when emitting updatePosition event
...
Avoid sending outdated position by capturing the current position in
$scope.currentPostion on every call and sending it the when the timer
for updatePosition runs.
2015-04-20 14:26:56 +01:00
James Allen
87d625b5e0
Delay flushes performed after getting an op acknowledgement as well
2015-04-17 17:32:23 +01:00
James Allen
8a32ca1b64
Reduce buffer delay to 1 second
2015-04-17 16:45:17 +01:00
James Allen
af85c83877
Buffer updates when only a single user is editing a document
...
Add in 5 second delay between flushing updates when only a single user
is editing a document. As soon as an update is received from another user
we switch to sending updates immediately again so there is no latency
between collaborators. The logic applies to individual docs, so two users
can be editing different docs and will still buffer updates since they
will not affect each other.
2015-04-17 11:24:28 +01:00
Henry Oswald
c583903e04
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-04-16 21:02:47 +01:00
Henry Oswald
dbd076849b
updated online user management to only send cursor position when people are collaborate
...
if someone is in the project with them cursor info is sent every 500ms, if they are
by themself it is sent every 5mins so they are still marked as online.
2015-04-16 21:01:03 +01:00
