Henry Oswald
f8799334ec
Merge branch 'master' into ho-jade-speedup
2016-08-23 15:35:04 +01:00
Henry Oswald
114dbf9f3f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-08-23 15:34:55 +01:00
Henry Oswald
d3ebdb64b2
precompile the jade partial views
2016-08-23 15:31:09 +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
Shane Kilkelly
11ec486c13
Merge pull request #300 from sharelatex/pr-subscription-improvements
...
Pr subscription improvements
2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1
Add debug query string origin
to invocations of the updateSubscription endpoint.
2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6
track when users accept invites
2016-08-19 18:33:03 +01:00
Henry Oswald
50b3403983
use url.resolve to build url for freegeoip lookups
2016-08-19 15:39:58 +01:00
Shane Kilkelly
c02854c9d8
Improve log messages
2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64
Add an expect404
option to apiRequest.
...
Suppress error generation when 404 response is encountered.
2016-08-19 11:52:04 +01:00
James Allen
c653f59705
Add error handling to mkdir_p
2016-08-18 17:48:33 +01:00
Shane Kilkelly
4a6df04c21
Merge branch 'master' into pr-subscription-improvements
2016-08-18 12:53:56 +01:00
Shane Kilkelly
ece0491e3d
Refactor. Handle republishing of notifications on resend.
2016-08-17 16:27:15 +01:00
Shane Kilkelly
85f49d6c9c
Make whole 'red button' in email a link
2016-08-17 10:37:44 +01:00
Shane Kilkelly
4805c96584
Merge branch 'master' into pr-email-tokens
2016-08-17 08:52:24 +01:00
Shane Kilkelly
fc068b62a2
defend against undefined plan_code
2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716
Improve error handling
2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3
Add counts to log message
2016-08-16 11:33:14 +01:00
Shane Kilkelly
da40f54d55
Improve logging, add acceptance tests for joinProject json
2016-08-16 11:17:45 +01:00
Shane Kilkelly
b68af254ff
Correct logic for bailing out with no privileges
2016-08-16 09:59:42 +01:00
Brian Gough
7fcae775ee
Merge pull request #297 from sharelatex/roll-out-chktex
...
Roll out chktex
2016-08-16 09:48:01 +01:00
Shane Kilkelly
d2183738c5
Improve logging for debugging
2016-08-16 09:04:11 +01:00
Brian Gough
8d6cdb03e8
restrict compile check options
...
allowed options are validate/error/silent
validate = only run chktex, exit status 0
error = run compilation, exit(1) if chktex fails
silent = run chktex, but always do full compilation
2016-08-15 16:46:53 +01:00
Shane Kilkelly
36d969e6e6
Set invites to be an empty array if missing
2016-08-15 15:22:23 +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
ce039f8cd3
Remove the email when user id is added to project
2016-08-11 14:17:01 +01:00
Paulo Reis
9bf9df9a4a
Track login events.
2016-08-11 14:09:45 +01:00
Shane Kilkelly
826295167f
Mark Notification as read by key alone
2016-08-11 14:04:11 +01:00
Paulo Reis
6a210978fe
Track registration events.
2016-08-11 12:29:58 +01:00
James Allen
0270d34d0f
Use JSONB not JSON column type
2016-08-11 10:19:07 +01:00
James Allen
4886e8ba0e
Rename metadata -> segmentation in Events table to play well with metabase
2016-08-10 17:22:35 +01:00
James Allen
056bb6b0f4
Use a JSON column for metadata
2016-08-10 17:17:59 +01:00
James Allen
93cd511211
Send events to custom DB backend
2016-08-10 16:42:56 +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
9b46c1b1f7
WIP: notification when user is sent an invite
2016-08-05 16:11:03 +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
092c036406
Rate-limit calls to invite api
2016-08-04 09:50:47 +01:00
Shane Kilkelly
721ea88bd0
If email is already invited, resend the invite
2016-08-03 16:30:34 +01:00
Shane Kilkelly
a5ddcc3df7
Allow resending of invites
2016-08-03 15:42:19 +01:00
Shane Kilkelly
e7251aab53
Small wording changes
2016-08-03 14:06:08 +01:00
Shane Kilkelly
6ea690225f
Refactor view-invite to not use model calls.
2016-08-03 10:23:34 +01:00
Henry Oswald
892511820e
fix logging on groupPlan invite notification
2016-08-02 17:09:42 +01:00
Shane Kilkelly
3a3688d3d0
Include invites count in canAddXCollaborators
2016-08-02 15:42:50 +01:00
Shane Kilkelly
2494026b85
Move Helpers/EmailHelpers to Helpers/EmailHelper
2016-08-02 15:42:26 +01:00