Henry Oswald
67f8ec756c
Revert "wip"
...
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
2016-09-23 16:19:11 +01:00
Henry Oswald
5c2fbaafd3
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-09-23 15:45:42 +01:00
Henry Oswald
0802ab6ddc
wip
2016-09-23 15:44:47 +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
James Allen
d904e50041
Make project invite notification dynamic and accept via ajax request
...
Needs translations:
"joining": "Joining",
"notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>",
"notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>",
"open_project": "Open Project"
2016-09-21 11:59:35 +01:00
James Allen
a93c939dbc
Send invite email and notification in the background
2016-09-21 10:11:35 +01:00
James Allen
c2e14ded13
Add null checks for fileRefs and docs, which are not present when calling mkdirp
2016-09-20 16:55:12 +01:00
Henry Oswald
1a67e4982e
change blog regex to look for src's which start with a slash
2016-09-20 15:43:36 +01:00
Henry Oswald
d4863ae148
don't use cdn for blog posts which have a http on them
2016-09-20 14:48:35 +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
Brian Gough
ebe3ba4fb8
Merge pull request #316 from sharelatex/pdfjs-font-patch
...
Pdfjs font patch
2016-09-19 11:24:50 +01:00
Brian Gough
64dc1784d3
switch to patched version of pdfjs
2016-09-19 11:15:27 +01:00
James Allen
c9a17982cf
Add canonical url tag and don't include query string
2016-09-14 17:08:26 +01:00
James Allen
53b3e3831d
Update cancellation survey link
2016-09-14 10:51:19 +01:00
James Allen
cc9791d3f4
Redirect to login with a redirect back to the page we want if not logged in
2016-09-13 11:23:47 +01:00
Brian Gough
1592ca7623
Merge pull request #309 from sharelatex/fix-compile-check
...
clean up compile check
2016-08-31 16:27:36 +01:00
Brian Gough
e82411ac79
clear serverid on every compile check
2016-08-31 16:10:24 +01:00
Brian Gough
b95a2c6d04
clean up compile check
...
use a valid user id, report all failures as errors, clear timeout on
success
2016-08-31 15:21:23 +01:00
Shane Kilkelly
47b1a5099a
Better logging when plan is null.
2016-08-31 10:40:30 +01:00
Shane Kilkelly
f59d5d836d
Check plan, return error if not valid.
...
This prevents a crash later when we refer to properties
of the plan object, which can end up being `null` when
the `planCode` is either missing, or not a valid code.
2016-08-31 10:18:53 +01:00
Shane Kilkelly
1b29e0e8ec
Merge branch 'master' of github.com:sharelatex/web-sharelatex
...
# Conflicts:
# app/coffee/Features/Notifications/NotificationsBuilder.coffee
2016-08-31 09:48:19 +01:00
Henry Oswald
960ed520b6
fix notifications builder @key bug
2016-08-31 09:42:43 +01:00
Shane Kilkelly
1399ee4689
Fix reference to @key in log expression.
2016-08-31 09:34:20 +01:00
Brian Gough
c44f33ce99
allow negative values for synctex positions
2016-08-30 16:45:21 +01:00
Shane Kilkelly
4a76fcd13b
Change first param of getMemberSubscriptions to user_or_id, to match semantics of usage.
...
This function works whether a user object, or an ObjectId is passed, but the `user_id`
param name is confusing.
2016-08-30 14:26:57 +01:00
Henry Oswald
cbb4ee88cc
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-08-30 13:08:09 +01:00
Henry Oswald
ddc0023c64
make forceCreate the default for creating notifications
2016-08-30 13:07:37 +01:00
Henry Oswald
8c18153d5c
Merge pull request #304 from sharelatex/ho-jade-speedup
...
Ho jade speedup
2016-08-30 12:47:08 +01:00
Henry Oswald
26a4076c22
add redirect to /i/university for ab test
2016-08-25 10:48:29 +01:00
Henry Oswald
3f4e888af5
Merge pull request #305 from sharelatex/cdnfallback
...
don't use cdn if it can not be accessed
2016-08-24 09:45:14 +01:00
Henry Oswald
934e908697
just use plain req.ip for logging
2016-08-23 17:00:13 +01:00
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
Henry Oswald
d8e7bacec4
added logging in
2016-08-19 11:53:40 +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
Henry Oswald
3d36dc7d6c
mvp for not using cdn when blocked
2016-08-19 11:05:35 +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
