James Allen
e36be96ec9
Move public access setting to its own end point
2016-03-10 11:13:57 +00:00
James Allen
4f9f255153
Extend acceptance tests to include shared projects
2016-03-09 12:31:46 +00:00
Shane Kilkelly
8f2d2cfeff
Merge branch 'ja_email_tokens' of github.com:sharelatex/web-sharelatex into ja_email_tokens
2016-03-08 14:38:31 +00:00
Shane Kilkelly
3e423b8a06
Another find->findOne
2016-03-08 14:38:25 +00:00
James Allen
e53fc5f0b6
Remove dead code (Project.findPopulatedById)
2016-03-08 14:20:53 +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
b64c8e3d78
Delete dead code in User model
2016-03-08 12:07:50 +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
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
71ca358e0e
Show confirmation if upload will overwrite files
2016-02-24 16:37:03 +00:00
James Allen
c6dcb64b18
Overwrite text files from uploads
2016-02-24 16:37:03 +00:00
James Allen
2c20b7d16f
Bring full screen PDF icon into scrollable div
2016-02-23 15:25:04 +00:00
James Allen
ff7632d6c7
Don't reload editor with file tree or PDF viewer hidden
2016-02-23 15:21:54 +00:00
Henry Oswald
b504732733
fixed calls to addUserToGroup and added more logging
2016-02-22 16:50:41 +00:00
Henry Oswald
103bb1c88f
add more error logging to group handler
2016-02-22 16:01:26 +00:00
Henry Oswald
85a8bc97ed
add leave group button for group subscriptions
2016-02-19 12:27:32 +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
James Allen
bf36413491
Improve styling of upgrade messages
2016-02-18 14:53:49 +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
c8084406d3
user notifications auto created on login for joinging groups
2016-02-17 16:24:09 +00:00
Henry Oswald
8a417035ea
remove unned debug line
2016-02-17 16:23:52 +00:00
Henry Oswald
735f7bd51e
change res.send to res.sendStatus for new express
2016-02-16 12:38:27 +00:00
Henry Oswald
f5910762c1
fixed missign translation for when email is already registered
2016-02-16 12:38:27 +00:00
James Allen
b3a2d44937
next -> callback
2016-02-16 11:12:07 +00:00
Henry Oswald
87ef2cc563
Merge branch 'nodemailer2'
2016-02-15 14:52:58 +00:00
Henry Oswald
ef148da7aa
remove un needed require
2016-02-12 17:15:13 +00:00
Henry Oswald
05bf048885
upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending
...
on what is in settings file
2016-02-12 17:13:45 +00:00
James Allen
e4960e782f
Merge branch 'ja-multi-select'
2016-02-12 11:56:10 +00:00
Henry Oswald
0538ca2de5
added box shadow to notifications alert and made it info
2016-02-11 12:34:38 +00:00
Henry Oswald
8e5907f79e
have null array as default for notifications
2016-02-11 12:10:30 +00:00
Henry Oswald
5c5888b5dc
Merge branch 'pr/221'
2016-02-11 11:44:45 +00:00
James Allen
506d2224aa
Allow Cmd+Clicking to multi select entries in the file tree
2016-02-09 15:13:58 +00:00
Shane Kilkelly
326d9e59f8
Refactor ReferencesSearch*
to just References*
.
2016-02-08 17:04:27 +00:00
James Allen
b978171e0c
Fix "cannot set headers after sent" in setting doc end point
...
If somehow a project ends up with the same doc/file in two locations in the
file tree, then projectLocator.findElement will return the callback for
both entries. This then tries to end the request multiple times. Of course
this should never be a state the project is in, but if it is we should catch it.
2016-02-05 15:39:26 +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
a6793be3cf
Improve presentation of hotkeys and add bold+italics
2016-02-04 15:52:38 +00:00
Henry Oswald
f136486f4b
cleanup layout of notifications
2016-02-04 14:28:31 +00:00
James Allen
6143b2218c
Send user_id on Dropbox requests through to doc updater
2016-02-04 14:27:00 +00:00