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 |
|
Brian Gough
|
16e4577ffa
|
Merge pull request #306 from sharelatex/compile-check
Compile check
|
2016-08-30 11:58:04 +01:00 |
|
Brian Gough
|
3c59de31df
|
finalise display of syntax check error message
|
2016-08-26 15:14:57 +01:00 |
|
Brian Gough
|
696a7206c1
|
clean up display of error message
|
2016-08-25 16:55:29 +01:00 |
|
Brian Gough
|
9a1934465a
|
clean up syntax check options on menu
|
2016-08-25 15:51:56 +01:00 |
|
Henry Oswald
|
26a4076c22
|
add redirect to /i/university for ab test
|
2016-08-25 10:48:29 +01:00 |
|
Brian Gough
|
74bc157e7c
|
added force recompile option
|
2016-08-24 16:48:37 +01:00 |
|
Paulo Reis
|
c82ab65077
|
Bind to an object to avoid writing in different .
|
2016-08-24 11:02:53 +01:00 |
|
Paulo Jorge Reis
|
f4aab93dfa
|
Merge pull request #303 from sharelatex/pr-ab-subscription-form
PR AB Subscription form
|
2016-08-24 09:45:36 +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
|
fcc7585444
|
put jquery as first script in head tag
|
2016-08-23 16:58:39 +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 |
|
Paulo Reis
|
ba71ed2a3d
|
Merge branch 'master' into pr-ab-subscription-form
|
2016-08-23 14:10:19 +01:00 |
|
Paulo Reis
|
8abf839d55
|
Add country to the paypal form.
|
2016-08-23 13:36:54 +01:00 |
|
Paulo Reis
|
bc16999a4e
|
Validate on blur; reset validation on focus.
|
2016-08-23 11:55:23 +01:00 |
|
Paulo Reis
|
f79bee7893
|
Loading indicator when submitting.
|
2016-08-23 11:27: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 |
|
Paulo Reis
|
23ed1e2aa3
|
Add form validation.
|
2016-08-22 17:03:29 +01:00 |
|
Paulo Reis
|
2f93a102fd
|
Fix layout to support scrollable messages.
|
2016-08-22 16:12:29 +01:00 |
|
Paulo Reis
|
a9095ccde8
|
Disable filter which wraps long words, still buggy.
|
2016-08-22 14:54:07 +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 |
|
Paulo Reis
|
92bc411df5
|
Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form
|
2016-08-19 16:48:33 +01:00 |
|
Paulo Reis
|
f4b8cc7fc8
|
Use first and last name instead of full name as input.
|
2016-08-19 16:46:44 +01:00 |
|
Paulo Reis
|
53c6e48da9
|
Remove left-hand panel experiment.
|
2016-08-19 16:03:15 +01:00 |
|
Henry Oswald
|
110820face
|
use url.resolve to build url for freegeoip lookups
|
2016-08-19 15:40:54 +01:00 |
|
Henry Oswald
|
50b3403983
|
use url.resolve to build url for freegeoip lookups
|
2016-08-19 15:39:58 +01:00 |
|
Paulo Reis
|
6a1f0de912
|
Add i18n keys.
|
2016-08-19 15:12:05 +01:00 |
|
Paulo Reis
|
452abe94be
|
Add coupon code, VAT and pricing breakdown. Styling adjustments.
|
2016-08-19 14:51:07 +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 |
|
Paulo Reis
|
26e21732f8
|
Added validations + minor fixes.
|
2016-08-18 17:41:55 +01:00 |
|
Paulo Reis
|
43b832965f
|
Layout and styling for simple subscription form.
|
2016-08-18 16:56:23 +01:00 |
|
Shane Kilkelly
|
4a6df04c21
|
Merge branch 'master' into pr-subscription-improvements
|
2016-08-18 12:53:56 +01:00 |
|
Paulo Reis
|
4814fc2606
|
Simple layout for subscription form.
|
2016-08-17 17:34:17 +01:00 |
|
Shane Kilkelly
|
ece0491e3d
|
Refactor. Handle republishing of notifications on resend.
|
2016-08-17 16:27:15 +01:00 |
|