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
|
140748d466
|
Remove text-shadow, use stricter box-shadow syntax.
|
2016-11-02 14:38:26 +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
|
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
|
c88cb4574e
|
Support dismissing the dialog just with Enter.
|
2016-11-01 16:17:42 +00:00 |
|
Paulo Reis
|
a91de6c3a5
|
Fix animation for compatibility with display: flex.
|
2016-11-01 15:27:05 +00:00 |
|
Paulo Reis
|
79caa14385
|
Fix logic for showing the onboarding prompt.
|
2016-11-01 15:26:50 +00:00 |
|
Paulo Reis
|
4c94c027b8
|
Styles for better accomodating smaller resolutions. Vertically centering.
|
2016-11-01 14:52:10 +00:00 |
|
Brian Gough
|
b907620fc1
|
clean up whitespace
|
2016-11-01 12:19:29 +00:00 |
|
Brian Gough
|
2461c1b7be
|
add more sl_console debugging to ConnectionManager
|
2016-11-01 12:19:29 +00:00 |
|
Brian Gough
|
e2c66e8d56
|
keep track of reconnect timer
|
2016-11-01 12:19:29 +00:00 |
|
Brian Gough
|
4da9008300
|
rate limit on reconnection attempts (cursor/click)
|
2016-11-01 12:19:29 +00:00 |
|
Brian Gough
|
f894048292
|
fix lastUpdate in ConnectionManager
|
2016-11-01 12:19:29 +00:00 |
|
Brian Gough
|
d57e191ad0
|
use socket.io connect method instead of reconnect
the reconnect method tries 10 times by default, but we want to manage
reconnections ourselves
|
2016-11-01 12:06:41 +00:00 |
|
Brian Gough
|
69e957419d
|
Merge pull request #355 from sharelatex/bg-handle-reconnects
wait for confirmation before sending joinProject
|
2016-11-01 11:50:44 +00:00 |
|
Paulo Reis
|
fda66107a9
|
Turn teaser visibility logic on.
|
2016-11-01 11:46:47 +00:00 |
|
Paulo Reis
|
06629e05d4
|
Include teaser media and do some style adjustments.
|
2016-11-01 11:36:21 +00:00 |
|
Paulo Reis
|
2c78b5967f
|
Fix settings logic.
|
2016-11-01 11:36:05 +00:00 |
|
Paulo Reis
|
9418d9ea6a
|
Add code checker teaser media.
|
2016-11-01 11:35:46 +00:00 |
|
Brian Gough
|
35259bf9b7
|
send joinProject after connectionAccepted
|
2016-11-01 11:17:36 +00:00 |
|
Paulo Reis
|
aa58b70d43
|
Improve visibility logic.
|
2016-10-31 20:18:08 +00:00 |
|
Paulo Reis
|
31697bd1e2
|
Add lightbox shadows.
|
2016-10-31 20:17:58 +00:00 |
|
James Allen
|
11c24377cb
|
fix JSONstringifyWithCycles
|
2016-10-31 16:57:29 +00:00 |
|
James Allen
|
c2eb49845f
|
Revert "Make very simple shallow copy of aceDelta when there's an undo error"
This reverts commit 1d77a95f17dde6f8792bca1989d65952474b144c.
|
2016-10-31 16:56:49 +00:00 |
|
James Allen
|
26410690da
|
Make very simple shallow copy of aceDelta when there's an undo error
|
2016-10-31 16:47:13 +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 |
|
Shane Kilkelly
|
5c8cdd22cc
|
Merge branch 'sk-account-delete-pass'
|
2016-10-28 11:02:41 +01:00 |
|
Paulo Jorge Reis
|
a274e0e175
|
Merge pull request #353 from sharelatex/pr-ab-test-history-teaser
AB test history teaser
|
2016-10-28 09:08:26 +01:00 |
|
Brian Gough
|
8887ab78c0
|
improve ace mode recognition
|
2016-10-27 15:42:19 +01:00 |
|
Paulo Reis
|
1c4183e7b1
|
Merge branch 'master' into pr-ab-test-history-teaser
|
2016-10-27 12:35:11 +01:00 |
|
Paulo Reis
|
ad33aa1bb8
|
Move Metabase tracking code.
|
2016-10-27 12:22:58 +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 |
|
Shane Kilkelly
|
2029ec2535
|
Merge branch 'sk-plans-tidy'
|
2016-10-27 10:42:29 +01:00 |
|
Paulo Reis
|
04f8b3adfa
|
Adapt mark-up to history teaser, add some styles.
|
2016-10-27 10:30:10 +01:00 |
|
Paulo Reis
|
702f0aa39b
|
Generalize teaser style.
|
2016-10-27 10:29:38 +01:00 |
|
Paulo Reis
|
9f4299b69a
|
Add history teaser image.
|
2016-10-27 10:29:04 +01:00 |
|
Shane Kilkelly
|
f396f5b09e
|
update prices in front-end
|
2016-10-27 09:57:46 +01:00 |
|
Shane Kilkelly
|
1538f140f3
|
update test timestamp
|
2016-10-27 09:41:51 +01:00 |
|
Brian Gough
|
eab7d46fc5
|
update latex syntax validator (e4b016e)
|
2016-10-26 15:15:18 +01:00 |
|
Brian Gough
|
cb4380fa78
|
fix problem with setting syntax validation option
|
2016-10-26 15:08:29 +01:00 |
|
Shane Kilkelly
|
dfd13e0815
|
Update AB test timestamp
|
2016-10-26 14:24:00 +01:00 |
|
Shane Kilkelly
|
d912c3b487
|
Merge branch 'master' into sk-plans-tidy
|
2016-10-26 13:47:26 +01:00 |
|
James Allen
|
c9925a3590
|
Handle reporting of cyclic objects to Sentry
|
2016-10-26 11:34:05 +01:00 |
|
Paulo Reis
|
70c7880639
|
Style adjustments.
|
2016-10-26 11:12:34 +01:00 |
|
James Allen
|
032165c930
|
Merge pull request #349 from sharelatex/ja-real-time-reconnects
Reconnect gracefully when asked to by real-time
|
2016-10-26 10:04:25 +01:00 |
|
Shane Kilkelly
|
1c8721ceab
|
Functioning account deletion with password
|
2016-10-25 16:23:50 +01:00 |
|