Shane Kilkelly
|
4cc4a4e264
|
Merge branch 'master' into sk-post-login-redirect
|
2016-11-24 14:02:38 +00:00 |
|
Shane Kilkelly
|
22101d0305
|
If user is sent to login page with explicit redirect, obey
|
2016-11-24 11:38:13 +00:00 |
|
Paulo Jorge Reis
|
ff0a5395e5
|
Merge pull request #374 from sharelatex/pr-wrap-ab-test-header
PR Wrap header labels AB test
|
2016-11-23 09:49:53 +00:00 |
|
Shane Kilkelly
|
f9b1862ddb
|
Merge branch 'master' into sk-post-login-redirect
|
2016-11-22 16:54:12 +00:00 |
|
Shane Kilkelly
|
2edd75de96
|
Allow the 500/Error page to render, even if res.locals aren't set up yet.
|
2016-11-22 16:48:13 +00:00 |
|
Shane Kilkelly
|
8089bb55a4
|
use session for the post-login redirect, remove redir query string.
|
2016-11-22 14:24:36 +00:00 |
|
Paulo Reis
|
dce272462a
|
Remove test-related mark-up.
|
2016-11-22 10:39:56 +00:00 |
|
Shane Kilkelly
|
3b8fbe8249
|
If using external auth, show non-editable email field.
Also defend server-side against setting email when using external auth.
|
2016-11-17 14:34:02 +00:00 |
|
Henry Oswald
|
d87067bc2f
|
Merge branch 'announcments'
|
2016-11-15 10:38:01 +00:00 |
|
Henry Oswald
|
e397b76fba
|
commended out jade so can go live with rest of code quietly
|
2016-11-14 10:54:36 +00:00 |
|
Henry Oswald
|
47ed17aab3
|
remove unneeded package and comma in jade
|
2016-11-14 10:50:49 +00:00 |
|
Henry Oswald
|
5a13ee1077
|
use anlaytis api
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
|
2016-11-11 17:03:09 +00:00 |
|
Brian Gough
|
6f41dddb42
|
disable spell check for anonymous users
these requests always fail
|
2016-11-04 16:03:18 +00:00 |
|
Brian Gough
|
307f08e6bb
|
Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down
lock editor when connection down
|
2016-11-04 11:04:30 +00:00 |
|
Brian Gough
|
49a06f8489
|
modal for lost connection
|
2016-11-03 12:37:44 +00:00 |
|
James Allen
|
091eb7e462
|
Merge branch 'master' into ja-review-panel
Conflicts:
public/coffee/ide.coffee
public/stylesheets/app/editor.less
|
2016-11-03 10:07:37 +00:00 |
|
Paulo Reis
|
559350eaa2
|
Avoid showing the history upgrade teaser when user is not the project owner.
|
2016-11-02 16:08:47 +00:00 |
|
Paulo Jorge Reis
|
74d8fb103b
|
Merge pull request #358 from sharelatex/pr-latex-linter-onboarding
Code-checker onboarding
|
2016-11-02 13:58:06 +00:00 |
|
Henry Oswald
|
fde9ab60cc
|
remove left-menu-upgraed-rotation ab test
|
2016-11-02 10:24:03 +00:00 |
|
Henry Oswald
|
11a097c9a6
|
remove some old sixpack tests
|
2016-11-02 10:09:12 +00:00 |
|
Shane Kilkelly
|
a63f7685b8
|
Move the planCode logic for Collaborator into a helper function.
|
2016-11-02 09:56:33 +00:00 |
|
Paulo Reis
|
c18114bfeb
|
Different strategy for highlighting the code-check setting.
|
2016-11-01 17:30:27 +00:00 |
|
Paulo Reis
|
8c182c2ccd
|
Show code-check option for non-beta users.
|
2016-11-01 15:26:26 +00:00 |
|
Brian Gough
|
585f8681ea
|
enable syntax validation for all users
(by defining aceWorker)
|
2016-11-01 15:02:32 +00:00 |
|
Paulo Reis
|
06629e05d4
|
Include teaser media and do some style adjustments.
|
2016-11-01 11:36:21 +00:00 |
|
Paulo Reis
|
aa58b70d43
|
Improve visibility logic.
|
2016-10-31 20:18:08 +00:00 |
|
James Allen
|
8368577867
|
Merge branch 'master' into ja-review-panel
Conflicts:
app/views/project/editor/editor.jade
public/coffee/ide.coffee
public/coffee/ide/editor/directives/aceEditor.coffee
|
2016-10-31 16:42:55 +00:00 |
|
Paulo Reis
|
97b92928dc
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-28 16:36:10 +01:00 |
|
Paulo Reis
|
4721fd450c
|
Improve condition to avoid linking sixpack directives when project loads.
|
2016-10-28 14:40:04 +01:00 |
|
Paulo Reis
|
8157f68393
|
Avoid linking sixpack directives when project loads.
|
2016-10-28 14:23:16 +01:00 |
|
Shane Kilkelly
|
5c8cdd22cc
|
Merge branch 'sk-account-delete-pass'
|
2016-10-28 11:02:41 +01:00 |
|
Shane Kilkelly
|
164c8a091f
|
Move the scripts block after jQuery has been loaded and CDN logic.
Fixes issue on the update-billing-info page.
|
2016-10-28 10:18:20 +01:00 |
|
Paulo Reis
|
1c4183e7b1
|
Merge branch 'master' into pr-ab-test-history-teaser
|
2016-10-27 12:35:11 +01:00 |
|
Paulo Reis
|
5dddbec5b2
|
Add AB test conversion.
|
2016-10-27 12:06:36 +01:00 |
|
Paulo Reis
|
991626692b
|
Track subscriptions in metabase with AB test variant.
|
2016-10-27 12:05:32 +01:00 |
|
Paulo Reis
|
5a82cebcff
|
Make the history teaser message look like a modal.
|
2016-10-27 11:12:22 +01:00 |
|
Paulo Reis
|
04f8b3adfa
|
Adapt mark-up to history teaser, add some styles.
|
2016-10-27 10:30:10 +01:00 |
|
Paulo Reis
|
b5494c1730
|
Basic test mark-up structure.
|
2016-10-26 15:48:03 +01:00 |
|
Shane Kilkelly
|
d912c3b487
|
Merge branch 'master' into sk-plans-tidy
|
2016-10-26 13:47:26 +01:00 |
|
Paulo Reis
|
70c7880639
|
Style adjustments.
|
2016-10-26 11:12:34 +01:00 |
|
Shane Kilkelly
|
7cc26f2207
|
Disable autocomplete on user-delete form
|
2016-10-26 10:57:54 +01:00 |
|
Shane Kilkelly
|
1c8721ceab
|
Functioning account deletion with password
|
2016-10-25 16:23:50 +01:00 |
|
Paulo Reis
|
f4849201aa
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-25 15:00:26 +01:00 |
|
Shane Kilkelly
|
efe6df145c
|
WIP: ask for password when deleting account
|
2016-10-25 14:33:47 +01:00 |
|
Brian Gough
|
a02d245b78
|
added missing dependency on ace/ace for modelist
|
2016-10-25 14:16:52 +01:00 |
|
Shane Kilkelly
|
6069d4dba3
|
Merge branch 'master' into sk-plans-tidy
|
2016-10-25 13:14:44 +01:00 |
|
Shane Kilkelly
|
e268275e77
|
Fix participate/convert flow for plan tests
|
2016-10-25 10:47:14 +01:00 |
|
Paulo Reis
|
27dfa91683
|
Add dismiss button.
|
2016-10-24 12:20:15 +01:00 |
|
Shane Kilkelly
|
667c7ce520
|
Show correct number of collaborators for plans
|
2016-10-24 11:47:01 +01:00 |
|
Shane Kilkelly
|
c051b56abf
|
Cloak plans until they have loaded
|
2016-10-24 11:24:28 +01:00 |
|