Henry Oswald
706c1824f0
changed package.json to use our fairy fork
2015-06-18 15:43:42 +01:00
James Allen
559e26145b
Run module unit tests with main tests
2015-06-16 10:54:15 +01:00
James Allen
30eb79dfdc
Add link to DataJoy that shows randomly 50% of the time
2015-06-09 15:36:16 +01:00
James Allen
0eec715bb5
Upgrade to Angular 1.3.15 and latest ui-bootstrap
2015-06-09 14:59:12 +01:00
Henry Oswald
fc72ca601e
update package.json
2015-06-09 10:19:24 +01:00
Henry Oswald
eeead86fba
updated mongoose
2015-06-02 16:24:40 +01:00
Henry Oswald
aaa902cca9
fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page
2015-06-01 14:38:09 +01:00
Henry Oswald
33aa5c732f
if a domain licence link has expired render a nice message explaining they need to retry
2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74
changed email expire to 1 day for verifying account
2015-06-01 12:22:46 +01:00
Henry Oswald
6727c3ee00
changed ShareLaTeX thoughts to go into type form
2015-05-29 16:27:35 +01:00
Henry Oswald
7b898837fd
Merge pull request #189 from sharelatex/heukirne-user-csv
...
Heukirne user csv
2015-05-29 12:19:38 +01:00
Henry Oswald
d3f6c0c614
Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv
2015-05-29 12:17:54 +01:00
Henry Oswald
e4011b9ba1
Merge branch 'emailverification'
2015-05-29 12:10:02 +01:00
Henry Oswald
702fdc1480
improved views for domain licence invites
2015-05-29 12:09:28 +01:00
Henrique Dias
f709ddf3eb
add csv export unit tests
2015-05-28 17:22:49 -03:00
Henrique Dias
f50eb0398f
add export csv group feature
2015-05-28 16:54:41 -03:00
Henry Oswald
43c4531e51
kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere
2015-05-28 13:02:08 +01:00
Henry Oswald
e454d2f059
don't allow renaming in client if user is not owner
2015-05-28 12:59:02 +01:00
Henry Oswald
ca28d8ee70
changed views to use translations
2015-05-27 22:15:46 +01:00
Henry Oswald
b657c5207e
cleaned up the views a bit
2015-05-27 21:45:29 +01:00
Henry Oswald
22b94e9246
renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler
2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f
added tests around new endpoints for joining groups
2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1
pull logic checking if user is already part of a group out of controller into handler
2015-05-27 16:33:47 +01:00
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