Henry Oswald
|
3eb13ccdd1
|
fix stupid mistake
|
2017-01-25 10:38:39 +00:00 |
|
Henry Oswald
|
2a00b9c7a2
|
use user._id for error log
|
2017-01-25 10:33:30 +00: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 |
|
Shane Kilkelly
|
0add3ed66e
|
Merge branch 'master' into sk-upgrade-uuid
|
2017-01-23 10:04:31 +00:00 |
|
Shane Kilkelly
|
abbffb8e4b
|
Remove deprecated node-uuid package, replace with uuid .
|
2017-01-23 10:03:16 +00:00 |
|
Henry Oswald
|
9153ffac41
|
limit project name in email to 40 chars
|
2017-01-21 12:58:16 +00:00 |
|
Henry Oswald
|
74240e28c7
|
rate limit via ip the number of invite to project requests
|
2017-01-21 12:44:09 +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 |
|
Shane Kilkelly
|
cfa2777d62
|
Merge branch 'sk-launchpad'
|
2017-01-20 13:58:16 +00:00 |
|
Shane Kilkelly
|
57cd54bf55
|
WIP: migrate from jade to pug
|
2017-01-20 12:03:02 +00:00 |
|
Shane Kilkelly
|
8922c9dbf5
|
New email layout for "testEmail"
|
2017-01-18 15:28:51 +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
|
707838baa4
|
Merge branch 'master' into sk-launchpad
|
2017-01-17 16:25:59 +00:00 |
|
Shane Kilkelly
|
59ab66fca2
|
Fix double-callback
|
2017-01-17 16:25:18 +00:00 |
|
James Allen
|
5a34d17947
|
Toggle track changes in a project based on the owner's feature switch
|
2017-01-17 15:59:18 +01:00 |
|
Shane Kilkelly
|
d7251c6bfe
|
Merge branch 'master' into sk-launchpad
|
2017-01-17 14:55:08 +00:00 |
|
Shane Kilkelly
|
1137ab0715
|
Don't record redirect to static asset paths
|
2017-01-17 14:35:37 +00:00 |
|
Shane Kilkelly
|
70c7e32e58
|
Add a 'testEmail' email type
|
2017-01-17 10:52:04 +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 |
|
Henry Oswald
|
fed88504f8
|
rate limit emails sent sharing projects by users
|
2017-01-14 14:52:32 +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 |
|
Henry Oswald
|
daee77f052
|
Merge pull request #387 from sharelatex/pr-email-template-improvements
Email template improvements
|
2017-01-12 12:34:35 +00:00 |
|
James Allen
|
f9b8ada215
|
track changes for anonymous users
|
2017-01-12 13:29:57 +01:00 |
|
James Allen
|
64b9fe52dd
|
Handle deleted users in comments gracefully
|
2017-01-12 12:31: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
|
f31fa98679
|
Sync track changes state between sessions and client
|
2017-01-10 16:11:12 +01: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
|
43f6b9de7c
|
Inform other clients when we accept a change
|
2017-01-09 15:54:12 +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 |
|
Henry Oswald
|
862e15b842
|
log out user id and anonymous when loading editor
|
2017-01-05 15:02:10 +00:00 |
|
James Allen
|
84d9b2aa49
|
Save resolve and reopened state
|
2017-01-04 16:26:02 +01:00 |
|
Shane Kilkelly
|
259c589076
|
Add option to restrict invites to existing user accounts.
|
2016-12-20 09:54:42 +00:00 |
|
Shane Kilkelly
|
d428f9adbc
|
Make LoginRateLimiter a thin wrapper around RateLimiter
|
2016-12-19 14:10:51 +00:00 |
|
Shane Kilkelly
|
9f787943b6
|
Remove stray redis imports.
|
2016-12-19 12:17:23 +00:00 |
|
Paulo Reis
|
d6fcc21ab5
|
Add support for GMail go-to actions in the single CTA template.
|
2016-12-16 17:04:26 +00:00 |
|
James Allen
|
988005e929
|
Send and get comments via the chat api
|
2016-12-16 16:42:41 +00:00 |
|
Paulo Reis
|
869f729132
|
Fix forgotten templating function.
|
2016-12-16 15:15:06 +00:00 |
|
Paulo Reis
|
ca5040882f
|
Use the new template in the join group email.
|
2016-12-16 14:57:59 +00:00 |
|
Paulo Reis
|
0fe3664a82
|
Use the new template in the reset pwd email.
|
2016-12-16 12:16:45 +00:00 |
|
Paulo Reis
|
2234c438a1
|
Support a secondary message in the single CTA email template.
|
2016-12-16 12:16:33 +00:00 |
|
Paulo Reis
|
7dfc2c61a6
|
Make the CTA button text configurable.
|
2016-12-16 10:06:56 +00:00 |
|
Paulo Reis
|
47a5eb5382
|
Add a new layout and body template for e-mails.
|
2016-12-15 17:22:39 +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
|
a5d2183441
|
if Recurly error, parse body xml rather than using regex match
|
2016-12-06 10:39:59 +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 |
|
Henry Oswald
|
68ddf04fe8
|
to string record event check
|
2016-11-29 14:38:45 +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
|
395135a655
|
Merge branch 'sk-post-login-redirect'
|
2016-11-28 09:52:14 +00:00 |
|
Shane Kilkelly
|
acce8853ba
|
Remove redundant baseUrl from plans page.
|
2016-11-25 15:24:50 +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 |
|
Henry Oswald
|
4b59fdd453
|
added missing settings file to announcments controller
|
2016-11-25 11:59:50 +00:00 |
|
Henry Oswald
|
f130470971
|
log ip address of user when logging in
|
2016-11-25 11:59:50 +00:00 |
|
Shane Kilkelly
|
167f01857a
|
Remove stray next params.
|
2016-11-24 14:15:01 +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
|
cee3326ce3
|
fix omission of 'length'
|
2016-11-22 17:06:05 +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
|
fa146a1558
|
Remove redundant !!
|
2016-11-17 14:48:15 +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 |
|
Shane Kilkelly
|
f9774141b1
|
Fix up makeRequest, so it copes with analytics.url being un-configured.
|
2016-11-16 14:40:38 +00:00 |
|
Henry Oswald
|
5b3cd7ed2b
|
use makeRequest func in analytics manager
|
2016-11-15 15:36:26 +00:00 |
|
Henry Oswald
|
a822cc0c92
|
don't log events from health check user
|
2016-11-15 13:41:15 +00:00 |
|
Henry Oswald
|
6776aa61f1
|
use new way to send status in express for healthcheck controlller
|
2016-11-15 11:04:13 +00:00 |
|
Henry Oswald
|
411b5324df
|
don't try and send requests when analytics isn't enabled
|
2016-11-15 10:54:48 +00:00 |
|
Henry Oswald
|
d87067bc2f
|
Merge branch 'announcments'
|
2016-11-15 10:38:01 +00:00 |
|
Henry Oswald
|
15564102a0
|
Update ProjectController.coffee
|
2016-11-15 10:34:57 +00:00 |
|
Henry Oswald
|
666bfdf967
|
stop the /announcements call at controller level
|
2016-11-11 17:15:36 +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
|
c3860dd7a7
|
Remove stray commented-out code, use mapSeries instead of map.
|
2016-11-09 14:36:25 +00:00 |
|
Shane Kilkelly
|
f6de4cbb44
|
Merge branch 'master' into sk-sessions-cluster
|
2016-11-09 12:10:46 +00:00 |
|
Shane Kilkelly
|
5f3098df38
|
Replace multi-ops with Async.series, tests passing
|
2016-11-09 11:03:03 +00:00 |
|
Shane Kilkelly
|
bfa0e7cf89
|
WIP: start moving web sessions to cluster
|
2016-11-08 15:32:36 +00:00 |
|
David J. Weller-Fahy
|
5efee51ed8
|
Pass ignoreTLS option to nodemailer
|
2016-11-02 13:14:54 -04:00 |
|
Shane Kilkelly
|
e7b09a81a7
|
Merge branch 'sk-passport-ldap'
|
2016-11-02 15:39:32 +00:00 |
|
Paulo Reis
|
840d52ef1a
|
Remove default value from user model, but add it upon creation (i.e. affecting new users).
|
2016-11-01 16:36: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
|
1538f140f3
|
update test timestamp
|
2016-10-27 09:41:51 +01:00 |
|
Shane Kilkelly
|
dfd13e0815
|
Update AB test timestamp
|
2016-10-26 14:24:00 +01:00 |
|