Commit graph

1994 commits

Author SHA1 Message Date
Shane Kilkelly
eca4c46f7f WIP: refactor 2016-09-05 16:23:37 +01:00
Shane Kilkelly
ab2c1e82fb WIP: refactor 2016-09-05 15:58:31 +01:00
Shane Kilkelly
e6c7aa25ec barely functional login and logout 2016-09-05 10:28:47 +01:00
Shane Kilkelly
51e987b3b6 Merge branch 'master' into sk-passport 2016-09-02 16:29:07 +01:00
Brian Gough
ab2fe1de97 fix unclosed brace in template 2016-09-02 16:20:16 +01:00
Shane Kilkelly
e4f4325150 Basic passport integration 2016-09-02 16:17:37 +01:00
Henry Oswald
8002930270 don't use mathjax for cdn 2016-09-01 13:51:50 +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
Henry Oswald
bbb319f235 Merge pull request #307 from sharelatex/pr-empty-proj-list-dropdown
Empty project list dropdown
2016-08-31 15:47:30 +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
Paulo Jorge Reis
70adae7a5b Merge pull request #308 from sharelatex/pr-hide-sign-up-plans-page
Hide "sign up" button in plans page, if user is logged in
2016-08-31 14:12:39 +01:00
Shane Kilkelly
1d83524853 Add a <code> block to autocomplete_references.
Use unescaped interpolation.
2016-08-31 13:54:51 +01:00
Shane Kilkelly
f849bf6d4c Add Autocomplete descriptions to hotkeys 2016-08-31 13:31:04 +01:00
Paulo Reis
bba39cc902 Also hide button, when viewing student plans. 2016-08-31 11:40:27 +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
Paulo Reis
09c188030c Hide sign up button via visibility, to keep the layout fixed. 2016-08-30 17:42:23 +01:00
Brian Gough
c44f33ce99 allow negative values for synctex positions 2016-08-30 16:45:21 +01:00
Paulo Reis
8c7b9edd21 Remove AB-related logic from template and controller. 2016-08-30 16:10:04 +01:00
Paulo Reis
e3fe4a2eeb Rename empty projects list file, do some clean-up. 2016-08-30 16:07:31 +01:00
Paulo Reis
2885164748 Isolate create project dropdown styles, to avoid influencing other dropdowns. 2016-08-30 15:32:23 +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