Commit graph

1036 commits

Author SHA1 Message Date
Shane Kilkelly
97a6ac0f00 Merge branch 'master' into sk-passport
# Conflicts:
#	app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee
2016-09-15 14:48:51 +01:00
James Allen
06d67835e4 Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains 2016-09-15 10:21:12 +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
9019b20d50 Preserve line formatting in word count error message 2016-09-14 11:21:00 +01:00
James Allen
a45aa7b80e Show word count error messages 2016-09-13 15:54:25 +01:00
James Allen
1714b014bf Force true or false for userHasNoSubscription, not blank 2016-09-13 10:29:14 +01:00
Shane Kilkelly
b0a10c948c wip refactor 2016-09-06 15:22:13 +01:00
Paulo Reis
afdded702b Use an object instead of a string, to avoid writing to another scope. 2016-09-06 14:59:18 +01:00
Brian Gough
ab2fe1de97 fix unclosed brace in template 2016-09-02 16:20:16 +01:00
Henry Oswald
8002930270 don't use mathjax for cdn 2016-09-01 13:51:50 +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
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
Paulo Reis
09c188030c Hide sign up button via visibility, to keep the layout fixed. 2016-08-30 17:42:23 +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
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
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
fcc7585444 put jquery as first script in head tag 2016-08-23 16:58:39 +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
03aa9b87f1 Add debug query string origin to invocations of the updateSubscription endpoint. 2016-08-22 10:09:54 +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
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
3d36dc7d6c mvp for not using cdn when blocked 2016-08-19 11:05:35 +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
Paulo Reis
4814fc2606 Simple layout for subscription form. 2016-08-17 17:34:17 +01:00
Paulo Reis
672d4f8767 Setup AB test (alternative is still empty). 2016-08-17 12:11:17 +01:00
Shane Kilkelly
c98e473bc3 Fix layout of notifications 2016-08-17 10:31:05 +01:00
Shane Kilkelly
4805c96584 Merge branch 'master' into pr-email-tokens 2016-08-17 08:52:24 +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
d547bff4e5 Blur the resend button after response 2016-08-12 11:25:03 +01:00