Shane Kilkelly
1a4ffe7708
Remove un-necessary call to getProject
from archiveProject
path
2017-10-09 11:30:55 +01:00
Shane Kilkelly
29a584996f
Flesh out acceptance tests for token access
2017-10-06 16:26:47 +01:00
Shane Kilkelly
b5bed1837e
Start acceptance tests for token-based access
2017-10-06 15:58:03 +01:00
Shane Kilkelly
91abb6eed6
If project is not tokenBased, don't count members of token arrays
2017-10-06 15:57:22 +01:00
James Allen
9c1faa4395
Add method to transfer projects from one user_id to another
2017-10-05 14:26:34 +01:00
Shane Kilkelly
b8d90a1a99
Show token-access projects on the dashboard
2017-10-05 13:20:06 +01:00
Shane Kilkelly
6482cd7dd8
Generate tokens on old projects if they're not present
2017-10-04 16:31:24 +01:00
Shane Kilkelly
7b33f8b4c2
Unit test TokenAccessController
2017-10-03 14:04:59 +01:00
Shane Kilkelly
ede497f4b3
Unit test TokenAccessHandler
2017-10-03 10:02:26 +01:00
Brian Gough
e9114551ba
add unit test for precompile resources check
2017-10-02 10:14:05 +01:00
Hayden Faulds
bf1c24f6f9
return pathname from DocumentController.getDoc
2017-09-29 15:37:10 +01:00
Shane Kilkelly
574b115022
Working token-based access
2017-09-27 14:01:52 +01:00
James Allen
63097aaf73
Merge pull request #24 from sharelatex/ja-dockerize-acceptance-tests
...
Set up acceptance tests to run in docker container; Fixes overleaf/sharelatex#138
2017-09-27 11:01:49 +02:00
James Allen
23bd840796
Fix MockDocStoreApi name
2017-09-27 10:53:00 +02:00
James Allen
1502da85cf
Set up acceptance tests to run in docker container
2017-09-27 10:37:20 +02:00
Hayden Faulds
4adf88ca01
handle OL or SL ids in UserInfoController.getPersonalInfo
2017-09-26 11:40:05 +01:00
Hayden Faulds
2c0e9bb89a
return overleaf details from ProejctsDetailsHandler.getdetails
2017-09-26 10:19:30 +01:00
Shane Kilkelly
ee32648bf4
Order privileges by highest-to-lowest
2017-09-22 15:55:38 +01:00
Shane Kilkelly
562b2db600
Fix unit test
2017-09-21 15:01:40 +01:00
Shane Kilkelly
7dc759482c
Fix how adding user to project works in acceptance tests
2017-09-21 11:43:16 +01:00
Shane Kilkelly
931ba56e33
Add an 'owner' source tag, for the project owner
2017-09-21 09:35:25 +01:00
Shane Kilkelly
ef7e1ceabf
Rename functions to make distinction between invited/token members
2017-09-21 09:30:38 +01:00
Shane Kilkelly
91ec0da239
Use the invitedMembers function for sending tpds updates
2017-09-20 15:48:20 +01:00
Shane Kilkelly
574baf386e
Alter getProjectsUserIsMemberOf
to include token-access projects.
...
Also change the api to produce an object with the different project lists
attached, rather than a pair of lists.
2017-09-20 15:26:03 +01:00
Shane Kilkelly
ceb7c509d0
Rename getProjectsUserIsCollaboratorOf
to ...IsMemberOf
...
This brings the naming more in line with current conventions.
2017-09-20 13:16:50 +01:00
Shane Kilkelly
069f49d5a6
Change getCollaboratorCount
to getInvitedCollaboratorCount
.
...
And update the one call-site in LimitationsManager. This function
is used to limit invites, so it makes sense to explicitely limit
this to Invited members of the project.
2017-09-20 10:29:47 +01:00
Shane Kilkelly
8460160076
Add a getInvitedMembersWithPrivilegeLevels
function.
...
Then use it to build the loadProject view-model.
2017-09-20 10:02:43 +01:00
Shane Kilkelly
cf54989e6a
Add a getInvitedMemberIds
function
...
Limited to only members who were invited to the project, not users
who have access via a token.
2017-09-20 09:36:56 +01:00
Shane Kilkelly
06966f67db
Differentiate project members by source, include token members
2017-09-20 09:35:19 +01:00
Shane Kilkelly
a06f4b6b28
Remove remaining traces of UserStub
2017-09-19 16:16:39 +01:00
Shane Kilkelly
7919d5342b
Remove obsolete add-email-to-project workflow
2017-09-19 15:57:19 +01:00
Henry Oswald
a7217f1d37
Merge branch 'ho-csrf-acceptence-tests'
2017-09-15 13:50:17 +01:00
Brian Gough
1bca1e11a9
fix broken unit test
2017-09-15 09:20:53 +01:00
Brian Gough
9f9c15f6f5
Merge pull request #599 from sharelatex/bg-reset-project-state
...
clear docupdater project state in deleteAuxFiles
2017-09-15 09:09:29 +01:00
Brian Gough
28a80cf23d
Merge pull request #604 from sharelatex/bg-fix-root-doc-in-incremental-compile
...
fix root doc in incremental compile
2017-09-13 13:47:22 +01:00
Tim Alby
a04adbf132
remove extra security headers
2017-09-13 11:53:11 +02:00
Brian Gough
51eb94a493
handle incremental compile without root doc
2017-09-13 10:10:44 +01:00
Tim Alby
d6834ff417
add security headers using Helmet
...
- use all Helmet's default headers except `X-DNS-Prefetch-Control`
- use `Referrer-Policy`
- use cache headers when:
- a user is logged in, OR
- a project is displayed
2017-09-12 11:17:59 +02:00
Brian Gough
2b4c8bd846
clear docupdater project state in deleteAuxFiles
2017-09-08 15:57:29 +01:00
Brian Gough
d9557fcbf5
include the options in the project state hash
2017-09-01 16:36:51 +01:00
Shane Kilkelly
7bb4638186
Restore user features to default after acceptance test.
...
Fixes an issue that could come up when running the tests
several times.
2017-09-01 14:45:54 +01:00
Shane Kilkelly
c170de7a4f
Add unit test to cover project features.
2017-09-01 13:28:11 +01:00
Henry Oswald
d4b0c740c2
added csrf acceptence tests
2017-08-29 17:45:16 +01:00
James Allen
9c4dc40abf
Merge pull request #583 from sharelatex/ja-import-projects
...
Add in UserStub model and support in collaborators view
2017-08-29 16:06:00 +02:00
Brian Gough
f9d1650c6a
Merge pull request #569 from sharelatex/bg-compile-from-redis
...
compile from redis
2017-08-25 09:09:52 +01:00
James Allen
d5839437fd
Add in UserStub model and support in collaborators view
2017-08-24 17:48:47 +02:00
Brian Gough
a569303b7e
simplify unusual unit test
2017-08-17 15:36:52 +01:00
Brian Gough
f4da089ee3
added unit tests for project state hash
2017-08-16 11:42:36 +01:00
Brian Gough
c91599bfeb
add unit test for incremental compile
2017-08-15 16:00:40 +01:00
Brian Gough
1179518f4e
unit test for sync conflict
2017-08-15 14:35:02 +01:00
Brian Gough
0347abb13a
added unit tests for ProjectEntityHandler
2017-08-14 15:40:46 +01:00
Brian Gough
f9617034be
add unit test for getProjectDocsIfMatch
2017-08-14 14:33:34 +01:00
Brian Gough
7eb1c01994
add metrics for incremental compiles
2017-08-09 11:41:09 +01:00
Brian Gough
836219584c
fix tests for beta users
2017-08-09 11:33:44 +01:00
Brian Gough
31e71854a4
fix unit tests
2017-08-08 11:38:31 +01:00
James Allen
0be1ee6b6c
Fix smoke test when product name changes
2017-08-08 12:31:36 +02:00
James Allen
3d9da02815
Merge pull request #555 from sharelatex/sk-password-policy
...
Enforce stricter password policy.
2017-08-03 10:35:00 +02:00
James Allen
10f362a77a
Add SubscriptionUpdater.deleteSubscription
2017-08-02 09:59:45 +02:00
Brian Gough
3e28eca26f
move docupdater flush to point of use
2017-07-28 15:11:07 +01:00
Shane Kilkelly
0f131d940d
Enforce stricter password policy.
...
- Check minimum password lengths
- Set default policy to 6-128 chars
2017-07-24 11:06:47 +01:00
Brian Gough
9417266966
fix health checks for web/web-api split
2017-07-04 10:32:31 +01:00
Henry Oswald
3da5ef818c
null check subscription for group admin panel
2017-06-22 14:07:07 +01:00
Shane Kilkelly
9607174b64
Merge branch 'master' into sk-server-side-labels-loading
2017-06-15 08:49:14 +01:00
Shane Kilkelly
b97becc7a2
Change getLabelsForDoc
to broadcastLabelsForDoc
2017-06-13 11:38:15 +01:00
Shane Kilkelly
a3dbb16e50
Flush project before getting all project labels
2017-06-13 11:15:26 +01:00
Shane Kilkelly
bd6133aadb
Remove callback-pattern from label parsers
2017-06-13 11:10:21 +01:00
Shane Kilkelly
26be4f84d0
Re-use parser
2017-06-12 15:15:14 +01:00
Shane Kilkelly
ff4991284d
Change docLabelsUpdated
socket event to broadcastDocLabels
2017-06-12 13:06:56 +01:00
Shane Kilkelly
9f9468d0e0
Use lowercase project_id
2017-06-12 11:37:05 +01:00
Shane Kilkelly
c9432a1238
Fix unit tests
2017-06-12 10:09:33 +01:00
James Allen
4cecbae6b6
Use an email based invite system for groups, not holding accounts
2017-06-08 12:12:08 +01:00
Shane Kilkelly
feb1d87de1
Add test for LablesHandler
2017-06-08 10:25:39 +01:00
Shane Kilkelly
3c4a6f06be
Add unit tests for LabelsController
2017-06-08 09:22:26 +01:00
James Allen
d7981fd2d4
Merge pull request #512 from sharelatex/ja-project-name-validation
...
Refactor project name validation into one place and restrict /s
2017-06-05 11:55:39 +01:00
James Allen
59085c1ddd
Add missing require stubs and remove console.logs in unit tests
2017-05-22 15:33:52 +01:00
James Allen
3105c6743e
Fix unit tests
2017-05-22 15:24:52 +01:00
James Allen
ba62206b91
Refactor project name validation into one place and restrict /s
2017-05-19 17:42:24 +01:00
James Allen
76b8fecde9
Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster
...
Don't try to set the server id if it isn't returned in the response
2017-05-19 15:00:18 +01:00
James Allen
01548a0216
Don't try to set the server id if it isn't returned in the response
2017-05-19 10:23:01 +01:00
Paulo Reis
b0b75e2ebb
Update docupdaterhandler tests.
2017-05-18 15:04:12 +01:00
James Allen
39ca6d1e6c
Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster
...
Check for blank string in clsi cookie caching
2017-05-18 11:12:11 +01:00
James Allen
f708a0cd81
Check for blank string in clsi cookie caching
...
ioredis returns "" for a blank entry, the previous driver returned null,
so also check for a blank string
2017-05-18 11:09:33 +01:00
Brian Gough
5237647b8b
Merge pull request #489 from sharelatex/bg-improve-upload-robustness
...
improve stream error handling on upload
2017-05-17 15:26:03 +01:00
Shane Kilkelly
6338835baf
Merge branch 'sk-sudo-mode'
2017-05-17 09:48:22 +01:00
Shane Kilkelly
4e3284cec8
Merge branch 'sk-dont-redirect-to-images'
2017-05-17 09:48:16 +01:00
Shane Kilkelly
25e0a19350
Make confirm-password routes more restful
2017-05-16 11:51:06 +01:00
Brian Gough
e23871118d
Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness
2017-05-15 16:01:01 +01:00
Shane Kilkelly
60d3e4a97b
If external auth system is in use, skip sudo-mode checks
2017-05-15 15:46:24 +01:00
James Allen
5aa8b71832
Allow writing of clsi cookie cache to redis cluster secondary
2017-05-15 15:35:01 +01:00
Brian Gough
0908e36fb7
fix unit tests
2017-05-15 13:46:01 +01:00
Shane Kilkelly
c864288c4e
On logout, clear sudo mode
2017-05-15 11:53:52 +01:00
Shane Kilkelly
0f75d9f4d9
Test SudoModeController
2017-05-15 10:56:43 +01:00
Shane Kilkelly
76285a1554
Start testing SudoModeController
2017-05-15 10:07:22 +01:00
Shane Kilkelly
8605dc83b4
Merge branch 'master' into sk-sudo-mode
2017-05-15 09:21:13 +01:00
Shane Kilkelly
0e26222551
Don't redirect to images, icons, etc, in login workflow
2017-05-12 15:46:16 +01:00
Shane Kilkelly
1640dfa79a
Merge branch 'sk-fix-cooldown-tpds'
2017-05-12 09:11:23 +01:00
James Allen
3bfd92dd9c
Rename lock to avoid potential conflict with doc updater
2017-05-11 15:27:01 +01:00
Shane Kilkelly
7b0aca7f02
add cooldown to tpds mergeUpdate
path
2017-05-11 11:29:57 +01:00
Shane Kilkelly
e6286c721d
Merge branch 'master' into sk-fix-large-projects
2017-05-11 08:40:17 +01:00
Shane Kilkelly
08567ff220
if projectId is not defined, error out
2017-05-10 15:25:23 +01:00
Shane Kilkelly
27842996aa
start testing SudoModoController
2017-05-10 15:15:57 +01:00
Shane Kilkelly
4d662f23de
test SudoModeMiddlewear
2017-05-10 14:54:49 +01:00
James Allen
274d6f4ac6
Merge pull request #493 from sharelatex/ja-redis-cluster-refactor
...
Move all redis end points to be cluster compatible
2017-05-10 14:38:37 +01:00
Shane Kilkelly
b09a41c557
Fix acceptance tests
2017-05-10 13:45:53 +01:00
Shane Kilkelly
993c261b10
start testing sudo-mode
2017-05-10 11:37:32 +01:00
Shane Kilkelly
149e38855f
Add a cooldown mechanism for projects which go over limits
2017-05-09 11:40:42 +01:00
James Allen
8449b0417c
Move all redis end points to be cluster compatible
2017-05-04 15:22:54 +01:00
Brian Gough
46f693519a
return 404 for api request on missing doc
2017-04-27 16:41:53 +01:00
Shane Kilkelly
a9b8b864df
Move content-disposition setting into a method on res
2017-04-12 16:00:02 +01:00
Shane Kilkelly
02d75deaa0
when setting content-disposition, uri-encode names
2017-04-12 09:31:59 +01:00
Shane Kilkelly
bb65da88fe
Merge branch 'master' into node-6.9
2017-04-05 10:15:51 +01:00
Shane Kilkelly
043520fc28
Remove the Metrics module, use metrics-sharelatex
2017-04-03 16:18:30 +01:00
Shane Kilkelly
49de7bf315
mock out metrics in test
2017-03-31 14:54:20 +01:00
Shane Kilkelly
bee62400a6
Merge branch 'master' into sk-upgrade-metrics
2017-03-31 14:08:12 +01:00
James Allen
3bf19a38ee
Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation
...
Handle a 404 from Recurly if account doesn't exist
2017-03-28 16:06:25 +01:00
James Allen
08699d7aa2
Handle a 404 from Recurly if account doesn't exist
2017-03-28 15:46:58 +01:00
James Allen
f53234271f
Merge pull request #465 from sharelatex/sk-hide-email-errors
...
If sending email fails, return a generic error.
2017-03-28 13:16:43 +01:00
James Allen
2e6e51eb6d
Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation
...
Check Recurly for subscription as well before creating subscription
2017-03-28 13:15:58 +01:00
Brian Gough
835d8d618d
use error handler
2017-03-28 11:33:37 +01:00
Brian Gough
f433510e61
return NotFound error in ProjectDetailsHandler
2017-03-28 10:12:52 +01:00
Brian Gough
4e66b045e3
fix unhandled exception in ProjectDetailsHandler
2017-03-28 09:44:50 +01:00
Shane Kilkelly
d2e1efe4a9
fix a daft mistake
2017-03-27 17:45:19 +01:00
Shane Kilkelly
69b9b308d4
If sending email fails, return a generic error.
...
This prevents us from leaking juicy details of our aws/ses setup via the
password-reset form.
2017-03-27 16:17:38 +01:00
James Allen
7aa4c0c030
Check Recurly for subscription as well before creating subscription
2017-03-27 12:07:43 +01:00
Henry Oswald
e22da8e530
rename unit test
2017-03-27 09:57:15 +01:00
Henry Oswald
9c7465fd64
Merge pull request #461 from sharelatex/ho-annom-user-events
...
add identify on login
2017-03-27 09:28:34 +01:00
Henry Oswald
379efcb04a
Merge branch 'master' into ho-annom-user-events
2017-03-27 09:28:03 +01:00
Henry Oswald
cff922a0f5
idendify -> identify
2017-03-22 16:01:26 +00:00
Henry Oswald
ebdce6169e
idendifyUser on login
2017-03-22 15:50:49 +00:00
Henry Oswald
f910bb58de
add tests for AnalyticsController
2017-03-22 13:11:45 +00:00
Shane Kilkelly
a64f890ed0
Upgrade metrics api
2017-03-17 14:55:41 +00:00
Henry Oswald
625fa810c2
validate mongo id in getPrivilegeLevelForProject
...
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/
2017-03-17 14:44:51 +00:00
Henry Oswald
8ee2e5ba63
null check folder in findElement
...
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/
2017-03-17 13:29:20 +00:00
Henry Oswald
e5468983ce
clone project plow though null doc/file/folders
...
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/
2017-03-17 13:21:30 +00:00
Henry Oswald
d453a4d5c7
null check stat when we check file on disk
...
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/
2017-03-17 13:03:16 +00:00
Shane Kilkelly
5e112043ca
Fix unit tests for modules now using metrics.timeAsyncMethod
2017-03-16 11:08:17 +00:00
Shane Kilkelly
1ce48e971a
Merge branch 'sk-fix-file-upload'
2017-03-10 11:30:03 +00:00
Shane Kilkelly
ec25ee9045
When upload to filestore fails, produce an error
2017-03-09 10:11:45 +00:00
James Allen
b75d0ab3eb
Don't show onboarding for newly registered users
2017-03-09 09:13:49 +00:00
James Allen
2b36a443c9
Pull track changes backend into a module
2017-03-02 16:45:24 +00:00
Shane Kilkelly
9a641d43eb
Remove cruft
2017-02-27 14:00:45 +00:00
Shane Kilkelly
98d7dc6f88
Make work on both 0.10 and 6.9
2017-02-27 13:54:57 +00:00
James Allen
c8096facfb
Merge pull request #421 from sharelatex/ho-announcments
...
mark announcments before user signs up as read
2017-02-14 15:12:10 +01:00
Henry Oswald
27caf4d555
mark announcments before user signs up as read
2017-02-14 12:29:48 +00:00
James Allen
03ecf4b4ae
Only show track changes onboarding once based on analytics API events
2017-02-14 10:25:46 +01:00
Shane Kilkelly
7d5dc34b3e
fix the set-password form for new (admin-created) users
2017-02-06 14:58:54 +00:00
James Allen
b086d7afa2
Refactor rate limiting code around sending invites
2017-01-27 16:26:58 +01:00
James Allen
757c7002eb
Merge pull request #397 from sharelatex/ja-modify-threads
...
Allow editing/deleting of comments and threads
2017-01-25 15:50:00 +01:00
Shane Kilkelly
239164fe26
Merge branch 'master' into sk-rate-limit-cluster
2017-01-25 09:56:08 +00:00
Henry Oswald
cc717f0357
domainAnnouncementsToShow -> domainAnnouncements
2017-01-25 09:44:13 +00:00
Henry Oswald
02e6eb4dd1
Merge pull request #399 from sharelatex/ho-promote-case-study
...
promote domain alerts
2017-01-25 09:41:50 +00:00
Henry Oswald
1280a2313d
add check for id to exist in domain announcments
...
null check user at start of getUnreadAnnouncements
fix spelling mistake
2017-01-25 09:35:11 +00:00
Henry Oswald
13d21b881f
use new annoncments feature for case study info
2017-01-24 16:03:05 +00:00
James Allen
f9ba7392e9
Allow editing/deleting of comments and threads
2017-01-24 16:21:14 +01:00
Shane Kilkelly
a148eb1f43
Merge branch 'master' into sk-rate-limit-cluster
2017-01-24 09:24:47 +00:00
Henry Oswald
6d35585847
limit number of invites each user can do
...
done with the number of collaborators a user can add
prevents notifications getting filled up as well
2017-01-21 12:43:15 +00:00
James Allen
3413687833
Merge pull request #393 from sharelatex/ja-track-changes
...
Ja track changes
2017-01-18 15:32:16 +01:00
Shane Kilkelly
1137ab0715
Don't record redirect to static asset paths
2017-01-17 14:35:37 +00:00
James Allen
9c0bf885be
Merge branch 'master' into ja-track-changes
2017-01-17 10:16:41 +01:00
Shane Kilkelly
82ddeab2bd
If user tries to invite themselves to project, don't.
2017-01-16 13:45:01 +00:00
Shane Kilkelly
635b935acc
Add an acceptance test for login rate limits, cleanup
2017-01-16 11:46:59 +00:00
Henry Oswald
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +00:00
Shane Kilkelly
25956d4c62
Fix up tests
2017-01-13 16:04:26 +00:00
Shane Kilkelly
525e871d55
Merge branch 'master' into sk-rate-limit-cluster
2017-01-13 14:17:18 +00:00
James Allen
aab4dea8ae
Merge branch 'master' into ja-track-changes
2017-01-13 13:46:01 +01:00
Shane Kilkelly
f5ced03074
Set redirect when sending user to login
page.
...
Allows smart redirecting to work when public access is turned off.
2017-01-10 15:42:36 +00:00
James Allen
d03aa7056e
Rename /ranges/users end point to /changes/users
2017-01-10 13:43:53 +01:00
James Allen
4e128b6ab7
Send user data in /threads dat
2017-01-09 17:25:06 +01:00
James Allen
9379cff89d
Add end point for accepting change in doc updater
2017-01-09 15:25:27 +01:00
James Allen
3a5d45fa32
Get user info via web, not chat
2017-01-06 13:41:58 +01:00
Shane Kilkelly
259c589076
Add option to restrict invites to existing user accounts.
2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883
Add unit tests for RedisWrapper
2016-12-19 15:12:22 +00:00
Shane Kilkelly
d428f9adbc
Make LoginRateLimiter
a thin wrapper around RateLimiter
2016-12-19 14:10:51 +00:00
Shane Kilkelly
ef0a5801d5
Create a RedisWrapper, and use it for rate limiting.
2016-12-19 12:17:02 +00:00
James Allen
988005e929
Send and get comments via the chat api
2016-12-16 16:42:41 +00:00
James Allen
293ba1fc4c
Fetch all ranges from docstore when viewing overview panel
2016-12-09 15:43:08 +00:00
James Allen
1830d41eba
Proxy ranges between doc updater and docstore
2016-12-08 14:09:06 +00:00
Henry Oswald
e6eeb86046
add read property to announcments
2016-12-07 11:39:22 +00:00
Shane Kilkelly
58280bf6ee
Merge branch 'master' into sk-user-delete-with-cancelled-sub
2016-12-06 09:31:42 +00:00
James Allen
48cc5a992f
Merge branch 'master' into ja-set-version-in-docstore
2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd
Deleting user: if subscription is already cancelled, ignore and proceed.
2016-11-30 16:03:18 +00:00
James Allen
eb648b9bc8
Proxy version number to and from docstore
2016-11-29 17:16:56 +00:00
Shane Kilkelly
a03ac8fe72
More robust session destruction after deleting user account.
2016-11-28 12:37:53 +00:00
Shane Kilkelly
52462d7020
Merge branch 'sk-sync-details-from-sso'
2016-11-28 10:11:59 +00:00
Shane Kilkelly
2ab5ad4230
If we're updating details from a SSO source, don't allow editing on settings page.
2016-11-25 14:38:00 +00:00
Shane Kilkelly
22101d0305
If user is sent to login page with explicit redirect, obey
2016-11-24 11:38:13 +00:00
Shane Kilkelly
8a4352fff2
Set redirect when redirecting from restricted
2016-11-22 16:54:03 +00:00
Shane Kilkelly
8089bb55a4
use session for the post-login redirect, remove redir
query string.
2016-11-22 14:24:36 +00:00
Shane Kilkelly
da1be67aff
Merge branch 'sk-ext-auth-show-email'
2016-11-18 09:34:05 +00:00
Shane Kilkelly
6606375cd7
Remove dead code: SessionInvalidator
2016-11-17 15:27:58 +00:00
Shane Kilkelly
3b8fbe8249
If using external auth, show non-editable email field.
...
Also defend server-side against setting email when using external auth.
2016-11-17 14:34:02 +00:00
Henry Oswald
d87067bc2f
Merge branch 'announcments'
2016-11-15 10:38:01 +00:00
Shane Kilkelly
b212c00311
Fix acceptance tests, use the correct method of getting redis key.
2016-11-14 16:33:54 +00:00
Henry Oswald
5a13ee1077
use anlaytis api
...
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
2016-11-11 17:03:09 +00:00
James Allen
593e59450b
Use different UserSessions keys for cluster vs normal redis session store
2016-11-10 14:31:48 +00:00
Shane Kilkelly
5f3098df38
Replace multi-ops with Async.series, tests passing
2016-11-09 11:03:03 +00:00
Shane Kilkelly
a373868862
Fix unit tests
2016-11-08 16:00:18 +00:00
Shane Kilkelly
e7b09a81a7
Merge branch 'sk-passport-ldap'
2016-11-02 15:39:32 +00:00
Paulo Reis
c5e793125e
Update unit tests.
2016-11-01 16:55:26 +00:00
Shane Kilkelly
9cb3d8c4b8
Enable hook from module into passport init.
2016-11-01 14:06:54 +00:00
Shane Kilkelly
5c8cdd22cc
Merge branch 'sk-account-delete-pass'
2016-10-28 11:02:41 +01:00
Shane Kilkelly
4c092e7ff1
Remove deprecated "projectSharedWithYou" email.
2016-10-28 10:37:10 +01:00
Shane Kilkelly
751a116921
add plainTextTemplate to all emails
2016-10-27 14:41:13 +01:00
Shane Kilkelly
dc62b1a86e
Remove deprecated endpoint for old delete-user
2016-10-26 11:18:36 +01:00
Shane Kilkelly
a4167fcccd
Unit tests for tryDeleteUser
2016-10-26 11:01:35 +01:00
Shane Kilkelly
6069d4dba3
Merge branch 'master' into sk-plans-tidy
2016-10-25 13:14:44 +01:00
Henry Oswald
1c3edcd627
added some debug lines
2016-10-24 23:36:49 +01:00
Henry Oswald
91e9447fe5
added logging to smoke test
2016-10-21 19:20:21 +01:00
Shane Kilkelly
d5a7514923
Add AB test for plans (+15 squashed commits)
...
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
2016-10-21 16:17:37 +01:00
Henry Oswald
adc6b429e6
record when a subscription is canceled
2016-10-10 15:29:54 +01:00
Shane Kilkelly
0f65e98566
add acceptance test for clearing sessions
2016-10-10 10:55:45 +01:00
Shane Kilkelly
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
Shane Kilkelly
95a66bbf00
Merge pull request #328 from sharelatex/sk-plain-text-email
...
Sk plain text email
2016-10-05 10:04:08 +01:00
Henry Oswald
3141f91b59
Merge pull request #322 from sharelatex/ho-password-limits
...
Ho password limits
2016-10-05 10:03:54 +01:00
Shane Kilkelly
e699fcb1fa
Add plain-text component to the project-invite email
2016-10-03 15:25:38 +01:00
Shane Kilkelly
b497182557
Add an acceptance test for registration and login
2016-09-27 11:55:51 +01:00
Shane Kilkelly
dd14e51713
Handle null, undefined and false in isUserLoggedIn
2016-09-23 16:53:07 +01:00
Henry Oswald
8a2b7d0461
server side protect passwords which are too long
2016-09-23 16:51:46 +01:00
Shane Kilkelly
6e8185aeaf
Merge branch 'master' into sk-passport
2016-09-23 10:28:35 +01:00
Shane Kilkelly
6c716ca252
Fix acceptance tests by updating invite-accept url
2016-09-23 10:28:17 +01:00
Shane Kilkelly
72ca1d6316
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00
James Allen
e15976be21
Use token in URL to force its precense when invite and allow easy dynamic notifications
2016-09-22 17:24:06 +01:00
Shane Kilkelly
dbac4bd008
update session when user settings change
2016-09-22 16:58:25 +01:00
Shane Kilkelly
7e449c60ed
fix tests
2016-09-22 16:04:42 +01:00
Shane Kilkelly
ff1c72ee14
Fix up more session access
2016-09-22 14:30:34 +01:00
Shane Kilkelly
7f24dd6f55
Fix tests for UserInfoController.
2016-09-22 13:37:27 +01:00
Shane Kilkelly
a3ace1fccd
Increase timeout because slow tests
2016-09-22 11:33: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
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
2119dcbb58
Finalise login workflow, works with login form again.
2016-09-15 14:36:11 +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
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
Henry Oswald
ddc0023c64
make forceCreate the default for creating notifications
2016-08-30 13:07:37 +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
Henry Oswald
130fece0f6
track when users accept invites
2016-08-19 18:33:03 +01:00
Shane Kilkelly
a904427531
Fix broken test
2016-08-19 11:57:44 +01:00
Shane Kilkelly
ece0491e3d
Refactor. Handle republishing of notifications on resend.
2016-08-17 16:27:15 +01:00
Shane Kilkelly
da40f54d55
Improve logging, add acceptance tests for joinProject json
2016-08-16 11:17:45 +01:00
Shane Kilkelly
158afbb157
Merge branch 'master' into pr-email-tokens
...
Conflicts:
app/coffee/Features/Notifications/NotificationsBuilder.coffee
public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Shane Kilkelly
f92767f7b5
Address feedback, add ?
checks where appropriate
2016-08-12 15:26:20 +01:00
Shane Kilkelly
e53394919f
Rework how invite expiry functions.
2016-08-12 14:40:59 +01:00
Shane Kilkelly
a7bc8bffe0
Update markAsReadByKeyOnly
url.
2016-08-12 09:59:25 +01:00
Shane Kilkelly
276241495b
Fix tests
2016-08-11 14:23:25 +01:00
Shane Kilkelly
ce039f8cd3
Remove the email when user id is added to project
2016-08-11 14:17:01 +01:00
Paulo Reis
228de5332e
Unit test tracking code.
2016-08-11 14:09:57 +01:00
Shane Kilkelly
826295167f
Mark Notification as read by key alone
2016-08-11 14:04:11 +01:00
Shane Kilkelly
3cec6affab
Test creating two invites at once
2016-08-10 15:24:09 +01:00
Shane Kilkelly
5351e79c7a
Test creating, listing and revoking invites as owner
2016-08-10 14:39:27 +01:00
Brian Gough
abcfb2dd16
Merge pull request #290 from sharelatex/enable-chktex
...
Enable chktex
2016-08-10 11:49:31 +01:00
Shane Kilkelly
0e0ccb41ff
cancel notification when accepting invite
2016-08-08 13:57:33 +01:00
Shane Kilkelly
110082390e
Test the _trySendInviteNotfification helper
2016-08-08 10:34:54 +01:00
Shane Kilkelly
eafd61a90e
Refresh members and invites in client when status changes
2016-08-05 14:01:08 +01:00
Shane Kilkelly
8f7603c324
Add an endpoint to access project members
2016-08-04 16:47:48 +01:00
Shane Kilkelly
a5ddcc3df7
Allow resending of invites
2016-08-03 15:42:19 +01:00
Shane Kilkelly
6ea690225f
Refactor view-invite to not use model calls.
2016-08-03 10:23:34 +01:00
Shane Kilkelly
5f8952450e
Test getInviteCount
2016-08-02 16:08:05 +01:00
Shane Kilkelly
3a3688d3d0
Include invites count in canAddXCollaborators
2016-08-02 15:42:50 +01:00
Henry Oswald
2ad0bab976
use underscore.each so it doesn’t blow up on non array.
2016-08-02 15:33:41 +01:00
Shane Kilkelly
abbd059eae
Refactor to existing addUserIdToProject
function
2016-08-02 13:51:00 +01:00
Shane Kilkelly
63f8fe453a
Use UserGetter rather than User model
2016-08-02 09:48:09 +01:00
Shane Kilkelly
dca1c9be5d
Load invites on project load, rather than asynchronously.
2016-08-01 17:05:37 +01:00
Shane Kilkelly
9787edd716
Add more assertions about project access
2016-08-01 15:55:56 +01:00
Shane Kilkelly
9e0ff3f628
test when the token is invalid
2016-08-01 15:21:06 +01:00
Shane Kilkelly
495bc1bcd3
Refactor
2016-08-01 15:16:10 +01:00
Shane Kilkelly
8af1a7b17a
Test login workflow
2016-08-01 15:16:03 +01:00
Shane Kilkelly
263822d665
Also parse out login url
2016-08-01 13:54:49 +01:00
Shane Kilkelly
5f1aa4cc58
test registration with invalid token
2016-08-01 13:30:43 +01:00
Shane Kilkelly
69bd954001
test the registration workflow
2016-08-01 12:14:34 +01:00
Shane Kilkelly
5159cdd0e9
Test when the user recieves second invite to project
2016-08-01 10:57:20 +01:00
Shane Kilkelly
545ce79c71
Test clicking the invite after already accepting
2016-08-01 10:14:08 +01:00
Shane Kilkelly
9c530e1bb6
rename test case
2016-08-01 10:04:42 +01:00
Shane Kilkelly
74c824edde
Test redirect to /register when user not logged in
2016-08-01 09:59:30 +01:00
Shane Kilkelly
7a8142a43c
remove extraneous body
parameter
2016-08-01 09:06:02 +01:00
Brian Gough
e99176c0d0
fix tests
2016-07-29 14:59:48 +01:00
Shane Kilkelly
39fc611964
Revoke invite after each test
2016-07-29 13:55:08 +01:00
Shane Kilkelly
e7c1f7f0fc
Refactor, deduplicate tests
2016-07-29 13:39:18 +01:00
Shane Kilkelly
f3a1f32bb1
Test the invalid-invite page
2016-07-29 11:54:08 +01:00
Shane Kilkelly
b33d4e103d
Test when the user does not accept the invite
2016-07-29 11:08:24 +01:00
Shane Kilkelly
f33d01f375
Test acceptance of invite
2016-07-29 11:04:07 +01:00
Shane Kilkelly
563247044b
Start testing the invite page
2016-07-29 09:52:55 +01:00
Shane Kilkelly
23c94c9599
get invite and link for test
2016-07-28 16:00:18 +01:00
Shane Kilkelly
7b18f88145
Merge branch 'master' into pr-email-tokens
2016-07-28 14:53:36 +01:00
Shane Kilkelly
748851b51e
start ProjectInvite acceptance test module
2016-07-28 14:53:22 +01:00
Shane Kilkelly
ed65e16e54
If user is member of project, redirect to project.
...
Leave invite in place to expire naturally.
2016-07-28 11:15:11 +01:00
Shane Kilkelly
62d544ccfc
Redirect to project if user is already member.
...
If invite is missing, and current user is already a member
of the project, then just redirect to the project page
2016-07-27 15:28:22 +01:00
Shane Kilkelly
e46901a21b
Send an empty keys array when there is no data
2016-07-26 14:23:00 +01:00
Shane Kilkelly
855cc28483
Finish adding project and owner details to the accept-invite page
2016-07-26 14:14:14 +01:00
Shane Kilkelly
367b138cae
fix failing tests
2016-07-26 12:09:58 +01:00
Shane Kilkelly
16dcbe2cd4
WIP: wire up share-modal frontend to invite system
2016-07-25 15:07:14 +01:00
Shane Kilkelly
73fed8b0bf
Add a getAllInvites
api endpoint
2016-07-25 11:17:47 +01:00
Shane Kilkelly
ccf684cf07
test acceptInvite
2016-07-25 10:19:20 +01:00
Shane Kilkelly
5438f39f9e
Start testing acceptInvite
2016-07-25 09:58:08 +01:00
Shane Kilkelly
78570817d5
Render a separate template if the invite is not found.
2016-07-22 16:28:00 +01:00
Shane Kilkelly
9e0c44573a
Remove expiresAt
, use mongo TTL instead.
2016-07-22 16:08:56 +01:00
Shane Kilkelly
b201f1a37a
Test getInviteByToken.
2016-07-22 14:21:34 +01:00
Shane Kilkelly
e34b124c73
Test revokeInvite
2016-07-22 13:33:21 +01:00
Shane Kilkelly
c9cfcddbe9
test error case for inviteToProject
2016-07-22 11:54:16 +01:00
Shane Kilkelly
f866bd03bc
Spy on the randomBytes function
2016-07-22 11:53:55 +01:00
Shane Kilkelly
9fba98cd45
Accept invite, and start testing the invite handler.
2016-07-22 11:38:00 +01:00
Shane Kilkelly
1139444790
add token to body of acceptInvite
action.
2016-07-22 09:27:00 +01:00
Shane Kilkelly
4db9d5a466
remove whatespace and comment
2016-07-21 13:34:20 +01:00
Shane Kilkelly
3311b43644
more tests for invite controller
2016-07-21 13:31:54 +01:00
Shane Kilkelly
23a9aadba5
start tests for invite controller
2016-07-21 10:08:22 +01:00
Shane Kilkelly
effc3727be
Don’t show upgrade prompts for users with custom subscription accounts.
...
Set `hasValidSubscription` to true if user subscription is custom.
2016-07-19 10:15:45 +01:00
Shane Kilkelly
dda0841af3
Return early if there are no keys to delete
2016-07-06 15:39:03 +01:00
Shane Kilkelly
fc6cf75ad5
Merge branch 'master' into sk-session-revocation
2016-07-06 13:19:15 +01:00
Shane Kilkelly
9f724d0a04
Add tests to check if users can access a restricted page.
2016-07-06 12:14:01 +01:00
Shane Kilkelly
0362fee60f
test the retain
option to revokeAllUserSessions
.
2016-07-05 15:32:32 +01:00
Shane Kilkelly
464866847f
Fix name of UserSessionsManager test module.
2016-07-05 15:14:29 +01:00
Shane Kilkelly
a1c662b9d8
Test session revocation on password change.
2016-07-05 14:55:08 +01:00
Shane Kilkelly
2caa80bbcb
acceptance test for logging in two sessions.
2016-07-05 14:21:38 +01:00
Shane Kilkelly
5b9903551a
add an array of session ids to retain.
2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308
clear sessions on password reset
2016-07-05 14:19:59 +01:00
Shane Kilkelly
bec3d2ad42
start acceptance tests for sessions
2016-07-05 10:24:24 +01:00
Shane Kilkelly
df0a7bc547
test the _checkSessions
function.
2016-07-04 14:04:10 +01:00
Shane Kilkelly
699ba21032
test revokeAllUserSessions
2016-07-04 11:15:28 +01:00
Shane Kilkelly
dfcb47fb5c
test untrackSession
2016-07-04 10:56:13 +01:00
Shane Kilkelly
2ae2e6ed4f
Test trackSession
2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60
Begin testing UserSessionsManager
.
2016-07-04 10:05:34 +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
Shane Kilkelly
ab26edb44b
Adjust UserController unit tests
2016-07-01 10:20: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
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
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
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
Shane Kilkelly
e194de50cf
test _paypal.checAccountExists
.
2016-06-28 10:17:06 +01:00
Shane Kilkelly
6bdfedc1b0
Test when a paypal stage produces an error
2016-06-28 09:09:57 +01:00
Shane Kilkelly
d21eb1b07f
Add tests
2016-06-28 09:04:19 +01:00
Shane Kilkelly
709f8f2bea
start testing the paypal workflow.
2016-06-27 16:34:00 +01:00
Shane Kilkelly
3bf8da3e83
test _createCreditCardSubscription
2016-06-27 14:45:17 +01:00
Shane Kilkelly
2c1b326681
test the createSubscription
function.
2016-06-27 14:29:19 +01:00
Shane Kilkelly
95d85538cc
Clean up xml text block in test.
2016-06-27 14:00:30 +01:00
Shane Kilkelly
d853eb5916
Update existing RecurlyWrapper tests.
2016-06-27 13:54:54 +01:00
Shane Kilkelly
eb92cfe8e0
Remove the postal_code from test, until recurly get back to us.
2016-06-27 10:40:08 +01:00
Shane Kilkelly
9938787e4a
fix a few silly issues. Appears to work now
2016-06-27 10:38:10 +01:00
Shane Kilkelly
72c73809f6
Generate address xml from object.
2016-06-27 09:44:40 +01:00
Henry Oswald
9888d6631a
don't error if references is not enabled
2016-06-24 15:46:37 +01:00
Henry Oswald
3887db8898
don't call notifications if notifications has no url
2016-06-24 14:06:04 +01:00
Brian Gough
98a0c54004
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-17 12:22:03 +01:00
Henry Oswald
8a9a65a80a
fix the download and compile endpoint used by zip
2016-06-15 14:45:05 +01:00
Henry Oswald
f3e48e332b
explicit call to UserCreator.createNewUser
2016-06-13 13:38:17 +01:00
Henry Oswald
3bc3153490
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-13 13:24:04 +01:00
Henry Oswald
c52af1393e
should be able to set first and last name via user details on registration
2016-06-13 13:21:44 +01:00
Brian Gough
49a7c3c27b
Merge branch 'per-user-containers-part-2'
...
Conflicts:
app/coffee/Features/Compile/ClsiManager.coffee
app/coffee/Features/Compile/CompileController.coffee
app/coffee/Features/Compile/CompileManager.coffee
2016-06-13 12:24:48 +01:00
Brian Gough
8bc5f53562
Merge pull request #253 from sharelatex/per-user-containers-part-1
...
Per user containers part 1
2016-06-10 09:40:00 +01:00
Brian Gough
47574d7c7e
Merge pull request #252 from sharelatex/per-user-containers-part-0
...
Per user containers part 0
2016-06-08 15:55:17 +01:00
Shane Kilkelly
8f1fec8c4f
Add opt-out action to beta page
2016-06-08 15:11:39 +01:00
Shane Kilkelly
90dac348ff
refine beta opt-in workflow.
2016-06-08 11:04:44 +01:00
Shane Kilkelly
d8f1e8ec93
Add basic BetaProgram
feature.
2016-06-07 11:15:56 +01:00
Henry Oswald
79929eae73
Merge branch 'clsichecks'
2016-06-06 14:34:22 +01:00
Henry Oswald
829b37cd74
set user email on session again on change email
2016-06-06 10:50:45 +01:00
Brian Gough
55a8e3cffe
extend tests for per-user compiles
2016-06-02 15:48:13 +01:00
Brian Gough
061d4934f1
use url attribute sent back by clsi
2016-06-02 15:46:55 +01:00
Brian Gough
5be1886d43
use path attribute sent back by clsi
2016-06-02 15:43:20 +01:00
Henry Oswald
14cbf4f1c8
removed priority url from proxy to clsi
2016-06-02 13:11:20 +01:00
Henry Oswald
c284465ba5
added clsiformat checker, wired in
2016-06-02 13:09:32 +01:00
Henry Oswald
8a5cb86c31
check _checkRecoursesForErrors before compile
2016-06-01 16:46:41 +01:00
Henry Oswald
1437877b5a
spike to check latex for basic errors before compile
...
Aims to solve following problems which are currently not visible to user:
- project is too big, which files are worst offenders?
- when there are duplicate file names so an 'old' version keeps overrighting a new version
- when a file has the same path as a folder which blows up clsi i.e. images/research images/research/1.png
2016-06-01 12:28:54 +01:00
James Allen
887631e661
Don't error if the rootDoc_id no longer exists in the project when copying
2016-05-23 14:58:28 +01:00
Henry Oswald
c918028d14
removed clsi priorty url
2016-05-20 12:46:14 +01:00
Henry Oswald
61b9a683aa
put clsiCookie vals into subobject in settings
2016-05-19 16:55:58 +01:00
Henry Oswald
04e70735d2
Merge branch 'master' into clsi-dynamic-load
2016-05-19 16:26:54 +01:00
Shane Kilkelly
0ea16f0bcc
Index '.bib' file objects.
2016-05-19 14:58:12 +01:00
Henry Oswald
789257fd4a
use cookie key when setting cookie for jar
2016-05-19 13:52:18 +01:00
Henry Oswald
2abebd850c
Merge branch 'project_url_query' into clsi-dynamic-load
2016-05-19 13:08:20 +01:00
Henry Oswald
b0baea5073
add query string to end of project resources
2016-05-18 10:09:22 +01:00
Shane Kilkelly
78e52d8c96
Update FileStoreHandlerTests
2016-05-18 09:58:57 +01:00
Henry Oswald
b8510301b6
expire cookie key from setting file length
2016-05-06 12:19:22 +01:00
Henry Oswald
ed4fdd48d7
clsi cookies are given an expire time via settings file
2016-05-05 16:50:18 +01:00
Henry Oswald
b00bd5cd94
if clsi cookies are not enabled don't call redis, return empty
2016-04-27 17:05:12 +01:00
Henry Oswald
78b08060ab
redis get not multi used for _getServerId
2016-04-27 16:56:21 +01:00
Henry Oswald
1ee94f9bf5
return server id for set server id and _populateServerIdViaRequest
2016-04-27 16:20:10 +01:00
Henry Oswald
616630200a
improve send calls and return correct stuff from _makeRequest
2016-04-20 17:08:11 +01:00
Henry Oswald
18560d8621
set server cookie on every compile response and don't expire on get
2016-04-20 16:17:06 +01:00
Henry Oswald
4d54de8b9a
renamed ClsiRequestManager to ClsiCookieManager and improved logging
2016-04-20 15:06:39 +01:00
Henry Oswald
b37595acf9
persist cookie in redis for compiles.
2016-04-19 16:48:51 +01:00
Henry Oswald
3d719af71e
if subscription is downgraded don't use plan code on subscription, use default instead
2016-03-31 18:04:20 +01:00
Henry Oswald
81cd2adfd3
member_ids != members_id
2016-03-31 17:36:06 +01:00
Henry Oswald
5a201153c7
refactored subscription updater again adding _setUsersMinimumFeatures
...
single place you can call and the users minimum features are set
2016-03-31 16:58:16 +01:00
Henry Oswald
cb3eb88af2
Merge branch 'subscriptionimprovements'
2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5
fixed change payment details page
...
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
James Allen
ae5467894b
Standardise on one Errors file
2016-03-23 15:14:49 +00:00
James Allen
a95c941cb9
Fix FileStore unit tests
2016-03-23 15:13:32 +00:00
Henry Oswald
a6859e22b3
if user is member of group on downgrade use the group subscription
2016-03-22 16:05:46 +00:00
Henry Oswald
a89edde139
subscription tests fixed
2016-03-22 14:27:05 +00:00
James Allen
f182fbf396
Convert 'anonymous-user' from real-time api in 'null' internally
2016-03-22 09:53:47 +00:00
James Allen
7791805949
Allow admin access to projects
2016-03-21 17:03:41 +00:00
Henry Oswald
840d3b75bb
listen for close not exit when working with unzip command
...
sometimes the command will fail because stout has not finished yet
2016-03-21 16:37:29 +00:00
James Allen
9a0ec9c292
Don't throw fatal error when recently compiled
2016-03-21 13:54:45 +00:00
James Allen
6beb29f449
Don't treat no root resource as a fatal error
2016-03-21 13:28:53 +00:00
James Allen
e7d67668e9
Improve error reporting and show 404 when project ids are malformed
2016-03-18 15:59:12 +00:00
James Allen
88b8ce1f80
Enable working settings acceptance tests
2016-03-18 15:59:12 +00:00
Shane Kilkelly
35b5d3cc05
Update ReferencesHandlerTests.
2016-03-18 11:43:39 +00:00
James Allen
de02928454
Merge branch 'master' into ja_email_tokens
2016-03-17 17:01:26 +00:00
James Allen
fe1f71413e
Use ProjectGetter, not Project, in ProjectController.loadEditor
2016-03-15 14:12:43 +00:00
Henry Oswald
76b3a78988
added lock around move element
2016-03-15 12:29:41 +00:00
Henry Oswald
ba9bc3a2e8
check that element being inserted has an _id
2016-03-15 11:29:59 +00:00
James Allen
71ef045728
Implement authorization guards in Authorization{Manager,Controller}
2016-03-14 17:06:57 +00:00
Henry Oswald
3fc357a343
Merge branch 'master' into projectsizelimit
2016-03-14 10:31:07 +00:00
Henry Oswald
15c6e49d1a
if user changes email then check if they have a site licence
2016-03-13 22:31:14 +00:00
Henry Oswald
8812ff445e
change zip size check to spawn
2016-03-12 15:43:16 +00:00
Henry Oswald
f11ba97389
check stat.isFile and isDirectory rather then symlink
2016-03-12 15:05:29 +00:00
Henry Oswald
6664b67fba
check size of zip files
2016-03-12 12:38:21 +00:00
Henry Oswald
da242d90e6
added extra isSymLink checks into reading files
2016-03-12 12:01:36 +00:00
James Allen
1bd8b8d1a3
Delete SecurityManager and replace with (unwritten) AuthorizationManager
2016-03-10 17:17:26 +00:00
James Allen
3e03164ed4
Remove dead auth_token code
2016-03-10 17:15:14 +00:00
Henry Oswald
3c4e74af4b
project duplicator works and tests pass.
...
not so bad now.
2016-03-10 12:42:21 +00:00
James Allen
e36be96ec9
Move public access setting to its own end point
2016-03-10 11:13:57 +00:00
James Allen
d235ab22ed
Add in tests for public read-only projects
2016-03-09 16:28:46 +00:00
James Allen
c46c083b31
Check write access to documents via real-time end point
2016-03-09 16:26:18 +00:00
James Allen
2116d0271c
Update acceptance tests for public projects
2016-03-09 15:30:23 +00:00
Henry Oswald
940586f654
sped up unit tests to improve speed
...
also removed some unneeded requires.
2016-03-09 12:51:19 +00:00
James Allen
4f9f255153
Extend acceptance tests to include shared projects
2016-03-09 12:31:46 +00:00
Henry Oswald
5be05a35d8
added WithProject versions of functions
...
rather than project_or_id
2016-03-09 11:16:27 +00:00
James Allen
e1fa77dd72
Add beginnings of acceptance tests
2016-03-08 15:59:04 +00:00
James Allen
37c966ba7e
Fix unit test
2016-03-08 14:42:11 +00:00
James Allen
76af5e5563
Don't call deprecated findPopulatedById in loadEditor
2016-03-08 14:20:00 +00:00
James Allen
359689ffea
find -> findOne
2016-03-08 14:19:38 +00:00
James Allen
0882eb2a99
Don't use deprecated Project.findPopulatedById in ReferencesManager
2016-03-08 14:05:56 +00:00
James Allen
40048d49a2
Fix unit test
2016-03-08 12:07:42 +00:00
James Allen
5f5445f625
Use TpdsUpdateSender to use CollaboratorsHandler
2016-03-08 11:54:45 +00:00
James Allen
a50bdaf5cc
Refactor LimitationsManager to use CollaboratorsHandler
2016-03-07 15:32:04 +00:00
James Allen
bedc8a0492
Remove ProjectGetter.populateProjectWithUsers
2016-03-07 15:25:10 +00:00
James Allen
2ba2b72fd1
Refactor ProjectDeleter to use CollaboratorHandler
2016-03-07 12:27:40 +00:00
James Allen
6d93076d51
Refactor getCollaborators http method to use CollaboratorsHandler
2016-03-07 12:02:48 +00:00
James Allen
1a689aa1fd
Move findAllUsersProjects from Project to ProjectGetter
2016-03-03 17:19:03 +00:00
James Allen
120a142733
Add in required abstracted functions to CollaboratorsHandler
2016-03-03 16:13:19 +00:00
Henry Oswald
39c7010d72
fixed broken tests
2016-02-29 22:51:46 +00:00
Henry Oswald
76591ebb23
made ProjectGetter.getProject more robust
...
it can deal with multiple types of query better, including mongoose ids which are not being matched like mongojs ids.
2016-02-29 19:01:46 +00:00
Henry Oswald
6a7395a287
brought back the project_or_id style
...
Added functionality into project getter, its a big performance improvement for things like cloning projects. Clone a 500 element project, 1 mongo get or 500.
2016-02-29 17:34:38 +00:00
Henry Oswald
b5dd96aa71
fixed some mongo calls in project entity handler
...
need to specify fields you want to not get array back.
2016-02-29 16:03:22 +00:00
Henry Oswald
8f0d1dc73e
add in the calls to block large projects
2016-02-29 13:05:17 +00:00
Henry Oswald
8aec86af4e
moved count element to project entity handler and added tests
2016-02-26 13:25:09 +00:00
Henry Oswald
eedaa43b58
move project duplicator to mongojs
2016-02-26 08:32:00 +00:00
Henry Oswald
6ca69f88ac
Move project locator to mongojs
2016-02-26 08:31:47 +00:00
Henry Oswald
586d4cbae1
replaced all mongoose Project.find with mongojs calls
2016-02-26 08:23:43 +00:00
Henry Oswald
b6d62a677b
ProjectDeleter.archiveProject doesn't need to get entire project
2016-02-26 08:13:41 +00:00
Henry Oswald
447568aa91
ProjectDetailsHandler.getDetails does not need full project
2016-02-26 07:56:26 +00:00
Henry Oswald
43102e0ffc
lowercase and trim add user to group email address
2016-02-25 14:15:56 +00:00
James Allen
155831c3e7
Skip top-level directory if it exists in zip upload
2016-02-24 17:21:20 +00:00
James Allen
c6dcb64b18
Overwrite text files from uploads
2016-02-24 16:37:03 +00:00
Henry Oswald
09ac8f8c7a
move .putElement into ProjectEntityHandler with tests
2016-02-24 15:36:39 +00:00
Henry Oswald
7a28eeeaa0
ProjectEntityHandler.addFolder take only project id and
...
only gets project folder structure
2016-02-23 15:45:40 +00:00
Henry Oswald
2a6e09a41b
remove console.log
2016-02-23 15:37:23 +00:00
Henry Oswald
1278081b51
mkdirp only needs folder strucutre
2016-02-23 15:36:59 +00:00
Henry Oswald
1d76850ebd
copyFileFromExistingProject does not need the whole project
2016-02-23 15:34:31 +00:00
Henry Oswald
b504732733
fixed calls to addUserToGroup and added more logging
2016-02-22 16:50:41 +00:00
Shane Kilkelly
b505f0d455
Merge branch 'sk-references-search'
...
Conflicts:
app/coffee/Features/References/ReferencesController.coffee
2016-02-19 11:30:55 +00:00
Henry Oswald
29e4b324fd
improve calls for invite notifications and auto mark as read
2016-02-18 11:43:43 +00:00
Henry Oswald
f824a3e28a
kill off dead code in group handler
2016-02-18 11:42:26 +00:00
Henry Oswald
bd54cc722a
fixed broken tests in AuthenticationController
2016-02-18 10:16:50 +00:00
Henry Oswald
fc4bd94a6e
don't create notification if user is already part of group
2016-02-18 10:06:21 +00:00
Henry Oswald
735f7bd51e
change res.send to res.sendStatus for new express
2016-02-16 12:38:27 +00:00
Henry Oswald
5c5888b5dc
Merge branch 'pr/221'
2016-02-11 11:44:45 +00:00
Shane Kilkelly
326d9e59f8
Refactor ReferencesSearch*
to just References*
.
2016-02-08 17:04:27 +00:00
Henry Oswald
de0589b051
added notifications calls for sending to api and mark as read
...
not creating it yet
2016-02-05 14:13:38 +00:00
James Allen
6143b2218c
Send user_id on Dropbox requests through to doc updater
2016-02-04 14:27:00 +00:00
Henry Oswald
7994528c92
make site licence regex more specific
2016-02-03 16:08:29 +00:00
James Allen
4c626f23e7
Merge pull request #224 from sharelatex/ja_draft_mode
...
Draft mode for compiles
2016-02-02 15:04:21 +00:00
James Allen
425a9b9db2
Add in option to compile in draft mode
2016-02-02 14:50:48 +00:00
Henry Oswald
aaa258099e
added tests to check rate limiter works without session
2016-02-02 14:26:23 +00:00
James Allen
b32178182d
Explicitly create tags and get their id
2016-02-01 10:18:56 +00:00
James Allen
77cc6af35e
Update add tag end point to use tag_id
2016-02-01 10:18:56 +00:00
James Allen
f1e65cc776
Use tag_id for deleting tags from project
2016-02-01 10:18:56 +00:00
James Allen
1bd5aef85f
Allow renaming of tags
2016-02-01 10:18:56 +00:00
James Allen
1a86e69d1f
Allow tags to be deleted
2016-02-01 10:18:56 +00:00
Shane Kilkelly
50a451970b
Merge branch 'master' into sk-references-2
2016-01-28 10:06:41 +00:00
Shane Kilkelly
3a700a5af2
More tests for indexAll
2016-01-27 16:03:40 +00:00
Shane Kilkelly
cc818695ef
Split References.index into index and indexAll.
2016-01-27 16:00:53 +00:00
Shane Kilkelly
ec8a12d445
Flush changes to mongo before sending request to references service
2016-01-27 13:33:42 +00:00
Shane Kilkelly
fed10280ab
Use docstore url rather than going through web api.
2016-01-27 09:58:54 +00:00
Shane Kilkelly
d1e53f0cb8
Test ReferencesSearchHandler.index
2016-01-26 16:14:17 +00:00
Shane Kilkelly
8a991b0d06
Start testing ReferencesSearch feature
2016-01-26 14:29:23 +00:00
Henry Oswald
690b195f1a
move login success to .json as it sends json over
2016-01-25 17:35:57 +00:00
Henrique Santos
9429e49cf8
finishing frontend
2016-01-22 18:08:39 -02:00
Shane Kilkelly
af75bb8a60
wip: change how indexing of references works.
2016-01-22 14:23:59 +00:00
Henrique Santos
2d11705837
fix issues in first commit
2016-01-22 03:41:22 -02:00
Henrique Santos
476eaa8b84
add notification backend and unit test
...
add notification init frontend
2016-01-21 18:42:50 -02:00
Shane Kilkelly
d5d5ba9066
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-01-20 14:02:24 +00:00
Shane Kilkelly
6cc18cd2fb
Add test.
2016-01-20 14:02:14 +00:00
Shane Kilkelly
0b28e7e964
send a fullIndex
flag along to references service.
2016-01-20 13:53:28 +00:00
James Allen
ed5872702a
Pass image to wordcount end point in CLSI
2016-01-19 14:17:01 +00:00
Shane Kilkelly
2a7894f6e4
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-01-15 14:41:12 +00:00
James Allen
03d75944b0
Allow image name to be configured
2016-01-15 10:26:36 +00:00
Shane Kilkelly
ca0a625dcc
Begin work on indexing the references when project is opened.
2016-01-14 14:53:08 +00:00
Shane Kilkelly
a63028bad3
Test the ReferencesSearchHandler
2015-12-31 10:28:19 +00:00
Shane Kilkelly
9280dd240b
Test getKeys.
2015-12-31 09:39:48 +00:00
Shane Kilkelly
d9ca9fc06d
Fix comically long lines.
2015-12-31 09:22:35 +00:00
Shane Kilkelly
877ea1d376
Test remaining failure cases.
2015-12-30 16:20:14 +00:00
Shane Kilkelly
ffb149b923
Test failure conditions.
2015-12-30 16:15:31 +00:00
Shane Kilkelly
5d80ce9ca5
More tests.
2015-12-30 15:24:57 +00:00
Shane Kilkelly
86d69f3275
Start testing ReferencesSearch.
2015-12-30 15:08:12 +00:00
Henry Oswald
501763bb4e
changed add doc to use ligher mongo call (folders only)
2015-12-15 13:27:41 +00:00
Henry Oswald
763f16f43c
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-12-12 11:39:54 +00:00
James Allen
e8f21986dd
Refactor registration so it can be called from modules
2015-12-11 17:11:20 +00:00
James Allen
1e8ab5357b
Improve pre-registered account activation process
2015-12-11 11:30:06 +00:00
Henry Oswald
13af9b7b56
find project by name should only find active projects
2015-12-10 17:06:00 +00:00
Henry Oswald
5213be4fe9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-25 11:54:40 +00:00
Henry Oswald
91a84cb232
increase compile throttle limit
2015-11-25 11:07:53 +00:00
Henry Oswald
ba58509a67
increased length rate limit is in effect for
2015-11-16 12:21:06 +00:00
Henry Oswald
4e8eebb482
increase rate limit threshold on pdf downloads
2015-11-11 09:00:38 +00:00
Henry Oswald
16670cb3e3
only rate limit full pdf downloads
2015-11-10 16:23:55 +00:00
Henry Oswald
23fd12c67d
dropped throttle for full pdf download to 30 over 5 mins
...
1 download every 10 seconds which seems ample
2015-11-10 11:53:11 +00:00
Henry Oswald
c8ba7b72ab
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-10 10:36:06 +00:00
James Allen
16b7bf222a
Merge branch 'contacts'
2015-11-05 10:14:25 +00:00
James Allen
c46f62cfc1
Ensure that a user can only be added to project once
2015-11-02 15:21:41 +00:00
Henry Oswald
cf48c94725
rate limit pdf downloads
2015-10-30 11:56:01 +00:00
Henry Oswald
1c91de0395
added function to get project with only folders for quicker adding of files to large projects
2015-10-21 16:56:06 +01:00
Henry Oswald
d9734953a6
don't archive project in track changes for moment
2015-10-20 17:36:37 +01:00
Henry Oswald
a94a03fc3e
added missing stubbed module call breaking tests
2015-10-19 15:48:59 +01:00
Henry Oswald
2c32126f68
archive in track changes as well as docstore
2015-10-19 15:44:50 +01:00
James Allen
d996ed6e47
Refactor addUserToProject for better access by groups
2015-10-14 17:29:58 +01:00
James Allen
c4e4f2c77a
Add modules hook for contacts and support groups in auto complete
2015-10-08 18:17:53 +01:00
James Allen
78c5741d06
Add contact when adding collaborator
2015-10-08 16:42:23 +01:00
James Allen
d11d536994
Refactor adding and removing collaborators to not go through EditorController
2015-10-08 14:15:36 +01:00
James Allen
8cc7869b03
Pull in contacts from contacts api and send to tag-input for autocomplete
2015-10-07 17:32:35 +01:00
Henry Oswald
f1d07811df
update the entire users features on assign bonus bu don't update
...
the user features if there is nothing to update when assigning bonus
2015-10-07 13:50:51 +01:00
Henry Oswald
b69ec9768d
bonus allocater does not need to check if user has subscription any more.
2015-10-05 16:50:34 +01:00
Henry Oswald
fae7d431f4
after subscription is updated always check bonus
2015-10-05 16:33:13 +01:00
Henry Oswald
9a60617162
change referral allocated to only upgrade features and to find highest level
...
i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.
2015-10-05 12:30:03 +01:00
Henry Oswald
5ffd76c670
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-09-14 15:36:08 +01:00
Henrique Dias
3be0425b45
add unit tests for wordcount
2015-09-11 10:21:05 -03:00
James Allen
639424f664
Don't error on project clone if not root doc is set
2015-09-02 14:32:21 +01:00
Shane Kilkelly
0aaeb6671e
Keep password reset token in session, and strip it from reset page url.
...
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.
Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Shane Kilkelly
23bd5d317c
A few extra cases which should not be treated as html.
2015-08-20 15:58:36 +01:00
Shane Kilkelly
ebf754904f
More thorough tests for the FileStoreController when downloading .html files.
2015-08-20 15:56:56 +01:00
Shane Kilkelly
85c1704fc5
Test that content-type is set for mobile-safari user-agents.
2015-08-20 14:03:12 +01:00
Shane Kilkelly
ce248f56d7
Un-break FileStoreControllerTests by mocking out the req.get
method.
2015-08-20 12:28:51 +01:00
Henry Oswald
0e9ec00f85
added stubbed logger in document controller tests
2015-08-19 11:58:59 +01:00
Henry Oswald
63580f6a79
remove useClsi2 flag in project collection
2015-08-19 11:58:41 +01:00
Henry Oswald
50fc886c94
changed inactive to active as its more effienct query in mongo
2015-08-19 11:54:30 +01:00
Henry Oswald
70b825fd2a
fixed call to ProjectUpdateHandler.markAsOpened and made it async
2015-08-14 11:27:11 +01:00
Henry Oswald
68e970cd69
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-08-14 09:31:25 +01:00
Henry Oswald
a0142d4415
added inactive and reactivate project logic
2015-08-13 22:40:28 +01:00
Henry Oswald
3ecf201eda
send -> sendStatus
2015-07-08 16:56:38 +01:00
Henry Oswald
8020cd8f47
removed tpds from settings.defaults.coffee, if not set updates are now not queued
2015-07-02 12:09:08 +01:00
Henry Oswald
7fd29b18a8
destroy users session before creating a new one for them after login
...
session changed to prevent against fixation attacks
2015-07-01 15:29:02 +01:00
Henry Oswald
4f0b922a5d
changed name used when project or file uploaded, this changed when
...
we started using https://github.com/expressjs/multer
* originalname - Name of the file on the user's computer
* name - Renamed file name
2015-07-01 15:28:49 +01:00
Henry Oswald
15a57f5dc4
removed req.session.destorys from endpoints now on the api router which are not needed
2015-07-01 15:26:05 +01:00
Henry Oswald
2ec925b45e
fairy removed from web, makes http request to tpds worker now
2015-06-22 22:33:04 +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
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
Henrique Dias
f709ddf3eb
add csv export unit tests
2015-05-28 17:22:49 -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
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
841231dbf8
make PasswordResetTokenHandler generic so it can be used for invites
2015-05-26 15:24:09 +01:00
Brian Gough
e51cdb81bd
port leak fixes from smoke-test-sharelatex module
2015-05-26 10:54:55 +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
Brian Gough
3051d7dab6
modify LockManager test to avoid dependence on timing
2015-05-18 09:14:28 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +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
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Henry Oswald
7a46b98c82
fixed unit tests for deleting files sent from tpds
2015-04-22 15:08:29 +01:00
James Allen
5c30a7de67
Add in option for global login requirement (defaults to on)
2015-04-15 11:14:53 +01:00
James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
185514ea35
Fix failing unit test
2015-03-19 16:41:09 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
James Allen
93a088618a
Return proper error from registration handler
2015-03-18 16:19:48 +00:00
James Allen
cb948fede2
Move email sending into registration controller
2015-03-18 15:57:01 +00:00
Henry Oswald
fe3b9bf07a
clients can not rename docs/files/folders to blank name.
...
Client and server side checks added
2015-03-04 11:10:59 +00:00
Brian Gough
0ff5f54bf6
fix unit test for build parameter
2015-03-02 15:33:45 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
a64b8724bd
include the build parameter in the compile unit tests
2015-02-26 16:21:44 +00:00
Henry Oswald
a9660a3a07
add err and null project test for locating project element
2015-02-18 21:57:21 +00:00
Henry Oswald
f8e3fa6308
increase the auto compile limit a little
2015-02-18 21:57:21 +00:00
James Allen
1a7d4f6be1
Fix smoke tests
2015-02-17 11:21:14 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +00:00
James Allen
50048a53b5
Don't throw an exception if there is an error with unzip
2015-02-11 11:34:49 +00:00
James Allen
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +00:00
James Allen
6c387edbe2
Remove Dropbox front end logic from main sharelatex repo
2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
366a0403a6
Clear rate limit in smoke tests
2015-02-05 10:18:18 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +00:00
Henry Oswald
0a64c1c8ac
on register try and auto allocate a group licence if one exists
2015-01-27 18:22:51 +00:00
Henry Oswald
3360b3c35a
added basic domain allocation feature
2015-01-27 18:09:56 +00:00
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +00:00
Henry Oswald
a7eb836c79
redirect to /thank-you on success and fix broken unit test from a few commits ago
2014-12-22 16:37:09 +00:00
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
d3b38c8dc2
Revert "Revert test changes for proxied headers when requesting pdfs from clsi"
...
This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.
2014-12-12 15:43:21 +00:00
Brian Gough
f005c5e8dc
Revert test changes for proxied headers when requesting pdfs from clsi
2014-12-11 13:42:51 +00:00
Brian Gough
265ad4439c
Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng
2014-12-05 14:43:01 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
Brian Gough
35b6abe79c
fix tests for pdf header passing
2014-12-02 16:36:19 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Henry Oswald
a570d05132
fixed bug with setting root doc which would fail if the document class isn't on the top line
2014-12-01 01:07:03 +00:00
James Allen
175dfae085
Look up compile group and features from project owner, not current user
2014-11-28 14:26:21 +00:00
Henry Oswald
0bc76b6d92
mkdir p changed so it does not get entire project, now without doc lines
2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508
Revert "added lock to update merger"
...
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5
added lock to update merger
2014-11-27 10:46:52 +00:00
Henry Oswald
5e570d52a0
modfied setRootDocAutomatically to work async
...
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Henry Oswald
393a637673
remove a couple of required coffee-scritps which are not required
2014-11-26 15:37:53 +00:00
Henry Oswald
857d867191
added locks into editor controller for new/move/deletes
...
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Henry Oswald
bd841b4795
coppied the lock manager over from doc updater
2014-11-25 16:52:27 +00:00
Henry Oswald
3bae278c92
Revert "increased timeout for geoip to 3 seconds"
...
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369
increased timeout for geoip to 3 seconds
2014-11-25 11:51:03 +00:00
James Allen
afca9ba0cb
Fix unit tests
2014-11-24 14:26:51 +00:00
James Allen
c28e09076b
Add missing logger include in smoke test
2014-11-24 13:33:03 +00:00
Henry Oswald
cd8c233c05
Revert robust redis connection code
2014-11-19 15:06:05 +00:00
James Allen
8b9a26d6f3
Add in http health check end points for redis subscription channels
2014-11-19 14:12:37 +00:00
James Allen
d6532c63f8
Use new robust subscription model
2014-11-19 11:09:42 +00:00
Henry Oswald
804bc16bc8
redirect users to /register when coming from templates or share url
...
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald
f5d3801bfb
changed findElementByPath to not call cb more than once & deal with nulls
2014-11-11 14:44:44 +00:00
Henry Oswald
948183b685
return done in smoke test
2014-11-10 16:33:36 +00:00
Henry Oswald
4c905c168a
do null check on csrf token in smoke test
2014-11-10 11:20:34 +00:00
James Allen
6d10e45135
Fix unit test
2014-11-07 12:35:10 +00:00
James Allen
84c08edcf3
Factor out common joinProject logic to provide and HTTP end point for the real-time API
2014-11-07 12:31:47 +00:00
James Allen
d27af25bc9
Convert template publishing to use HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef
Access Dropbox status via HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
e596b60af0
Move collaborator HTTP end points into the Collaborators feature
2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88
Add and remove collaborators with HTTP requests, not websockets
2014-11-06 14:39:40 +00:00
Henry Oswald
1a2411d4c2
removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter
2014-11-06 12:07:50 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00:00
Henry Oswald
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
3cf64ce34f
pass new compile features to client side, don't show timeout upgrade for premium users
2014-10-20 12:21:40 +01:00
Henry Oswald
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
Henry Oswald
d8cc3b7b61
fixed leaky test
2014-10-16 16:02:31 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396
Send source of update to doc updater and allow external updates to be ignored in UI
2014-10-16 11:27:10 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
19a08f82a6
default to USD if there is no match
2014-10-14 12:14:03 +01:00
Henry Oswald
4a774981cf
Merge branch 'master' into multicurrency
2014-10-14 11:52:03 +01:00
Henry Oswald
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
Henry Oswald
36264706f6
hooked the plans page up to the geo ip lookup
2014-10-13 14:10:15 +01:00
Henry Oswald
3ca04e25fd
add 1 second timeout to geoiplookup
...
response times generally seem to be around 0.05s from our servers
2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926
default to USD in geo ip lookup.
...
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0
use first ip passed though in string for ip lookup
2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd
added geoip lookup feature
2014-10-13 00:45:45 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043
if its a custom account redirect to /user/subscription/custom_account
2014-10-10 15:11:22 +01:00
Henry Oswald
e5ab40c911
added example session invalidation code
2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7
unlink dropbox when a user cancels
2014-10-09 17:05:41 +01:00
James Allen
4743b460f5
Only show rename or deleted message once
2014-10-09 09:13:38 +01:00
James Allen
accd8207b2
Show password reset expired message rather than server error if that's what has happened
2014-10-08 17:18:24 +01:00
James Allen
128c672edd
Merge branch 'github-sync'
...
Conflicts:
package.json
2014-10-08 12:13:37 +01:00
James Allen
dbd85a05f1
Send user features and features switches to views where needed
2014-10-07 13:31:13 +01:00
Henry Oswald
8789a4bde1
server rejects rename of entitys over 150 chars
2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b
server rejects project names over 150 chars
2014-10-07 11:14:02 +01:00
James Allen
6c7c09075c
Treat paths properly in project content update methods
2014-10-03 11:33:18 +01:00
James Allen
13a96c925b
Add in endpoints to allow updating project files when the project id is know
2014-10-02 14:15:30 +01:00
Henry Oswald
2375dbb851
run succesful login before each smoke test to avoid any rate limit issues
2014-09-29 11:45:34 +01:00
Henry Oswald
7f2df4bbd3
renamed rate limiter tests
2014-09-29 11:42:46 +01:00
Henry Oswald
0d056434e6
fixed tests
2014-09-26 17:49:31 +01:00
Henry Oswald
558b6cdfde
remove test which isn't really that important
2014-09-18 14:41:30 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
b875864568
check for error on smoke test after
2014-09-04 18:06:24 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
c131a9d301
added /logout to smoke tests
2014-09-04 12:35:59 +01:00
Henry Oswald
e740e4913d
if user is already annual tell them so on the annual upgrade page
2014-08-29 14:13:05 +01:00
Henry Oswald
416f41e59d
stopped using proper settings inside of a test
2014-08-29 13:06:50 +01:00
Henry Oswald
aa83b5ca5d
fixed tests whoops
2014-08-29 12:41:42 +01:00
Henry Oswald
350b95a0a5
annual upgrade page works, needs a bit of copy love now
2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c
added confirm you want to change plan modal
...
added page and corisponding endpoint to migrate to annual plan
2014-08-27 17:51:10 +01:00
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +01:00
James Allen
456d194dbb
Merge branch 'james_tmp'
2014-08-22 12:51:35 +01:00
James Allen
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +01:00
James Allen
d0eee7a1e5
Refactor template settings
2014-08-20 14:47:27 +01:00
Henry Oswald
6bb4c9867e
convert smoke cookie to be unsecure so curl will send it
2014-08-19 15:35:34 +01:00
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +01:00
Henry Oswald
a082dd0f3b
use cookie domain in smoke test path
2014-08-19 12:05:07 +01:00
Henry Oswald
8895ceea35
write cookies to tmp for smoke test
2014-08-19 12:01:30 +01:00
Henry Oswald
523694c4ff
changed smoke tests to work with curl
...
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com
https://github.com/goinstant/tough-cookie/issues/16
moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set
jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henry Oswald
0dc4b3a01b
login works with curl
2014-08-19 10:54:33 +01:00
James Allen
9be7228247
Delay Dropbox polling by 5 seconds and dispatch only a single request
2014-08-14 13:48:23 +01:00
James Allen
670e8e5cb9
Use Dropbox Real-time polling
2014-08-13 17:26:18 +01:00
James Allen
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
Henry Oswald
b41256b599
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-08 13:15:03 +01:00
Henry Oswald
b48ca2c7ed
fixed smoke test breaking on title, removed "the" as its not great for SEO (i think)
2014-08-08 13:11:49 +01:00
James Allen
b20934e579
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-08 11:42:02 +01:00
James Allen
10021986c5
Don't error on password reset if no email found, and translate error messages
2014-08-08 11:41:54 +01:00
Henry Oswald
66ba6e612d
Revert "send 401 when login fails"
...
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
Henry Oswald
7976f2f0fe
send 401 when login fails
2014-08-07 16:28:00 +01:00
James Allen
b367c4a968
Show group subscription status on subscription dashboard page
...
Conflicts:
app/views/subscriptions/dashboard.jade
2014-08-07 15:51:43 +01:00
Henry Oswald
9c6f0faff6
Merge branch 'i18n'
...
Conflicts:
app/coffee/Features/User/UserPagesController.coffee
app/views/layout.jade
app/views/project/editor/dropbox.jade
app/views/project/editor/file-tree.jade
app/views/project/editor/pdf.jade
app/views/project/list/project-list.jade
app/views/user/settings.jade
2014-08-07 14:46:17 +01:00
James Allen
0a44aa9e71
Push into doc updater queue rather than pub/sub for updates
2014-08-07 13:19:10 +01:00
James Allen
dc54fe3d2e
Fix Smoke test to use new title
2014-08-06 11:50:19 +01:00
Henry Oswald
d047d44079
Changed the error messages which are sent down to the client to be translated first
...
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
2014-08-01 14:03:38 +01:00
Henry Oswald
bf56e083cf
removed a load of console.logs
2014-07-25 13:14:19 +01:00
James Allen
1128b45b17
Add in system messages
2014-07-24 13:24:08 +01:00
Henry Oswald
17962426ea
blog returns 404's if the page does not exist in blog
2014-07-23 12:16:52 +01:00
James Allen
1c68ea7328
Don't care if user key has expired when we receive a cursor update
2014-07-21 13:16:07 +01:00
Henry Oswald
554fd7c7d0
change client connection timeout to 15 mins expire in redis
2014-07-17 16:03:53 +01:00
James Allen
37a12e88c1
Show who is online
2014-07-17 15:25:22 +01:00
James Allen
e0f1ed3c10
Use internal url for chat
2014-07-17 11:43:12 +01:00
Henry Oswald
abc4306e06
merge
2014-07-16 13:35:15 +01:00
James Allen
fce271f827
Fix unit tests
2014-07-16 12:01:15 +01:00
Henry Oswald
6982ec63ae
changed get template details to findOne
2014-07-16 11:56:22 +01:00
Henry Oswald
cd60817592
made getting templates details parallel
2014-07-16 11:37:17 +01:00
Henry Oswald
91ca726e66
get template details now includes the markdown description of the project
2014-07-16 11:27:47 +01:00
James Allen
2a3ff3c523
Fix unit tests
2014-07-15 18:33:59 +01:00
Henry Oswald
d39b8a0a05
fixed broken chat test
2014-07-15 14:28:39 +01:00
Henry Oswald
9f82e63a8f
changed :project_id to :Project_id
2014-07-14 22:11:41 +01:00
Henry Oswald
4a71b38721
added route for getting connected users
2014-07-14 16:16:01 +01:00
Henry Oswald
e6dfef6225
added getting connected users controller
2014-07-14 16:01:58 +01:00
Henry Oswald
b0cf0666fa
changed the redis stuf to multi
2014-07-14 15:38:55 +01:00
Henry Oswald
d13676dab2
cursor data is stored in redis
2014-07-14 15:30:55 +01:00
Henry Oswald
61b7bea203
added ttl to the users set to keep redis clean from inactive projects
2014-07-14 13:20:29 +01:00
Henry Oswald
13aaf042d9
connected user manager logic works correctly
2014-07-14 12:41:06 +01:00
Henry Oswald
d737197e95
marksUserAsDisconnected -> markUserAsDisconnected
2014-07-10 17:01:42 +01:00
Henry Oswald
01ad313133
hooked up editor controller to connected users manager
2014-07-10 17:01:19 +01:00
Henry Oswald
e1dd58aca8
fixed algolia settings and removed some console.logs
2014-07-10 16:05:18 +01:00
Henry Oswald
4ccc56723f
added disconnect funtion in connected users manager
2014-07-10 16:05:05 +01:00
Henry Oswald
c0a6f0b7ad
Merge branch 'master-redesign' into master-redesign-templates-and-blog
...
Conflicts:
public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
public/coffee/ide/online-users/OnlineUsersManager.coffee
public/coffee/ide/track-changes/directives/infiniteScroll.coffee
2014-07-10 15:15:18 +01:00
Henry Oswald
1be8dadbcf
fixed chat tests
2014-07-10 15:12:28 +01:00
Henry Oswald
025d3147ec
blog intergration works
2014-07-10 14:53:53 +01:00
James Allen
6d10c186ad
Sort out escaping issues
2014-07-09 11:05:00 +01:00
James Allen
ff7b7cdd20
Fix smoke tests
2014-07-08 14:29:06 +01:00
James Allen
8c56a46594
Merge branch 'master' into master-redesign
2014-07-08 13:24:48 +01:00
James Allen
2553f51e44
Remove unused subscription downgrade logic
2014-07-08 12:55:29 +01:00
Henry Oswald
581d9ec925
- hooked up chat throughout the stack
...
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
2014-07-08 10:08:38 +01:00
Henry Oswald
d1f907cee5
first simple version of tracking who is active in the editor
2014-07-04 16:18:46 +01:00
Henry Oswald
0d02241b46
linked chat into the editor real time contorller
2014-07-04 13:20:30 +01:00
Henry Oswald
9c35cfd693
very start of chat controllers done
2014-07-04 13:05:55 +01:00
Henry Oswald
77246b2a07
added query string support onto get requests for limit and before
2014-07-02 17:37:30 +01:00
Henry Oswald
8670b543b9
added basic chat handler
2014-07-02 17:28:05 +01:00
Henry Oswald
978e3262b5
added redirects from config file in, used for old template paths
2014-07-01 15:44:12 +01:00
Henry Oswald
000be22f16
Merge branch 'master-redesign' into master-redesign-templates-and-blog
...
Conflicts:
app/views/project/editor.jade
2014-07-01 15:23:05 +01:00
James Allen
d599cfa7ac
Fix unit tests
2014-07-01 14:19:52 +01:00
Henry Oswald
53fa15d3db
added basic error handling around templates rendering
2014-06-30 17:27:13 +01:00
Henry Oswald
27a97b7fa8
build titles for tempaltes page in web
2014-06-30 17:19:25 +01:00
Henry Oswald
b80f751cb2
templates works basically, needs error handling and few little improvments
2014-06-30 17:08:54 +01:00
James Allen
0d334a560e
fix failing unit test
2014-06-27 14:38:08 +01:00
James Allen
afb953a489
Display cursor name labels
2014-06-26 11:19:05 +01:00
James Allen
9dfbb36a83
Update project settings over http
2014-06-25 13:51:02 +01:00
James Allen
242a866bce
Rename files
2014-06-22 20:08:56 +01:00
James Allen
f931df6084
Allow creation of folders
2014-06-22 14:39:38 +01:00
James Allen
f41534ee4d
Add in creating of files to editor
2014-06-22 12:10:42 +01:00
James Allen
81845dec32
Wire up account settings forms
2014-06-20 11:15:25 +01:00
James Allen
0ef7e54ad3
Allow partial updates to user settings
2014-06-20 09:42:43 +01:00
James Allen
1bcc0a4554
Send 204 rather than redirect when leaving a project
2014-06-19 13:11:01 +01:00
James Allen
2b349039c3
Add in backend multiple project downloading
2014-06-18 16:37:18 +01:00
James Allen
aa8969c652
Merge and fix external forms
2014-06-17 16:19:40 +01:00
James Allen
c56648ab80
Merge branch 'master' into master-redesign
...
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
2014-06-17 11:54:29 +01:00
Henry Oswald
df44792a10
fix tests in user info controller
2014-06-17 11:48:14 +01:00
James Allen
65a1f03768
Send project owner details to client
2014-06-16 13:34:38 +01:00
James Allen
9c5f63817e
Send accessLevel info to client
2014-06-16 12:47:39 +01:00
Henry Oswald
e099a4a100
added default of empty string to user details, fixed route as well
2014-06-11 15:14:07 +01:00
Henry Oswald
473da4fa4c
endpoint for user details is written
2014-06-11 12:46:28 +01:00
Henry Oswald
3aff131428
added controller endpoint for updating user personal info
2014-06-10 22:26:43 +01:00
Henry Oswald
dabed896be
lowercase password reset email
2014-06-10 17:54:29 +01:00
James Allen
5c27ff4430
Don't show diffs of deleted docs (much simpler)
2014-06-06 14:43:45 +01:00
James Allen
02f48be825
Allow docs to be restored
2014-06-06 14:43:45 +01:00
James Allen
cabaf1ae1a
Show deleted documents when viewing history
2014-06-06 14:43:45 +01:00
Henry Oswald
22c467c231
Merge pull request #75 from dfelder/master
...
compile current file if top level document #42
2014-06-05 16:42:10 +01:00
James Allen
2fb8620ba0
Allow deleting of projects forever
2014-06-04 12:45:04 +01:00
James Allen
015fd6873f
Allow projects to be restore after being deleted
2014-06-03 17:35:44 +01:00
Daniel Felder
66dcb376a4
added unit tests
2014-06-01 22:28:19 +02:00
Daniel Felder
4320b790bd
adjusting unit tests
2014-06-01 19:26:33 +02:00
Daniel Felder
5ad0ca08f9
adjusting unit tests
2014-06-01 18:16:05 +02:00
James Allen
80c58bb718
Remove deprecated versioning code
2014-05-27 12:56:23 +01:00
James Allen
c1afbc66d9
Don't error if user is not logged in when compiling
2014-05-27 12:33:56 +01:00
James Allen
8f41c6dcb2
Don't automatically clear the cache
2014-05-21 15:20:25 +01:00
Henry Oswald
fd53cf0124
tell tpds sender to use pub url for docstore
2014-05-21 09:15:50 +01:00
James Allen
063f6c7680
Only auto clear CLSI cache on hard error, otherwise prompt user
2014-05-21 08:04:52 +01:00
Henry Oswald
57eb0e2006
Revert "Revert "changed docstore url to /raw for tpds updates""
...
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
2014-05-20 13:19:02 +01:00
Henry Oswald
ed9e25450a
Revert "Revert "change send doc lines using tpds to work with stream and doc store""
...
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
2014-05-20 13:18:59 +01:00
James Allen
93d418b716
Revert "change send doc lines using tpds to work with stream and doc store"
...
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
2014-05-20 11:14:06 +01:00
James Allen
22c577f9b5
Revert "changed docstore url to /raw for tpds updates"
...
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
2014-05-20 11:13:57 +01:00
Henry Oswald
2398b34f28
changed docstore url to /raw for tpds updates
2014-05-20 08:32:39 +01:00
Henry Oswald
d32fe588b7
change send doc lines using tpds to work with stream and doc store
2014-05-19 20:32:48 +01:00
James Allen
a45200dfe3
Automatically clear CLSI cache when compile fails
2014-05-19 16:10:52 +01:00
James Allen
7fed2155be
Differentiate between timeouts, server errors, and LaTeX failures in client
2014-05-19 16:10:52 +01:00
James Allen
6c5a2c2740
Reconfigure internal CLSI call to understand more than just success/failure
2014-05-19 16:10:52 +01:00
Henry Oswald
a53d767eca
changed 412 status code to 400
2014-05-19 14:02:54 +01:00
Henry Oswald
de38cbf595
destroy session when getting project details
2014-05-19 12:01:05 +01:00
Henry Oswald
6f9969d6e1
log out after smoke tests
2014-05-19 11:53:10 +01:00
Henry Oswald
af2de3cdeb
finished off change email
2014-05-19 11:50:32 +01:00
Henry Oswald
7437115967
added controler t change user email
2014-05-16 17:45:48 +01:00
Henry Oswald
50df82697a
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-16 11:27:09 +01:00
James Allen
2104c69cb9
Stream files into zip in series
2014-05-16 11:26:58 +01:00
Henry Oswald
9419d3a0e5
hooked up the frount end ui to show the email can not be found,
...
added client side valdidation on password, removed server side min
length check. Just check that it is not 0 len
2014-05-16 11:26:29 +01:00
James Allen
e9c164dc73
Fix test that could never fail
2014-05-16 11:01:36 +01:00
James Allen
240dc2e319
Use crypto.randomBytes
2014-05-16 10:52:31 +01:00
Henry Oswald
9c3c57f2a8
renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name
2014-05-16 10:43:55 +01:00
Henry Oswald
bf1bb22afd
added rate limiting to password reset endpoint
2014-05-16 10:31:33 +01:00
Henry Oswald
ca1539cac0
added timefreeze to recurly wrapper, don't think it really works but never know *double shurg*
2014-05-15 22:21:49 +01:00
Henry Oswald
133c4759f8
fix tests, whoops
2014-05-15 18:26:00 +01:00
Henry Oswald
24c50189b6
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0
cleaned up old password reset cruft
2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1
token based reset works
2014-05-15 17:58:25 +01:00
Henry Oswald
1ffd19099b
writen getUserIdFromToken
2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba
added the token generator and its getNewToken function
2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d
written password reset controller
2014-05-15 16:50:38 +01:00
Henry Oswald
551e1d465a
written password reset handler
2014-05-15 16:20:23 +01:00
James Allen
93883c7a03
Fix calling of updateDoc
2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140
Don't proxy version number to/from docstore
2014-05-15 12:44:08 +01:00
James Allen
0bddc5552e
Use docstore for updating documents
2014-05-08 15:47:50 +01:00
James Allen
8315de58c7
Proxy get doc requests to the docstore
2014-05-08 13:42:30 +01:00
James Allen
c73b7fae69
Use docstore when creating a new doc
2014-05-07 14:31:46 +01:00
James Allen
2fb8b0e807
Get project without doc lines in getAllFolders
2014-05-06 13:15:18 +01:00
James Allen
6a2370b5be
Use docstore for CLSI request building
2014-05-06 12:54:26 +01:00
James Allen
ca6be52fa0
Revert "Revert "Get doclines from docstore when cloning project""
...
This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.
2014-05-06 12:36:00 +01:00
James Allen
8af372aff3
Revert "Revert "Get doc lines from docstore when performing batch operations""
...
This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.
2014-05-06 12:35:27 +01:00
James Allen
9be4feaae1
Revert "Get doc lines from docstore when performing batch operations"
...
This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.
2014-05-01 17:19:21 +01:00
James Allen
fee632cfc9
Revert "Get doclines from docstore when cloning project"
...
This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.
2014-05-01 17:19:09 +01:00
James Allen
82b56d0b4f
Get doclines from docstore when cloning project
2014-04-30 16:45:53 +01:00
James Allen
465b5ca9db
Get doc lines from docstore when performing batch operations
2014-04-30 15:49:07 +01:00
James Allen
d82ae02d23
Fix unit tests
2014-04-30 11:23:53 +01:00
James Allen
355a5a020e
Keep reference to deleted docs and delete via docstore
2014-04-30 11:15:29 +01:00
James Allen
f8dec76464
Add DocstoreManager
2014-04-29 17:22:37 +01:00
Henry Oswald
bf2c60f84d
added rename project to list page
2014-04-28 17:47:47 +01:00
Henry Oswald
3655e83ff9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-28 16:27:19 +01:00
Henry Oswald
a0fb170878
updated archive module to latest version
2014-04-28 16:27:15 +01:00
James Allen
d528ac21a3
Mark projects as archived, but don't actually delete them
2014-04-28 12:53:43 +01:00
Henry Oswald
39b9c99735
fix unit tests I broke by adding timeout to tags
2014-04-16 17:51:40 +01:00
Henry Oswald
aca2e5639e
added referal allocator to user controller
2014-04-15 13:59:00 +01:00
Henry Oswald
c23f9aa056
be able to get build templates from web as well as templates
2014-04-11 15:15:32 +01:00
Henry Oswald
dbe2dd3078
fix case problem with require of newsletter manager
2014-04-10 22:21:20 +01:00
Henry Oswald
5760e51d6e
moved password change to new user controller with tests
2014-04-10 17:15:18 +01:00
Henry Oswald
cc68fe443f
Moved register function into user registration handler and new user
...
controller
2014-04-10 16:32:47 +01:00
Henry Oswald
2ca7c344a3
reformtted reg handler tests
2014-04-10 12:39:13 +01:00
Henry Oswald
e4223c9b5e
fixed test for logout
2014-04-09 17:07:19 +01:00
Henry Oswald
b6b30c3d37
moved logout to new user controller
2014-04-09 16:59:28 +01:00
Henry Oswald
bb7025ad6e
moved user update user settings to user controller
2014-04-09 16:33:54 +01:00
Henry Oswald
bcfc1bee0c
moved unsubscribe endpoint to new user controller
2014-04-09 15:41:19 +01:00
Henry Oswald
0d1421b7ee
fix user deleter test
2014-04-09 15:26:07 +01:00
Henry Oswald
12773c26c2
moved user settings page to the user pages controller
2014-04-09 15:04:47 +01:00
Henry Oswald
823f4a5eb9
created new UserController and put delete user in it
2014-04-09 14:50:12 +01:00
Henry Oswald
37fb959b00
renamed UserController to UserInfoController
2014-04-09 14:45:46 +01:00
Henry Oswald
c55c5032b0
moved delete user to the user controller
2014-04-09 14:43:08 +01:00
Henry Oswald
5f72f13528
moved password reset to user pages controller
2014-04-09 12:26:59 +01:00
Henry Oswald
434fca8874
moved login page to new user page controller
2014-04-09 12:22:57 +01:00
Henry Oswald
fa36891faf
moved register page to new UserPagesController
2014-04-09 12:17:50 +01:00
Henry Oswald
47fb623c4b
dont call enable versioning on join project
2014-04-09 11:45:57 +01:00
Henry Oswald
cba3644777
updated building proj from template, no longer suport other domains and work in different envs
2014-04-09 08:24:23 +01:00
Henry Oswald
88ba45b9dc
moved load project from old proj controller to new one
2014-04-08 17:44:31 +01:00
Henry Oswald
a6bd916fbf
refactored project list, and updated sig for findAllUsersProjects to include err
2014-04-08 16:56:34 +01:00
Henry Oswald
0c921d9188
moved project list to new project controller and added tests
2014-04-08 16:40:12 +01:00
Henry Oswald
15bddae931
moved new project from old proj controller to new one with test
2014-04-08 15:25:27 +01:00
Henry Oswald
6f84f4214f
moved clone project from old proj controller to new one with test
2014-04-08 14:53:33 +01:00
Henry Oswald
5b757ac7ab
moved delete project from old proj controller to new one with test
2014-04-08 14:34:03 +01:00
Henry Oswald
bc07525d71
broken dropbox endpoints for user into its own controller
2014-04-07 21:49:22 +01:00
Henry Oswald
430cf5cea8
created CollaboratorsHandler
2014-04-07 20:46:58 +01:00
Henry Oswald
ff88849444
added a change privlage level for user to new collab handler, won't work yet but is starting point
2014-04-07 16:54:51 +01:00
Henry Oswald
fa78db5c59
moved setPublicAccessLevel to project details handler
2014-04-07 16:07:44 +01:00
Henry Oswald
d229269a69
moved rename project to project details handler
2014-04-07 15:37:40 +01:00
Henry Oswald
9134fa7b4c
moved deleteProject to the project deleter
2014-04-07 13:47:10 +01:00
Henry Oswald
5378890e57
moved rename entity to proj entity handler
2014-04-07 12:18:24 +01:00
Henry Oswald
2288591bae
updated tpds background tests
2014-04-05 12:21:34 +01:00
Henry Oswald
90eac4d52c
moved setRootDoc from collab manager to editor controller
2014-04-04 16:59:45 +01:00
Henry Oswald
7c10b5cd24
moved setPublicAccessLevel from collab manager to editor controller
2014-04-04 16:53:59 +01:00
Henry Oswald
08d1eeba78
moved renameProject from collab manager to editor controller
2014-04-04 16:49:44 +01:00
Henry Oswald
d684f04d4f
moved moveEntity from collab manager to editor controller
2014-04-04 16:40:53 +01:00
Henry Oswald
88e47bbe12
moved renameEntity from collab manager to editor controller
2014-04-04 16:35:02 +01:00
Henry Oswald
3983e77b73
move deleteProject from collab manager to editor controller
2014-04-04 16:21:30 +01:00
Henry Oswald
615e05cb89
moved newsletter manager into its own feature
2014-04-04 15:47:27 +01:00
Henry Oswald
479b37a48c
null check user when getting user id from session
2014-04-02 15:56:54 +01:00
James Allen
9f966996be
Monkey patch request in smoke tests to work around secnding secure cookie over HTTP
2014-04-01 12:53:16 +01:00
Henry Oswald
d41807e667
changed smoke test message
2014-04-01 11:14:31 +01:00
Henry Oswald
eabd440bb6
fixed a couple of tests which broke after async upgrade
2014-03-31 18:05:33 +01:00
James Allen
6318d9ace1
Return features along with project details
2014-03-28 12:47:15 +00:00
James Allen
767b220fab
Allow CLSI cache to be cleared from within the editor
2014-03-27 17:00:41 +00:00
Henry Oswald
ba1371744b
deal with users who may have been deleted but are still inside a subscription group
2014-03-25 16:19:30 +00:00
James Allen
dc2dfaa66c
Flush project to track changes when leaving
2014-03-22 09:34:43 +00:00
Henry Oswald
04bdde4d0d
added logging around publishing templates and changed another templates-api -> templates
2014-03-20 12:53:23 +00:00
Henry Oswald
fc2b42400f
Merge pull request #54 from cwoac/nodemailer-passthrough
...
Nodemailer passthrough
2014-03-18 13:09:14 +00:00
James Allen
498e0d4787
Fix unit tests
2014-03-14 11:56:15 +00:00
Henry Oswald
b7104a82e9
added null check when filtering elements
2014-03-12 22:44:15 +00:00
Henry Oswald
e7f8d11e45
added checks on error and response status code for smoke tests to make them easier to follow in logs
2014-03-12 22:29:44 +00:00
Oliver Matthews
efbb17a3b9
move all parameter handling to nodemailer.
2014-03-12 15:38:40 +00:00
James Allen
be64b510e8
Support the new update format from the track changes api
2014-03-11 18:01:14 +00:00
James Allen
afb8bb6a42
Add in restore button to track changes
2014-03-11 12:14:52 +00:00
Henry Oswald
e7602321e9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf
fixed has subscription check causing bad redirects
...
subscription != recurlySubscription
2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208
converted all analytics to use new google analytics, removing mixpanel
...
and heap. Not tracking subscriptions or cancelations yet.
2014-03-08 19:00:26 +00:00
Oliver Matthews
8989284e10
move from node-ses to nodemailer
2014-03-07 14:08:21 +00:00
James Allen
9851321429
Merge branch 'track_changes_integration'
2014-03-07 13:17:30 +00:00
Henry Oswald
38d3bbb556
changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future
2014-03-06 12:28:07 +00:00
James Allen
0468cbc300
Add in proxy to track changes api
2014-03-05 16:31:52 +00:00
Henry Oswald
ffe690afa3
hooked up lifetime emails
2014-03-05 14:56:52 +00:00
Henry Oswald
a9327cb7c5
replyTo is overridable when sending email
2014-03-05 13:33:41 +00:00
Henry Oswald
3c18cc5553
email sending options are configurable from settings
2014-03-05 11:31:40 +00:00
Henry Oswald
5bacb2d784
added settings check on sending lifcycle emails out
2014-03-05 11:22:52 +00:00
Henry Oswald
eb92e5832b
renamed email templator -> email builder
2014-03-05 11:22:34 +00:00
Henry Oswald
360fac9510
setup basic new email feature which is tested, not linked up to real
...
events yet
2014-03-04 18:10:06 +00:00
Henry Oswald
67e9d0724d
increased auto compile limits
2014-03-04 15:29:45 +00:00
Henry Oswald
99dc141693
deleteing user account cancels any subscription
2014-03-03 16:22:55 +00:00
Henry Oswald
dd22f1f7a1
added redis connection settings into rate limiter
2014-03-03 11:46:40 +00:00
Henry Oswald
ff8320bce0
added new rate limit file based on redback. converetd auto compile to
...
use it.
2014-02-28 17:59:54 +00:00
Henry Oswald
303a0e985b
improved the publish button process so it talks to the templates-api and lets the user know what is going on
2014-02-27 17:35:35 +00:00
Henry Oswald
029077fe6e
downloading a file now sets the filename in header correctly
2014-02-20 22:33:12 +00:00
Henry Oswald
65f849aad0
fixed bug where file uploader was calling cb on read stream not write stream, race condition created.
2014-02-14 18:13:22 +00:00
James Allen
8715690ce9
Intial open source comment
2014-02-12 10:23:40 +00:00