Commit graph

3513 commits

Author SHA1 Message Date
Shane Kilkelly
2ff211ce2c Make sure the $scope.canAddCollaborators var is initialised at least once, outside of angular $watch. 2016-11-07 14:36:04 +00:00
James Allen
0b50623d51 Escape \ 2016-11-05 11:07:58 +00:00
James Allen
26f9ee7fd3 Escape \ 2016-11-05 11:07:07 +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
f54bb9744a redirect to /login on failed requests 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
476de0118c Merge pull request #362 from sharelatex/bg-fix-saving-indicator
fix saving indicator
2016-11-04 11:02:32 +00:00
Brian Gough
d2ba575d85 note that acks are for our own ops 2016-11-04 10:55:46 +00:00
Brian Gough
c25395d80b fix links to wiki 2016-11-04 10:25:08 +00:00
Brian Gough
e1b54322ee fix whitespace 2016-11-04 10:18:33 +00:00
Shane Kilkelly
8f0e56930c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-11-04 10:05:54 +00:00
Shane Kilkelly
b16a533610 add npm-shrinkwrap.json 2016-11-04 10:04:12 +00:00
Paulo Reis
b7cf77eb62 Add GitHub-related teaser media. 2016-11-03 16:14:38 +00:00
Paulo Reis
cd0a9d922e Generalize and improve teaser styles. 2016-11-03 16:14:13 +00:00
Brian Gough
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +00:00
Brian Gough
91a590ad0e update links from tender to wiki 2016-11-03 12:28:19 +00:00
Brian Gough
2a8efea29a use browser 'online' event to trigger reconnect 2016-11-03 12:28:19 +00:00
Brian Gough
87d8192d29 decrease reconnect ratelimit for user activity 2016-11-03 12:28:19 +00:00
Brian Gough
62b8c30d0b make pollSavedStatus more robust against failure
check last ack timestamp and size of pending op

provide method to compute sharejs op size so we can check if pending
ops get too big
2016-11-03 11:28:23 +00:00
James Allen
8763e444e9 Include aceDelta in error message 2016-11-03 11:23:27 +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
Shane Kilkelly
e7b09a81a7 Merge branch 'sk-passport-ldap' 2016-11-02 15:39:32 +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
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
c5e793125e Update unit tests. 2016-11-01 16:55:26 +00:00
Paulo Reis
840d52ef1a Remove default value from user model, but add it upon creation (i.e. affecting new users). 2016-11-01 16:36:26 +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
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
4c94c027b8 Styles for better accomodating smaller resolutions. Vertically centering. 2016-11-01 14:52:10 +00:00
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +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
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
6e6211bde6 Merge branch 'sk-plain-text-emails-all' 2016-10-28 11:02:33 +01:00
Shane Kilkelly
4c092e7ff1 Remove deprecated "projectSharedWithYou" email. 2016-10-28 10:37:10 +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 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
Shane Kilkelly
751a116921 add plainTextTemplate to all emails 2016-10-27 14:41:13 +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
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
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
Paulo Reis
b5494c1730 Basic test mark-up structure. 2016-10-26 15:48:03 +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
Shane Kilkelly
dc62b1a86e Remove deprecated endpoint for old delete-user 2016-10-26 11:18:36 +01:00
Paulo Reis
70c7880639 Style adjustments. 2016-10-26 11:12:34 +01:00
Shane Kilkelly
a4167fcccd Unit tests for tryDeleteUser 2016-10-26 11:01:35 +01:00
Shane Kilkelly
7cc26f2207 Disable autocomplete on user-delete form 2016-10-26 10:57:54 +01:00
Shane Kilkelly
fc7bd4c2d3 fix logging 2016-10-26 10:57: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
Brian Gough
baf09e4f3a avoid exception in LoggerSerializers 2016-10-25 15:50:05 +01:00
Brian Gough
bb06b97b3c avoid exception in logging null user 2016-10-25 15:01:59 +01:00
Paulo Reis
b913118e07 Save the syntax validation setting in the onboarding view. 2016-10-25 15:01:30 +01:00
Paulo Reis
f4849201aa Merge branch 'master' into pr-latex-linter-onboarding 2016-10-25 15:00:26 +01:00
Paulo Reis
238e07ddde Save syntax checking as a user setting. 2016-10-25 14:59:20 +01:00
Shane Kilkelly
efe6df145c WIP: ask for password when deleting account 2016-10-25 14:33:47 +01:00
Paulo Jorge Reis
92c4c3db69 Merge pull request #350 from sharelatex/pr-fix-overflow-proj-name
Prevent overflowing project names.
2016-10-25 14:31:33 +01:00
Brian Gough
3519fbe337 add worker-latex.js to fingerprints 2016-10-25 14:18:37 +01:00
Brian Gough
a02d245b78 added missing dependency on ace/ace for modelist 2016-10-25 14:16:52 +01:00
James Allen
43aeb5a21d Clear SERVERID cookie when reconnecting gracefully 2016-10-25 14:09:36 +01:00