github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
5530 commits 3 branches 7 tags 201 MiB
Commit graph

5363 commits

Author SHA1 Message Date
Paulo Reis
a8a7589973 More style adjustments. 2017-02-09 17:13:23 +00:00
Paulo Reis
dd15cc06a0 Integrate playback state directive in tutorial videos; style adjustments. 2017-02-09 15:44:38 +00:00
Paulo Reis
1263532271 Add a directive to control the playback state of media elements. 2017-02-09 15:44:15 +00:00
Paulo Reis
d137b00822 Relayout the onboarding, making a video slideshow. 2017-02-08 17:19:29 +00:00
Paulo Reis
1ef5cc97fc Rename stuff to refer to the new onboarding feature. 2017-02-08 17:19:13 +00:00
James Allen
51b76d2cf9 Merge pull request #413 from sharelatex/ja-abort-in-progress-spell-checks 
Abort any inprogress spell checks when switching document
 2017-02-08 11:38:05 +01:00
James Allen
87aea41bed Abort any inprogress spell checks when switching document 2017-02-08 11:32:19 +01:00
James Allen
d44a0ece97 Merge pull request #411 from sharelatex/ja-fix-cursor-on-resize 
Ja fix cursor on resize
 2017-02-08 11:30:37 +01:00
James Allen
123300cdfb Clear highlighted word manager on session change 2017-02-08 11:08:26 +01:00
James Allen
f6743b839f Reflow review panel as editor pane changes size 2017-02-07 16:45:45 +01:00
Paulo Reis
6d35703963 Add clip showing review panel toggling. 2017-02-07 15:28:50 +00:00
Paulo Reis
d792230bf0 Basic onboarding tutorial for track-changes. 2017-02-07 15:07:26 +00:00
James Allen
11a104ef96 Move spelling marker to back marker layer where it is updated properly by Ace 2017-02-07 15:55:00 +01:00
James Allen
c1a2779d9e Merge branch 'master' into ja-fix-cursor-on-resize 2017-02-07 15:27:01 +01:00
James Allen
d00619ff3d Keep the cursor in the same position on screen when the editor resizes 2017-02-07 15:23:44 +01:00
Paulo Reis
73835f004d Add onboarding-related assets. 2017-02-07 14:13:25 +00:00
Shane Kilkelly
1d09fe2861 Merge branch 'sk-fix-password-set' 2017-02-07 09:17:56 +00:00
James Allen
1b06af766d Merge pull request #406 from sharelatex/pr-expandable-text-area-fixes 
Expandable text area fixes
 2017-02-07 09:04:10 +01:00
James Allen
c97ded201f Merge pull request #408 from sharelatex/ja-track-changes 
Clear selection after creating a comment
 2017-02-07 08:55:39 +01:00
Shane Kilkelly
6a161b4071 remove commented out code 2017-02-06 16:35:52 +00:00
Shane Kilkelly
7d5dc34b3e fix the set-password form for new (admin-created) users 2017-02-06 14:58:54 +00:00
Paulo Reis
38e1b66fdc Use slightly slower video. 2017-02-06 14:06:08 +00:00
Paulo Reis
31102d30da Update prompt title. 2017-02-06 12:24:20 +00:00
Joe Green
a32ec78a54 added about image for jg 2017-02-06 11:59:32 +00:00
James Allen
6e39824e41 Fix language icons in language recommendation 2017-02-03 16:31:42 +01:00
Paulo Reis
d19cb2a31b Fix border-radius in entries. 2017-02-03 15:20:50 +00:00
James Allen
4a80f0de5a Clear selection after creating a comment 2017-02-03 15:09:40 +00:00
James Allen
935847f2a1 Add track changes flag into user model 2017-02-03 14:47:04 +01:00
James Allen
343abfde23 Use user feature flags to determine track changes state 2017-02-03 14:36:11 +01:00
James Allen
27c48f3790 Clear selection after creating a comment 2017-02-03 14:17:09 +01:00
Paulo Reis
6ef8d2d46d Merge branch 'master' into pr-expandable-text-area-fixes 2017-02-02 14:38:09 +00:00
Paulo Reis
9d1d2df977 Disable mocked feature flag behaviour. 2017-02-02 12:19:44 +00:00
Paulo Reis
8f9e43f339 Handle track changles toggling when the feature is not enabled. 2017-02-02 12:12:14 +00:00
Paulo Reis
f50967295d Support disabling the review-panel toggle, like a standard checkbox. 2017-02-02 12:08:17 +00:00
Paulo Reis
fe33fa1f65 Add modal controller. 2017-02-02 10:19:00 +00:00
Paulo Reis
98b98005a6 Create and integrate track changes upgrade prompt. 2017-02-01 16:52:18 +00:00
Paulo Reis
ad3a30b1b3 Add track changes teaser assets. 2017-02-01 16:51:37 +00:00
Shane Kilkelly
5be65431f7 Fix sentry config 2017-02-01 10:55:01 +00:00
Shane Kilkelly
efdd777c89 Add a _headLinks block to layout 2017-01-31 15:43:53 +00:00
Shane Kilkelly
b0dd7475b0 fix pug syntax 2017-01-31 14:57:22 +00:00
Shane Kilkelly
83d0f26011 Merge branch 'master' into sk-pug 2017-01-31 10:18:53 +00:00
James Allen
ca11f5fa18 Merge pull request #400 from sharelatex/ja-goto-code-from-rp 
Jump to code when clicking on review panel entries
 2017-01-31 10:49:13 +01:00
Shane Kilkelly
e2a207d618 Merge branch 'master' into sk-pug 2017-01-31 09:39:06 +00:00
James Allen
e7efa40c75 Merge pull request #401 from sharelatex/ja-spam-code-fixes 
Refactor rate limiting code around sending invites
 2017-01-31 10:21:55 +01:00
Shane Kilkelly
21986694d8 update gitignore 2017-01-30 15:13:03 +00:00
James Allen
9663df3457 Jump to text when clicking change icon as well 2017-01-30 16:00:32 +01:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Shane Kilkelly
3ed85dad42 Merge branch 'master' into sk-upgrade-uuid 2017-01-30 11:09:50 +00:00
James Allen
30618d33db Add in extra check to set ui state 2017-01-27 17:13:11 +01:00
James Allen
d9b774bb9b Sycn track changes based on doc state, not editor state 2017-01-27 17:12:17 +01:00
James Allen
ff7c5a0954 Merge branch 'master' into ja-track-changes 2017-01-27 17:11:49 +01:00
James Allen
b086d7afa2 Refactor rate limiting code around sending invites 2017-01-27 16:26:58 +01:00
Paulo Reis
15ad3f4769 Avoid stopping propagation, check event target instead. 2017-01-26 16:11:02 +00:00
James Allen
68aab6e05c Don't use code check on .bib files 2017-01-26 16:13:21 +01:00
James Allen
0479b01b9d Jump to code when clicking on review panel entries 2017-01-26 16:04:08 +01:00
Paulo Reis
ce89714a48 Emit event when textarea resizes; capture it in the review panel and trigger reflow. 2017-01-26 14:35:01 +00:00
James Allen
76328ff93f Tell other clients when threads are deleted 2017-01-26 15:12:59 +01:00
James Allen
abb4ef14d8 Streamline the update/rendering process to not do extra work 2017-01-26 15:08:30 +01:00
Paulo Reis
6304c213bd Add a min-height to the review panel text areas. 2017-01-26 12:00:11 +00:00
Paulo Reis
1a1320b561 Avoid shrinking the expandable text area. 2017-01-26 11:59:55 +00:00
James Allen
32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes 
Fix style issues in IE 10
 2017-01-25 15:55:15 +01:00
James Allen
757c7002eb Merge pull request #397 from sharelatex/ja-modify-threads 
Allow editing/deleting of comments and threads
 2017-01-25 15:50:00 +01:00
James Allen
406181b05d Remove a console.log 2017-01-25 15:49:38 +01:00
Paulo Reis
a924794a5a Add expandable text area directive; apply it to review panel text areas. 2017-01-25 13:51:33 +00:00
Shane Kilkelly
e2f4fc3653 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 10:52:34 +00:00
Shane Kilkelly
60500bc4ea update shrinkwrap 2017-01-25 10:52:08 +00:00
Henry Oswald
3eb13ccdd1 fix stupid mistake 2017-01-25 10:38:39 +00:00
Henry Oswald
2a00b9c7a2 use user._id for error log 2017-01-25 10:33:30 +00:00
Paulo Reis
f11926d0a9 Make sure layout math is done on load. 2017-01-25 10:31:02 +00:00
Shane Kilkelly
f7b4e00466 Restore npm-shrinkwrap.json 2017-01-25 10:30:53 +00:00
Shane Kilkelly
239164fe26 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 09:56:08 +00:00
Henry Oswald
cc717f0357 domainAnnouncementsToShow -> domainAnnouncements 2017-01-25 09:44:13 +00:00
Henry Oswald
02e6eb4dd1 Merge pull request #399 from sharelatex/ho-promote-case-study 
promote domain alerts
 2017-01-25 09:41:50 +00:00
Henry Oswald
1280a2313d add check for id to exist in domain announcments 
null check user at start of getUnreadAnnouncements
fix spelling mistake
 2017-01-25 09:35:11 +00:00
Henry Oswald
69ab275404 Update list.jade 2017-01-25 09:14:21 +00:00
James Allen
59c40ea5cc Only show delete options when thread has more than one message! 2017-01-24 17:03:32 +01:00
Henry Oswald
13d21b881f use new annoncments feature for case study info 2017-01-24 16:03:05 +00:00
James Allen
798e09f011 Don't show 'no comments' when submitting 2017-01-24 16:56:08 +01:00
James Allen
f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
Paulo Reis
1de8b3bce7 Disable text selection with right click on file tree. 2017-01-24 15:19:48 +00:00
Henry Oswald
2341a8481a Merge branch 'master' into ho-promote-case-study 2017-01-24 14:49:35 +00:00
Shane Kilkelly
a148eb1f43 Merge branch 'master' into sk-rate-limit-cluster 2017-01-24 09:24:47 +00:00
Shane Kilkelly
0add3ed66e Merge branch 'master' into sk-upgrade-uuid 2017-01-23 10:04:31 +00:00
Shane Kilkelly
abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
James Allen
2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01:00
Henry Oswald
9153ffac41 limit project name in email to 40 chars 2017-01-21 12:58:16 +00:00
Henry Oswald
74240e28c7 rate limit via ip the number of invite to project requests 2017-01-21 12:44:09 +00:00
Henry Oswald
6d35585847 limit number of invites each user can do 
done with the number of collaborators a user can add
prevents notifications getting filled up as well
 2017-01-21 12:43:15 +00:00
Henry Oswald
6f2c7ba6c6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2017-01-20 14:51:23 +00:00
Henry Oswald
03555f0339 added chris and removed geri from pics 2017-01-20 14:50:38 +00:00
Shane Kilkelly
cfa2777d62 Merge branch 'sk-launchpad' 2017-01-20 13:58:16 +00:00
Shane Kilkelly
36eb453aed Clarify logic of asyncform onsuccess and onerror handlers 2017-01-20 13:52:31 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
73c1016f4a Avoid using 0px, because minifiers might convert the value to 0, which will still cause issues on IE. 2017-01-19 16:58:16 +00:00
Paulo Reis
1970ab4e63 Ensure that the change text fits the entry UI in IE. 2017-01-19 16:55:21 +00:00
Paulo Reis
a4ca7e2ca9 Fix padding in the review panel toolbar for IE. 2017-01-19 16:54:34 +00:00
Paulo Reis
cd975c6190 Make resolved comments dropdown scrollable in IE. 2017-01-19 15:43:26 +00:00
Paulo Reis
76ea469970 Reposition the track-changes indicator element to avoid issues with IE positioning. 2017-01-19 12:12:34 +00:00
Paulo Reis
3b9a599276 Fix entries z-index issues on IE10. 2017-01-19 11:57:49 +00:00
Paulo Reis
5489514d7a Add some compatibility style rules for IE10. 2017-01-18 15:38:34 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +00:00
Shane Kilkelly
8922c9dbf5 New email layout for "testEmail" 2017-01-18 15:28:51 +00:00
James Allen
3413687833 Merge pull request #393 from sharelatex/ja-track-changes 
Ja track changes
 2017-01-18 15:32:16 +01:00
James Allen
f97d36eb73 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-18 14:07:29 +01:00
Paulo Reis
2589ac7d58 Remove unneeded review panel layout event. 2017-01-18 10:55:51 +00:00
Paulo Reis
49fe8ef3a3 Update entry truncating logic while typing. 2017-01-18 10:53:59 +00:00
Paulo Reis
329c6af168 Add a track-changes indicator in the editor, for when the review panel is closed. 2017-01-17 17:20:51 +00:00
James Allen
a8618fa4d9 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 17:36:30 +01:00
James Allen
786c92b2fc Don't show delete comment button (until it works) 2017-01-17 17:34:11 +01:00
Shane Kilkelly
707838baa4 Merge branch 'master' into sk-launchpad 2017-01-17 16:25:59 +00:00
Shane Kilkelly
59ab66fca2 Fix double-callback 2017-01-17 16:25:18 +00:00
Paulo Reis
f27118084c Make review header icon behave like font-awesome icons. 2017-01-17 16:03:41 +00:00
James Allen
318313d66c Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 16:55:25 +01:00
James Allen
4d15fc30ba Don't flash resolved comments when editor is loading 2017-01-17 16:55:18 +01:00
James Allen
5a34d17947 Toggle track changes in a project based on the owner's feature switch 2017-01-17 15:59:18 +01:00
Shane Kilkelly
d7251c6bfe Merge branch 'master' into sk-launchpad 2017-01-17 14:55:08 +00:00
Paulo Reis
2f119e5787 Track review features usage. 2017-01-17 14:39:31 +00:00
Shane Kilkelly
1137ab0715 Don't record redirect to static asset paths 2017-01-17 14:35:37 +00:00
James Allen
e15d01874d Remove comment from dropdown when it is reopened 2017-01-17 15:13:50 +01:00
James Allen
dec9b5bf1e Use email if name is blank 2017-01-17 15:10:44 +01:00
James Allen
960d1e8b2f Only call /project/.../threads if we need the threads 2017-01-17 15:04:49 +01:00
James Allen
4a47d135c7 Reapply ops to track changes as current user when reconnecting 2017-01-17 14:54:22 +01:00
Shane Kilkelly
70c7e32e58 Add a 'testEmail' email type 2017-01-17 10:52:04 +00:00
James Allen
eb8e801dea Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-17 11:51:11 +01:00
James Allen
1b63db91d0 Add in a null check 2017-01-17 11:51:02 +01:00
Paulo Reis
d66f2033bb Ensure that review panel elements are above, z-index-wise, Ace elements. 2017-01-17 10:16:10 +00:00
Shane Kilkelly
06bba062a4 Merge branch 'master' into sk-launchpad 2017-01-17 09:29:37 +00:00
James Allen
9c0bf885be Merge branch 'master' into ja-track-changes 2017-01-17 10:16:41 +01:00
Paulo Reis
36f15ff56e Avoid empty comment submission. 2017-01-16 17:14:06 +00:00
Paulo Reis
121629426e Avoid empty comment replies. 2017-01-16 17:06:57 +00:00
Paulo Reis
1c8942c5c6 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-16 16:28:27 +00:00
Paulo Reis
65e257ca37 Change text marker colors on Ace dark themes. 2017-01-16 16:25:38 +00:00
James Allen
f12aeedb35 Tweak padding around track changes toggle loading indicator 2017-01-16 16:57:20 +01:00
James Allen
5fb54d8447 Don't refresh resolved comments every times an entry changes 2017-01-16 16:55:14 +01:00
James Allen
bf56952f88 Make overview panel entries jump to place in doc again 2017-01-16 15:31:51 +01:00
James Allen
d4f60977fd Add loading indicator while submitting new comments 2017-01-16 15:25:10 +01:00
James Allen
e5c96eb619 Focus on text area when adding a comment 2017-01-16 15:17:56 +01:00
James Allen
278bfc1f50 Use 'show all' instead of 'more' 2017-01-16 15:06:47 +01:00
Shane Kilkelly
82ddeab2bd If user tries to invite themselves to project, don't. 2017-01-16 13:45:01 +00:00
Shane Kilkelly
635b935acc Add an acceptance test for login rate limits, cleanup 2017-01-16 11:46:59 +00:00
Brian Gough
962a4d5039 roll out math mode linter for all users 
from our ace commit 953ff92c3283f03da94559d50a933fe685b05631
 2017-01-16 09:17:38 +00:00
Henry Oswald
fed88504f8 rate limit emails sent sharing projects by users 2017-01-14 14:52:32 +00:00
Paulo Reis
1ed0ccf854 Improve hovering behaviour for entries in mini mode. 2017-01-13 16:07:08 +00:00
Shane Kilkelly
25956d4c62 Fix up tests 2017-01-13 16:04:26 +00:00
Paulo Reis
3968761ac8 Add collapsing behaviour to resolved comments. 2017-01-13 15:37:24 +00:00
Paulo Reis
5eece9f5d9 Add collapsing behaviour to long entries. 2017-01-13 15:30:31 +00:00
Shane Kilkelly
1ef1912cf8 Point to fork of rolling-rate-limiter that supports ioredis 2017-01-13 15:21:05 +00:00
James Allen
b6ea338ff8 Separate resolved comments so they don't affect review panel 2017-01-13 15:27:45 +01:00
Shane Kilkelly
525e871d55 Merge branch 'master' into sk-rate-limit-cluster 2017-01-13 14:17:18 +00:00
James Allen
bf7038f506 Adapt review panel line height to editor 2017-01-13 14:52:08 +01:00
James Allen
718f3dc388 Fix slightly broken callout positioning behaviour 2017-01-13 14:30:04 +01:00
James Allen
6c49b95538 Don't allow overlapping comments 
Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area,
and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise
 2017-01-13 14:17:47 +01:00
James Allen
aab4dea8ae Merge branch 'master' into ja-track-changes 2017-01-13 13:46:01 +01:00
Paulo Reis
823c2c854a Add styling to have left-based layout when there is no space on the right. 2017-01-12 17:06:08 +00:00
Paulo Reis
3d5691ddaf Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 16:49:56 +00:00
Paulo Reis
e3e8541a63 Add class when review panel should layout to the left. 2017-01-12 16:49:47 +00:00
Paulo Reis
9f008318cc Emit event after linking the layout directive. 2017-01-12 16:49:29 +00:00
James Allen
b31d086330 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 17:22:18 +01:00
James Allen
2052ee63a3 Recover tracked changes after a disconnect 2017-01-12 17:19:19 +01:00
Paulo Reis
b97ce52c6f Handle z-index issues with mini review panel. 2017-01-12 14:20:41 +00:00
Brian Gough
a153375688 Merge pull request #391 from sharelatex/bg-syntax-checker-mathmode 
math mode syntax checking improvements
 2017-01-12 14:18:11 +00:00
Brian Gough
df4b5c1b37 math mode syntax checking improvements 
for beta users

from our ace commit 442a1c522c58b1e511d2fd2c6f03909488d41e60
 2017-01-12 13:25:19 +00:00
Shane Kilkelly
d17483fd47 Merge branch 'sk-top-menu-rework' 2017-01-12 13:24:47 +00:00
James Allen
a42cc48be8 Fix doc names and sort order in resolved comments dropdown 2017-01-12 13:44:54 +01:00
James Allen
8e0c2ff0b3 Adjust resolved comments buttons and add tooltip 2017-01-12 13:37:44 +01:00
Henry Oswald
daee77f052 Merge pull request #387 from sharelatex/pr-email-template-improvements 
Email template improvements
 2017-01-12 12:34:35 +00:00
James Allen
f9b8ada215 track changes for anonymous users 2017-01-12 13:29:57 +01:00
James Allen
0d02b860d9 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-12 13:08:57 +01:00
Paulo Reis
0b57cc650b Fix merge mistake; adjust animation timings. 2017-01-12 11:56:04 +00:00
James Allen
64b9fe52dd Handle deleted users in comments gracefully 2017-01-12 12:31:01 +01:00
Paulo Reis
88b694f894 Animate comment resolving. 2017-01-12 11:25:36 +00:00
James Allen
9a867438b2 Always show user name next to comment 2017-01-12 12:06:02 +01:00
James Allen
ea7f1abb6b Darken comment reply text area 2017-01-12 12:05:50 +01:00
James Allen
6cd8e2a935 Add user data to comments correctly 2017-01-12 12:05:35 +01:00
James Allen
e7ab92b7c9 Only show users controls they have permission to use 2017-01-12 11:52:39 +01:00
James Allen
953371ad2d Don't double track a reject 2017-01-12 10:59:16 +01:00
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +00:00
James Allen
0264efccae Don't let review panel entries go off the top of the screen 2017-01-11 14:57:00 +01:00
James Allen
a081ae7307 Properly sync resolved comments dropdown to entries 2017-01-11 14:13:49 +01:00
James Allen
4ee4aa9f0a Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-11 13:41:16 +01:00
James Allen
2e5c6d4570 Don't remove add comment marker when updating entries 2017-01-11 13:41:07 +01:00
Paulo Reis
d701c1ef5e Make the dropdown scrollable. 2017-01-11 11:25:18 +00:00
Paulo Reis
931187bd8b Add a backdrop to the dropdown (to close when clicked outside). 2017-01-11 10:53:46 +00:00
Shane Kilkelly
411cb4330c Fix typo in hyperlink 2017-01-11 10:39:34 +00:00
Shane Kilkelly
731f280e2e Move auth parts of top menu out of config and into web templates. 
Move the remaining configuration into a new config var: `nav.header_extras`.
Add a `nav.showSubscriptionLink` var to control visibility of subscription link
in the Account menu.

This will allow admins to more easily configure extra links in the top
navigation bar, without the danger of overwriting the important auth menus.
 2017-01-11 10:27:38 +00:00
Paulo Reis
72baed60ef Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 16:29:36 +00:00
Paulo Reis
010612aacc Keep track of resolved threads in the dropdown. 2017-01-10 16:29:27 +00:00
James Allen
f17ce2705c Don't include wrapper for resolved comments, since it throws the review panel layout off 2017-01-10 17:17:07 +01:00
James Allen
3668d7dd1f Remove global debugging hook 2017-01-10 16:58:59 +01:00
Shane Kilkelly
f5ced03074 Set redirect when sending user to login page. 
Allows smart redirecting to work when public access is turned off.
 2017-01-10 15:42:36 +00:00
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01:00
Shane Kilkelly
f3af44fab0 add on-success and on-error handlers to async-form. 2017-01-10 14:46:09 +00:00
James Allen
85c613e161 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 13:44:01 +01:00
James Allen
d03aa7056e Rename /ranges/users end point to /changes/users 2017-01-10 13:43:53 +01:00
Paulo Reis
5bd49c08f8 Simpler resolved comments dropdown data structure. 2017-01-10 12:16:58 +00:00
Paulo Reis
9c7d89c5bd Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-10 11:23:15 +00:00
Paulo Reis
072044ee90 Remove thread from view collection; some clean-up. 2017-01-10 11:23:06 +00:00
James Allen
7ae33041b5 Don't enter infinite loop generating id 2017-01-10 11:58:55 +01:00
James Allen
12e1b2bc3d Don't show resolved comments highlighted in the text 2017-01-10 11:55:59 +01:00
Paulo Reis
32fb317820 Add delete action to the dropdown. 2017-01-10 10:33:54 +00:00
Paulo Reis
70134d44d0 Add unresolve action to the dropdown. 2017-01-09 17:22:01 +00:00
James Allen
4e128b6ab7 Send user data in /threads dat 2017-01-09 17:25:06 +01:00
Paulo Reis
1a100b77df Hide resolved comments from the review panel. 2017-01-09 15:15:03 +00:00
James Allen
35bdb4383a Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 
Conflicts:
	public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
 2017-01-09 16:11:59 +01:00
James Allen
dbe5331566 Tell other clients when comments are resolved and reopened 2017-01-09 16:09:29 +01:00
Paulo Reis
037389b7dd Decouple ranges update from the overview panel; integrate it with the dropdown. 2017-01-09 14:59:01 +00:00
James Allen
43f6b9de7c Inform other clients when we accept a change 2017-01-09 15:54:12 +01:00
Paulo Reis
5e483f2a97 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 14:31:31 +00:00
James Allen
7e33d1a24e Fix generation of thread id 2017-01-09 15:30:48 +01:00
Paulo Reis
f0ab1fa2d4 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 14:30:40 +00:00
Paulo Reis
4871d56725 Isolate overview panel overrides. 2017-01-09 14:30:29 +00:00
James Allen
9379cff89d Add end point for accepting change in doc updater 2017-01-09 15:25:27 +01:00
James Allen
a4097b4709 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-09 10:52:01 +01:00
James Allen
14c624614d Update RangesTracker 2017-01-09 10:51:55 +01:00
James Allen
ae30f32481 Use deterministic ids based on a seed 2017-01-09 10:49:03 +01:00
Paulo Reis
037b61cbba Further styling. 2017-01-06 17:22:22 +00:00
Paulo Reis
0478fcd925 Add comment resolution info. 2017-01-06 15:24:33 +00:00
James Allen
cb24e9390a Fix comments in overview panel 2017-01-06 14:17:57 +01:00
James Allen
beb94b0756 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-06 13:42:08 +01:00
James Allen
3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00
Paulo Reis
42585085c0 Integrate new directive, plumb data into it. More styling. 2017-01-06 12:00:17 +00:00
Paulo Reis
f2e6e69df6 Add an entry directive for resolved comments, with file and quoted text. 2017-01-06 11:59:49 +00:00
Henry Oswald
0b67265eb6 use admin email for closed site 2017-01-06 11:32:57 +00:00
Henry Oswald
84ce2d0e14 change default nav to use translations for login and register 2017-01-06 11:00:21 +00:00
Paulo Reis
a1435d13a3 Basic structure for the resolved comments dropdown. 2017-01-05 17:15:27 +00:00
Henry Oswald
862e15b842 log out user id and anonymous when loading editor 2017-01-05 15:02:10 +00:00
Paulo Reis
22db36d21b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-05 11:51:00 +00:00
Paulo Reis
d13035a4f4 Simpler UI for comments; remove some unused code. 2017-01-05 11:50:43 +00:00
James Allen
5155ebaeec Don't show resolved comments when loading editor 2017-01-05 10:55:16 +01:00
James Allen
898d20a6fc Fix signature of call to unresolveComment 2017-01-05 10:34:28 +01:00
Paulo Reis
1599c41670 Sizing adjustments. 2017-01-04 15:34:24 +00:00
James Allen
60152e219b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-04 16:26:08 +01:00
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Paulo Reis
fdafcf9677 Restyle insertions and deletions - increasing info density. 2017-01-04 15:24:49 +00:00
Shane Kilkelly
7bbbfe20b9 If external auth is used, remove /register items from header nav. 
(logic moved from docker-image settings file)
 2016-12-21 13:50:13 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Henry Oswald
bcf9a17fb3 Merge branch 'master' into node-4.2 2016-12-20 15:23:02 +00:00
Shane Kilkelly
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Shane Kilkelly
d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Shane Kilkelly
535e489ae5 Add an example redis.ratelimiter config. 2016-12-19 12:17:58 +00:00
Shane Kilkelly
9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Paulo Reis
d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
Paulo Reis
869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Brian Gough
3a8a12fcb3 Revert "rollout linter math mode to all users" 
This reverts commit 0ac0a11d3028cabac53d1e347b2509cb9e785f9f.
 2016-12-16 14:07:47 +00:00
Paulo Reis
0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Shane Kilkelly
637fcb5784 Merge branch 'master' into sk-learn-anchor-links 2016-12-16 11:20:43 +00:00
Shane Kilkelly
fdcf97f877 Disable angular html5Mode. 2016-12-16 10:26:25 +00:00
Paulo Reis
7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00
Paulo Reis
47a5eb5382 Add a new layout and body template for e-mails. 2016-12-15 17:22:39 +00:00
Shane Kilkelly
faf740d224 Disable link rewriting. 2016-12-15 16:23:10 +00:00
Brian Gough
2583a28087 rollout linter math mode to all users 
ace repo commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9
 2016-12-15 13:28:00 +00:00
James Allen
5717cafcec Create comments via comment ops 2016-12-13 17:57:46 +00:00
James Allen
898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +00:00
Paulo Jorge Reis
a772b268aa Merge pull request #385 from sharelatex/pr-style-announcements 
Announcements styling
 2016-12-12 15:19:40 +00:00
Brian Gough
3a7731b33b Merge pull request #384 from sharelatex/bg-syntax-checker-mathmode 
update latex syntax checker to include mathmode
 2016-12-12 15:09:45 +00:00
Brian Gough
6e8ee826dc update latex syntax checker to include mathmode 
from our ace commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9

provide it as a beta release first
 2016-12-12 10:10:49 +00:00
James Allen
0a6a6c3c28 Keep files ordered in overview panel in the same was as the file tree 2016-12-09 16:17:28 +00:00
James Allen
293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen
1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen
1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
Paulo Reis
42bd1852c6 Use HTML binding in the excerpt. 2016-12-07 15:45:22 +00:00
Paulo Reis
58ab888f3f Add a button to show all, when filtering new items. 2016-12-07 14:57:54 +00:00
Paulo Reis
c716b86def Add logic to dismiss unread announcements, styling fixes. 2016-12-07 14:26:10 +00:00
Henry Oswald
e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Paulo Reis
3595aff5e2 Scrolling behaviour. 2016-12-07 11:10:02 +00:00
Paulo Reis
821e556dd3 Better handling of overflowing content. 2016-12-06 17:15:56 +00:00
Paulo Reis
c1355e64b3 Merge branch 'master' into pr-style-announcements 2016-12-06 15:42:24 +00:00
Paulo Reis
5d9ae25282 Allow announcements to overflow the header. 2016-12-06 15:41:58 +00:00
Paulo Reis
6a9ab1f525 Style adjusments; make announcements close when backdrop is clicked. 2016-12-06 14:17:30 +00:00
Shane Kilkelly
a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
Paulo Reis
a00acd7458 Add animations and state toggling. 2016-12-05 15:32:38 +00:00
James Allen
48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
James Allen
dcc9a5de32 Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina 
Sk spellcheck underline retina
 2016-11-30 15:51:34 +00:00
James Allen
34276520d8 Merge pull request #379 from sharelatex/sk-show-user-email 
Add a `user_email` option to the nav "Account" dropdown.
 2016-11-30 15:49:34 +00:00
Shane Kilkelly
e081409b09 Update to modern images 2016-11-30 14:34:50 +00:00
Shane Kilkelly
ef115e2f91 add a 2x version of the spellcheck-underline image. 2016-11-30 11:25:47 +00:00
Shane Kilkelly
d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen
eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Paulo Reis
73e0a63689 Basic mark-up and styles. Change the controller to hold all notifications. 2016-11-29 17:12:53 +00:00
Shane Kilkelly
cf94429e05 Add a user_email option to the nav "Account" dropdown. 2016-11-29 16:04:20 +00:00
Henry Oswald
68ddf04fe8 to string record event check 2016-11-29 14:38:45 +00:00
Henry Oswald
6e9458e9e1 wip 2016-11-29 14:38:25 +00:00
Henry Oswald
aacdb1e96b to string record event check 2016-11-28 19:19:00 +00:00
Shane Kilkelly
a03ac8fe72 More robust session destruction after deleting user account. 2016-11-28 12:37:53 +00:00
Shane Kilkelly
853dad95f3 After account delete, bounce to login after 1-second delay 2016-11-28 12:01:32 +00:00
Shane Kilkelly
d15659ed85 check user is present before accessing email 2016-11-28 12:01:11 +00:00
Shane Kilkelly
52462d7020 Merge branch 'sk-sync-details-from-sso' 2016-11-28 10:11:59 +00:00
Shane Kilkelly
395135a655 Merge branch 'sk-post-login-redirect' 2016-11-28 09:52:14 +00:00
Shane Kilkelly
acce8853ba Remove redundant baseUrl from plans page. 2016-11-25 15:24:50 +00:00
Shane Kilkelly
2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. 2016-11-25 14:38:00 +00:00
Henry Oswald
4b59fdd453 added missing settings file to announcments controller 2016-11-25 11:59:50 +00:00
Henry Oswald
f130470971 log ip address of user when logging in 2016-11-25 11:59:50 +00:00
James Allen
65c1a62cb7 Add in null check for user when getting hue in chat 2016-11-25 11:08:32 +00:00
James Allen
04c151eed0 Only bind to Ace if track changes is enabled 2016-11-24 16:56:50 +00:00
Paulo Reis
ecd81738cb Restyle toggle. 2016-11-24 15:55:09 +00:00
Shane Kilkelly
167f01857a Remove stray next params. 2016-11-24 14:15:01 +00:00
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 Reis
bf5aa5e253 Fix review panel toolbar in flex contexts. 2016-11-23 17:04:55 +00:00
Paulo Reis
1148b00c9a Add review header item. 2016-11-23 16:53:13 +00:00
Paulo Reis
8d933d9b5f Toggler style adjustments. 2016-11-23 16:10:35 +00:00
Paulo Reis
f61aac0bb3 Make toggler label clickable. 2016-11-23 14:44:04 +00:00
Paulo Reis
e655e85e6d Integrate toggler in review panel. 2016-11-23 14:34:55 +00:00
Paulo Reis
aba6c90524 Add styling for toggler. 2016-11-23 14:34:40 +00:00
Paulo Reis
ed20f8533f Add toggler directive. 2016-11-23 14:34:21 +00:00
Paulo Reis
ba5118d02a Merge branch 'master' into ja-review-panel 2016-11-23 10:41:20 +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
cee3326ce3 fix omission of 'length' 2016-11-22 17:06:05 +00:00
Shane Kilkelly
f9b1862ddb Merge branch 'master' into sk-post-login-redirect 2016-11-22 16:54:12 +00:00
Shane Kilkelly
8a4352fff2 Set redirect when redirecting from restricted 2016-11-22 16:54:03 +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
James Allen
33f6c0dd1b Jump to position based on offset since we don't know doc lines for unopen docs 2016-11-22 16:34:39 +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
0bc52412ea Hide header labels in XS resolutions (i.e. up to 768px). 2016-11-22 10:59:20 +00:00
Paulo Reis
fab7ec3e98 Remove test-related tracking and analytics code. 2016-11-22 10:50:29 +00:00
Paulo Reis
dce272462a Remove test-related mark-up. 2016-11-22 10:39:56 +00:00
Paulo Reis
decaaab7ea Fix CSS property typo. 2016-11-22 10:36:13 +00:00
Paulo Reis
f7d2fa9382 Avoid avatar resizing in flexbox contexts. 2016-11-22 09:03:52 +00:00
Paulo Reis
a84e52bc92 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-21 17:14:08 +00:00
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +00:00
Paulo Reis
9a4ee0470a Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-21 16:58:22 +00:00
James Allen
aa831159a2 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-21 16:58:02 +00:00
James Allen
222401c7fd Pull out logic linking changesTracker to reviewPanel.entries into ReviewPanelController 2016-11-21 16:57:52 +00:00
Paulo Reis
319217f61e Revert "Basic support for buttons in overview panel." 
This reverts commit c76e73489ac989dc0e90f65312b737831850af96.
 2016-11-21 16:40:31 +00:00
Paulo Reis
80049f4e9c Basic support for buttons in overview panel. 2016-11-21 15:20:58 +00:00
James Allen
d77c385cf0 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-21 15:19:02 +00:00
James Allen
12168b2ae8 Insert some mocked changes 2016-11-21 15:18:46 +00:00
Paulo Reis
5158c6c16d Fix padding in overview panel. 2016-11-21 15:05:18 +00:00
Paulo Reis
fc6730f5bf Lower brightness in smaller username text spans; limit avatar text to 1 char. 2016-11-21 14:51:01 +00:00
Brian Gough
889d8f51c4 make Document _onError handler more robust 
replace console.error with sl_console.log to prevent browser crashing
before exiting document if console object does not exist.
 2016-11-21 13:58:08 +00:00
Paulo Reis
ad857a15f9 Style resolved comments in the current file pane. 2016-11-21 11:16:23 +00:00
Paulo Reis
cc8fdf6b8d Add a buttons mixin. 2016-11-21 11:16:13 +00:00
James Allen
5814d93f5e Order entries in the overview panel based on their place in the document 2016-11-18 16:30:41 +00:00
James Allen
6ea61472ec Add tooltip to add comment indicator 2016-11-18 16:08:02 +00:00
James Allen
107f86fb2b Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-18 15:47:06 +00:00
James Allen
c5e7d154fd Improve undo behaviour of deletes 2016-11-18 15:46:54 +00:00
Paulo Reis
f029c7a7b2 Control click behaviour on comments; relayout when toggling panels. 2016-11-18 15:08:16 +00:00
Paulo Reis
caefc196a4 Style comments in Overview panel. 2016-11-18 14:27:49 +00:00
Paulo Reis
d1b96cea35 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-18 12:16:33 +00:00
Paulo Reis
60b5087763 Basic styling in the overview panel. 2016-11-18 12:16:24 +00:00
Shane Kilkelly
da1be67aff Merge branch 'sk-ext-auth-show-email' 2016-11-18 09:34:05 +00:00
James Allen
5d8038af71 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 18:06:31 +00:00
James Allen
bf20799478 Allow comments to be resolved an deleted 2016-11-17 18:06:08 +00:00
Paulo Reis
dd0c578924 Put the entries in a layer above the scrollbar. 2016-11-17 17:18:24 +00:00
Paulo Reis
a007da0466 Increase hit area for hovering in the mini review panel. 2016-11-17 16:53:59 +00:00
James Allen
d30daa3477 Remove another debug logging line 2016-11-17 16:08:25 +00:00
James Allen
35d154b6e8 Remove some debug logging lines 2016-11-17 16:07:23 +00:00
James Allen
d07fcbca82 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 16:05:44 +00:00
James Allen
7a8af8a21a Show file names in overview panel 2016-11-17 16:05:12 +00:00
Paulo Reis
68c254a432 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 15:55:26 +00:00
James Allen
4a93e02407 Goto a change when clicked in the overview panel 2016-11-17 15:55:18 +00:00
Paulo Reis
b1f73963b9 Fix invisible hover. 2016-11-17 15:41:55 +00:00
James Allen
dcb4bd0dc8 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 15:33:42 +00:00
James Allen
d1a3ff4b73 Refactor callout and background styles and don't show in overview 2016-11-17 15:33:34 +00:00
Paulo Reis
94bdad7eae Use triangles mixin instead of characters. 2016-11-17 15:29:33 +00:00
Shane Kilkelly
6606375cd7 Remove dead code: SessionInvalidator 2016-11-17 15:27:58 +00:00
James Allen
77400b000b Focus on box when adding a comment 2016-11-17 15:20:25 +00:00
James Allen
7c3a4dfa4d Always show current file in mini review panel 2016-11-17 14:57:11 +00:00
Shane Kilkelly
fa146a1558 Remove redundant !! 2016-11-17 14:48:15 +00:00
Shane Kilkelly
9bd7c2d827 Merge branch 'master' into sk-ext-auth-show-email 2016-11-17 14:35:02 +00:00
Paulo Reis
df420e0d21 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 14:34:23 +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
James Allen
15d8f6c661 Sort out scroll bar positions and scroll position transitions 2016-11-17 14:29:35 +00:00
Brian Gough
a2a760afce add missing pdfjs charmaps 2016-11-17 14:17:56 +00:00
James Allen
52ca272ae8 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 12:09:10 +00:00
James Allen
e2f21a67d2 Sort of positioning and scrolling of overview panel 2016-11-17 12:09:07 +00:00
Paulo Reis
fe43f60b3d Offset review panel when Ace scrollbar is visibl.e 2016-11-17 12:02:45 +00:00
James Allen
2678a177fe Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-17 11:47:28 +00:00
James Allen
1e8f2a89a1 Refactor layout and CSS to be more manageable with overview classes 2016-11-17 11:47:20 +00:00
Paulo Reis
4bba8e8977 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 10:51:17 +00:00
Paulo Reis
f170fd4b83 Refactor Ace directive to have a single events bridge. 2016-11-17 10:40:08 +00:00
James Allen
a87ed88a53 Use cleaner scrolling system that doesn't involve hiding a scroll bar 2016-11-17 10:24:48 +00:00
James Allen
70bf0be6dd Fix when the mini review panel is hidden 2016-11-16 17:17:50 +00:00
James Allen
1cec41d2cf Resize editor on review panel toggle 2016-11-16 16:28:01 +00:00
James Allen
c86cf5a61a Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 16:23:15 +00:00
James Allen
2f136c15c3 Don't draw our hacked zero width markers when they are offscreen 2016-11-16 16:22:59 +00:00
Paulo Reis
706b0793ab Pull callouts into entries directives. 2016-11-16 16:21:24 +00:00
Paulo Reis
296fd9fe26 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 16:13:49 +00:00
Paulo Reis
32b3ba6bbb Pull indicators into entries directives. 2016-11-16 16:13:39 +00:00
James Allen
a4b9bcb37e Don't let focused change overlap nav panel 2016-11-16 16:07:07 +00:00
James Allen
6a4bf3885d Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 
Conflicts:
	public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
 2016-11-16 16:05:05 +00:00
James Allen
beab95a871 Reflow review panel layout when adding a comment 2016-11-16 16:03:06 +00:00
James Allen
5d414e9a1b Tweak paddings in review panel 2016-11-16 15:57:51 +00:00
Paulo Reis
6153bd3022 Wrap add comment entries in a directive 2016-11-16 15:47:05 +00:00
Paulo Reis
24f82c3c35 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 15:34:49 +00:00
James Allen
fc3fd5c73c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 15:27:48 +00:00
James Allen
51afd49780 Bring scroll bar into editor when just mini review panel 2016-11-16 15:27:33 +00:00
James Allen
379afe4aa5 Refactor scroll handling into directive 2016-11-16 15:23:29 +00:00
Paulo Reis
00a6df156b Wrap comment entries in a directive 2016-11-16 15:12:58 +00:00
Paulo Reis
9ffb05cd98 Wrap insert and delete entries in a directive 2016-11-16 14:56:34 +00:00
Brian Gough
50042ee97e fix latex code check for minted 
include minted in list of verbatim enviroment
 2016-11-16 14:50:09 +00:00
Brian Gough
277894631a try out new pdfjs font fix 
https://github.com/mozilla/pdf.js/pull/7705
 2016-11-16 14:50:09 +00:00
Paulo Reis
d7d21b106c Isolate review-panel markup. 2016-11-16 14:42:07 +00:00
Shane Kilkelly
f9774141b1 Fix up makeRequest, so it copes with analytics.url being un-configured. 2016-11-16 14:40:38 +00:00
James Allen
b006f4fbbf Position boxes next to indicator icons in mini review panel 2016-11-16 14:14:53 +00:00
James Allen
56408728cd fix initialization error 2016-11-16 14:00:29 +00:00
James Allen
443d772866 Don't clear entries when switching files 2016-11-16 13:53:01 +00:00
James Allen
479ea83e36 Dump everything (unstyled) into the review panel 2016-11-16 13:51:30 +00:00
James Allen
711f282575 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 13:26:33 +00:00
Paulo Reis
f640c17d4d Add review panel substate toggling. 2016-11-16 12:31:47 +00:00
Paulo Reis
db5dc6ef15 Positive action buttons on the right. 2016-11-16 11:03:29 +00:00
James Allen
b443c5d7dc Make mini review panel entries scroll and stack like main panel 2016-11-15 17:07:06 +00:00
James Allen
69692934a9 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-15 16:21:59 +00:00
James Allen
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +00:00
Paulo Reis
562d8626e4 Fix overflowing entries. 2016-11-15 16:20:06 +00:00
Paulo Reis
8a11c8c3ca Show add comment button when review panel is off. 2016-11-15 16:02:12 +00:00
Paulo Reis
f25e144a15 Update font awesome to v4.7. 2016-11-15 16:02:03 +00:00
James Allen
3b4670509a Remove left over debug logging 2016-11-15 15:51:15 +00:00
James Allen
09074f5413 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-15 15:48:17 +00:00
James Allen
4542d1094d Keep separate persistent change tracker for each doc 2016-11-15 15:48:12 +00:00
Henry Oswald
5b3cd7ed2b use makeRequest func in analytics manager 2016-11-15 15:36:26 +00:00
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Henry Oswald
a822cc0c92 don't log events from health check user 2016-11-15 13:41:15 +00:00
Paulo Reis
d0f451df2e Improve hover behaviour on review entries. 2016-11-15 12:23:39 +00:00
Henry Oswald
b9001f19e6 use indexOf not matches for searching for project by name 
matches treats string like regex so chars like ( break it
just doing a simple indexOf == -1 is fine for a string match

will also fix it for projects with . in name which do come up
 2016-11-15 11:41:14 +00:00
Henry Oswald
6776aa61f1 use new way to send status in express for healthcheck controlller 2016-11-15 11:04:13 +00:00
Henry Oswald
411b5324df don't try and send requests when analytics isn't enabled 2016-11-15 10:54:48 +00:00
Henry Oswald
d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Henry Oswald
6ddfbe9125 Update settings.defaults.coffee 2016-11-15 10:36:11 +00:00
Henry Oswald
15564102a0 Update ProjectController.coffee 2016-11-15 10:34:57 +00:00
Paulo Reis
b181115277 Basic review minimized state. 2016-11-15 10:34:39 +00:00
Paulo Reis
0c600ba9b8 Support overflowing panes in UI layout. 2016-11-15 10:34:19 +00:00
Shane Kilkelly
b212c00311 Fix acceptance tests, use the correct method of getting redis key. 2016-11-14 16:33:54 +00:00
Shane Kilkelly
b67a65ff6a Merge branch 'master' into sk-passport-saml 2016-11-14 16:11:24 +00:00
Shane Kilkelly
6c381b127c Count saml as an external authentication system. 2016-11-14 13:33:48 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
James Allen
d447ebe304 Add timeout around reply layout render 2016-11-14 11:49:34 +00:00
Paulo Reis
7201bde2a3 Add comment UI. 2016-11-14 11:19:00 +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
Shane Kilkelly
803209e668 update shrinkwrap 2016-11-14 10:52:46 +00:00
Henry Oswald
47ed17aab3 remove unneeded package and comma in jade 2016-11-14 10:50:49 +00:00
James Allen
d32a7d0a94 Only apply doc changes, not fold changes in undo manager 2016-11-14 09:44:59 +00:00
Henry Oswald
666bfdf967 stop the /announcements call at controller level 2016-11-11 17:15:36 +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
James Allen
747e14dffe Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:16:10 +00:00
Paulo Reis
3694754ca6 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:10:44 +00:00
Paulo Reis
d04d7f834e Adjustments in the threaded comments, mocked comments responses. 2016-11-11 16:10:26 +00:00
James Allen
9509e87dc1 Update entries in place and position via DOM attributes directly 2016-11-11 16:09:32 +00:00
Shane Kilkelly
2cf2199964 WIP: enable non-csrf routes from modules 2016-11-11 13:48:29 +00:00
James Allen
36b950ea30 Use evalAsync instead of timeout 2016-11-11 13:35:16 +00:00
Paulo Reis
6c5c1549b6 Add comment replies via enter keypress. 2016-11-11 10:51:32 +00:00
Shane Kilkelly
8726a8fb4d Add passport-saml dependency 2016-11-11 09:09:00 +00:00
Paulo Reis
78e409593b Threaded comments. 2016-11-10 17:19:41 +00:00
Paulo Reis
8dcbb6ea4f Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-10 15:09:56 +00:00
Paulo Reis
c5e6ca5200 More entry styling. 2016-11-10 15:08:41 +00:00
James Allen
593e59450b Use different UserSessions keys for cluster vs normal redis session store 2016-11-10 14:31:48 +00:00
Paulo Reis
997addf355 More entry header styling + entry body. 2016-11-10 12:35:35 +00:00
James Allen
e69b6da684 Stop deletes overlapping comments (but leads to occasional flickering) 2016-11-10 12:01:42 +00:00
James Allen
938a8c4894 Fix logic around not tracking rejections to changes 2016-11-10 10:58:55 +00:00
James Allen
4e2dd55cfd Fix merge issues 2016-11-10 10:53:30 +00:00
James Allen
812ee82af1 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 
Conflicts:
	app/views/project/editor/editor.jade
 2016-11-10 10:52:40 +00:00
James Allen
34b2b665a3 Accept and reject changes 2016-11-10 10:52:09 +00:00
Paulo Reis
950fc0179c Basic support for action icons. 2016-11-10 10:19:52 +00:00
James Allen
ca178c1a85 Fix indentation 2016-11-09 17:12:01 +00:00
James Allen
f62d95dd8c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-09 17:11:02 +00:00
James Allen
2e719fc450 Start adding callouts in review panel 2016-11-09 17:10:58 +00:00
Paulo Reis
013df17192 Entry header layout. 2016-11-09 17:09:57 +00:00
Paulo Reis
f28119aacb Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-09 16:36:12 +00:00
Paulo Reis
341a092231 Merge + basic layout for entries. 2016-11-09 16:36:06 +00:00
James Allen
184b421b1f Show user name in comments 2016-11-09 16:34:23 +00:00
James Allen
b44f1cde10 Add user data into changes 2016-11-09 16:23:08 +00:00
Paulo Reis
e0fbb45844 Add colored borders. 2016-11-09 16:00:02 +00:00
Paulo Reis
19241e571f Distinguish between inserts and deletes in the entries repeater. 2016-11-09 15:58:03 +00:00
James Allen
c5532bd8a3 Add cancel buttons for comments 2016-11-09 15:51:40 +00:00
James Allen
1622269d1b Relayout review panel as needed 2016-11-09 15:46:47 +00:00
Paulo Reis
74ddd33bd9 Add colors to LESS file. 2016-11-09 15:39:01 +00:00
James Allen
6d7f4e9e6a Add basic comment replying 2016-11-09 15:25:41 +00:00
James Allen
707ed43a7d Very crude adding of comments 2016-11-09 14:50:58 +00:00
Shane Kilkelly
c3860dd7a7 Remove stray commented-out code, use mapSeries instead of map. 2016-11-09 14:36:25 +00:00
James Allen
446ca7212a Track timestamps of changes 2016-11-09 12:19:48 +00:00
Shane Kilkelly
f6de4cbb44 Merge branch 'master' into sk-sessions-cluster 2016-11-09 12:10:46 +00:00
Shane Kilkelly
5f3098df38 Replace multi-ops with Async.series, tests passing 2016-11-09 11:03:03 +00:00
James Allen
cd494f7866 Update ChangesTracker to handle delete edge case 2016-11-08 17:57:23 +00:00
James Allen
f68c615f61 Remove markers correctly 2016-11-08 17:47:54 +00:00
James Allen
084838926d Add in dashed line callouts for changes and comments 2016-11-08 17:31:08 +00:00
James Allen
4f8055d998 make sure line 1 changes don't hide under toolbar 2016-11-08 16:51:20 +00:00
James Allen
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
Shane Kilkelly
a373868862 Fix unit tests 2016-11-08 16:00:18 +00:00
Shane Kilkelly
bfa0e7cf89 WIP: start moving web sessions to cluster 2016-11-08 15:32:36 +00:00
James Allen
a907ec04fc Don't complain about comment markers when checking 2016-11-08 15:17:20 +00:00
James Allen
8c65cb5835 Track and highlight comment ranges 2016-11-08 15:12:25 +00:00
Henry Oswald
d556cbaacf Merge pull request #361 from djwf/master 
Pass ignoreTLS option to nodemailer
 2016-11-08 11:26:42 +00:00
Shane Kilkelly
e85cb161b2 Merge branch 'sk-bug-can-invite-collaborator' 2016-11-07 15:10:21 +00:00
Brian Gough
f77ee597f4 Merge pull request #365 from sharelatex/bg-redirect-to-login-on-403 
redirect to login on 403
 2016-11-07 14:44:08 +00:00
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
David J. Weller-Fahy
5efee51ed8 Pass ignoreTLS option to nodemailer 2016-11-02 13:14:54 -04: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
Brian Gough
7d2b453030 update ace latex syntax checking (d18cb91) 2016-10-25 13:58:37 +01:00
Brian Gough
d6333d2955 Merge pull request #346 from sharelatex/bg-use-ace-mode-detection 
use ace mode detection
 2016-10-25 13:54:05 +01:00
Shane Kilkelly
6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
Shane Kilkelly
ae2d030a32 Don't call participate if should not test plans 2016-10-25 11:46:52 +01:00
Shane Kilkelly
e268275e77 Fix participate/convert flow for plan tests 2016-10-25 10:47:14 +01:00
Shane Kilkelly
c091399610 Remove track-changes-discount experiment 2016-10-25 09:47:22 +01:00
Henry Oswald
1c3edcd627 added some debug lines 2016-10-24 23:36:49 +01:00
Paulo Reis
4e62e5c4c5 Prevent overflowing project names. 2016-10-24 17:08:46 +01:00
James Allen
52754e038a Reconnect gracefully when asked to by real-time 2016-10-24 16:36:40 +01:00
Paulo Reis
27dfa91683 Add dismiss button. 2016-10-24 12:20:15 +01:00
Paulo Reis
32d59b6212 Add setting saving logic. 2016-10-24 12:20:08 +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
Shane Kilkelly
5cf82e4ef7 Add Metabase events 2016-10-24 11:08:19 +01:00
Shane Kilkelly
8dfd487941 Add plan to event tracking 2016-10-24 11:00:09 +01:00
James Allen
49fecc9ef4 Use v1.6.0 of metrics 2016-10-24 10:51:20 +01:00
Shane Kilkelly
c1ebc65a3b Move convert to top 2016-10-24 10:41:32 +01:00
Henry Oswald
8ba3884428 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-10-21 19:20:43 +01:00
Henry Oswald
91e9447fe5 added logging to smoke test 2016-10-21 19:20:21 +01:00
Henry Oswald
450946212a log out health check failures 2016-10-21 18:59:28 +01:00
Shane Kilkelly
8c1d110688 Remove debug logs 2016-10-21 16:21:21 +01:00
Shane Kilkelly
d5a7514923 Add AB test for plans (+15 squashed commits) 
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
 2016-10-21 16:17:37 +01:00
Paulo Reis
4d33b11ce5 Restrict the appearance of the onboarding view. 2016-10-21 15:00:52 +01:00
Paulo Reis
9dd06df839 More style adjustments. 2016-10-21 15:00:26 +01:00
Paulo Reis
777b28b443 Add animation and other styling items. Small refactor with Less vars. 2016-10-21 12:02:53 +01:00
James Allen
2ac405e58c Allow track changes to be toggled on and off 2016-10-20 16:59:58 +01:00
Paulo Reis
ac07ba035b Navigation in onboarding UI. 2016-10-20 16:39:43 +01:00
Brian Gough
e9b5fc056d fold aceEditor resetSession into session set up 
it is not used elsewhere, and mode setting is now done during the
initialisation.
 2016-10-20 16:03:55 +01:00
Brian Gough
7258e947a8 use ace modelist extension to auto-detect mode 2016-10-20 16:03:19 +01:00
James Allen
60a81beb11 Try out different styling for highlights 2016-10-20 15:18:45 +01:00
James Allen
8f9a4882c8 Don't let widgets in review panel overlap 2016-10-20 15:04:10 +01:00
Brian Gough
84f986058a enable pdfjs cmaps in pdfRenderer 2016-10-20 12:55:58 +01:00
Brian Gough
4d551ced5e add pdfjs cmaps 2016-10-20 12:53:34 +01:00
Paulo Reis
e60f67dacb Bootstrapping. 2016-10-20 12:24:07 +01:00
James Allen
2b94c69795 Don't use the trackChanges engine in the history editor panel 2016-10-20 12:19:57 +01:00
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
Brian Gough
3a07b785db disable auto insert of brackets and quotes in ace 2016-10-20 11:33:12 +01:00
Henry Oswald
7b83a941ee Merge branch 'master' into node-4.2 2016-10-19 13:04:26 +01:00
James Allen
193766b437 Don't switch back to editor view when selecting a file in the history view 2016-10-19 10:43:53 +01:00
James Allen
c88624bf4c Pass through the data needed to trackChangesManager to determine if a remote was local or remote 2016-10-18 18:01:52 +01:00
James Allen
e717caab7f Merge branch 'master' into ja-review-panel 2016-10-18 16:52:41 +01:00
James Allen
05cd6e69a7 Add in extra sentry logging for undefined start in aceDelta 2016-10-18 16:37:40 +01:00
Henry Oswald
1beca53b3d project name should be clickable href in invite email 2016-10-18 15:53:56 +01:00
Brian Gough
cf09a9ed83 Merge pull request #344 from sharelatex/bg-upgrade-pdfjs 
upgrade pdfjs
 2016-10-14 17:03:13 +01:00
Henry Oswald
a02da61cb0 fixed email sender tests looking for wrong settings 2016-10-14 16:43:59 +01:00
Brian Gough
29080bafb2 use PDFJS text layer renderer instead of our own 2016-10-14 12:00:47 +01:00
Brian Gough
e42d256d4f remove pdfjs-1.0.712 no longer used 2016-10-13 16:10:02 +01:00
Brian Gough
1bbf237943 remove pdfjs-1.0.1040 no longer used 2016-10-13 16:10:02 +01:00
Brian Gough
991486ab60 make html valid (div not allowed in p tag) 2016-10-13 16:10:02 +01:00
Brian Gough
0bd36a9e3b fix comment 2016-10-13 16:10:02 +01:00
Brian Gough
c98f40b90b use a single pdfjs worker, rotated to avoid leaks 2016-10-13 16:10:02 +01:00
Brian Gough
85d8c2ed2e pass in PDFJS as a module, not global 2016-10-13 16:10:01 +01:00
Brian Gough
71275efebe remove unused pdf dependency 2016-10-13 16:10:01 +01:00
Brian Gough
27a8dc1dfd upgrade pdfjs to 1.6.210p1 2016-10-13 16:10:01 +01:00
Brian Gough
5748d1e7ec add pdfjs 1.6.210 (patched with font fix) 2016-10-13 16:10:01 +01:00
Brian Gough
f31e3260ee remove pdfjs special case disableFontFace for MSIE 2016-10-13 16:10:01 +01:00
Brian Gough
4ca918a3b8 render canvas on-screen to avoid bad fonts in MSIE 2016-10-13 14:40:57 +01:00
James Allen
09195882f4 Add scrollbar todo note 2016-10-13 14:25:46 +01:00
James Allen
4999ed30f8 Merge branch 'master' into ja-review-panel 2016-10-13 14:22:43 +01:00
James Allen
7a4bebd785 Allow review panel to be toggled 2016-10-13 14:22:23 +01:00
Henry Oswald
bfeb7e082f added textEncoding option for email 2016-10-13 14:22:08 +01:00
James Allen
42ab2e8165 Init review panel with ace editor height 2016-10-13 12:21:49 +01:00
James Allen
77c02042f8 Recalculate change offsets on editor resize 2016-10-13 12:09:18 +01:00
James Allen
8d968f6865 Tidy up ReviewPanelController 2016-10-13 10:09:59 +01:00
Henry Oswald
d0f9a07197 turn subscriptions off by default 2016-10-12 17:35:40 +01:00
James Allen
fc782581ea Change review panel to feel like part of ace 2016-10-12 17:27:20 +01:00
Shane Kilkelly
3ec0e65ae1 Merge branch 'master' into sk-end-subform-test 2016-10-12 14:34:55 +01:00
James Allen
bf0fba2c89 Minify correct version of Ace 2016-10-12 09:52:15 +01:00
James Allen
c689937297 Merge pull request #338 from sharelatex/ja-track-changes 
Ja track changes
 2016-10-12 09:21:46 +01:00
James Allen
436d63fa12 Merge pull request #339 from sharelatex/ja-fix-accent-keys 
Patch Ace to fix accent key problem in Chrome
 2016-10-12 09:21:33 +01:00
Shane Kilkelly
e706057677 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-10-11 14:44:09 +01:00
Brian Gough
ed262409de Merge pull request #342 from sharelatex/bg-provide-default-requirejs-config 
use separate jade template block for requirejs
 2016-10-11 14:42:40 +01:00
Shane Kilkelly
8fcc58495e Use a new key for the delete-account warning 2016-10-11 14:34:30 +01:00
Brian Gough
380487abf0 use separate jade template block for requirejs 
removes the need to suppressDefaultJs
 2016-10-11 14:31:04 +01:00
James Allen
4ac55c7671 Merge branch 'ja-track-changes' into ja-review-panel 2016-10-11 14:24:51 +01:00
James Allen
e9c8fc7c20 Add in review panel layout 2016-10-11 14:24:01 +01:00
Shane Kilkelly
e2cf40ff33 Remove old default subscription form, replace with 'simple' form 2016-10-11 14:07:31 +01:00
Brian Gough
452f6117cd remove console.log 2016-10-11 13:56:17 +01:00
Brian Gough
0f2959eb3b use suppressDefaultJs instead of suppressFooter 2016-10-11 13:04:10 +01:00
Brian Gough
b9ecfcf41f provide minimal requirejs config 2016-10-11 13:02:30 +01:00
James Allen
0fbbad33ff Use built in Ace browser detection 2016-10-11 11:40:26 +01:00
Paulo Reis
e26eda5754 Update regex to grab Chrome version. 2016-10-11 11:34:33 +01:00
James Allen
0b6c71f688 Patch Ace to fix accent key problem in Chrome 2016-10-11 11:17:38 +01:00
James Allen
65bc8a84db Merge pull request #332 from MCribbin/patch-4 
Update HumanReadableLogsRules.coffee
 2016-10-11 11:11:10 +01:00
James Allen
cd33029678 Merge pull request #337 from MCribbin/patch-5 
Update HumanReadableLogsRules.coffee
 2016-10-11 11:10:44 +01:00
James Allen
32d7bb16e5 Be more explicit with query string to turn on track changes 2016-10-11 09:40:15 +01:00
James Allen
9682af3981 Merge branch 'master' into ja-track-changes 
Conflicts:
	public/coffee/ide/history/HistoryManager.coffee
 2016-10-10 17:10:10 +01:00
James Allen
0995ba5ee6 Add basic change tracking into editor behind a feature flag 2016-10-10 17:06:46 +01:00
James Allen
1c9abd35f8 Rename track-changes -> history on the client 
Conflicts:
	app/views/project/editor/history.jade
 2016-10-10 16:59:25 +01:00
Henry Oswald
65e48652ee don't add second slash into uni redirect 2016-10-10 15:36:12 +01:00
Henry Oswald
adc6b429e6 record when a subscription is canceled 2016-10-10 15:29:54 +01:00
Henry Oswald
92e3101d81 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-10-10 15:29:06 +01:00
Shane Kilkelly
c4fd9f3bce Merge branch 'master' into sk-session-button 2016-10-10 14:49:55 +01:00
MCribbin
0d5e6e2abf Update HumanReadableLogsRules.coffee 2016-10-10 13:31:38 +01:00
Shane Kilkelly
9d3baf488f Use the query operator for existence check 2016-10-10 13:28:03 +01:00
Shane Kilkelly
a722646040 Remove un-used module 2016-10-10 11:05:14 +01:00
Shane Kilkelly
0f65e98566 add acceptance test for clearing sessions 2016-10-10 10:55:45 +01:00
James Allen
220759ee7a Merge pull request #330 from sharelatex/ja-non-english-spell-check 
Use comprehensive unicode letter regex for spell check matching
 2016-10-10 08:54:56 +01:00
Henry Oswald
101896a754 redirect to /i/ university 2016-10-07 17:10:58 +01:00
Shane Kilkelly
25dd998107 clear-sessions page (+4 squashed commits) 
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
 2016-10-07 16:47:00 +01:00
Brian Gough
d2db6663e5 Merge pull request #335 from sharelatex/bg-ace-syntax-validator 
add ace syntax validator with latex parsing
 2016-10-07 15:05:34 +01:00
Brian Gough
2d1a0b34d5 Merge pull request #333 from sharelatex/support-package-versions 
Support package versions
 2016-10-07 15:04:59 +01:00
Shane Kilkelly
894c549ec6 WIP: display sessions on a page 2016-10-06 15:49:47 +01:00
Brian Gough
fe866e54fc add latex syntax checking 2016-10-06 14:56:24 +01:00
Brian Gough
8c7d712738 update live version of ace to 1.2.5 2016-10-06 14:20:23 +01:00
Brian Gough
8ab0a396a1 added versioned directory for ace 1.2.5 2016-10-06 14:19:10 +01:00
Brian Gough
fc5f7b5df5 don't ignore files under js/ace directory in git 2016-10-06 14:19:10 +01:00
MCribbin
fba22dc11f Update HumanReadableLogsRules.coffee 2016-10-06 12:29:42 +01:00
Brian Gough
9177544ed9 add left menu for syntax validator 2016-10-06 11:51:24 +01:00
Brian Gough
0946729ae6 clean up config object 2016-10-05 14:54:42 +01:00
Brian Gough
837151a395 include moment in package versions 2016-10-05 14:54:42 +01:00
Brian Gough
8b6425317f introduce PackageVersions module 
put all package versions in one central place
 2016-10-05 14:54:42 +01:00
MCribbin
1ce8901c2a Update HumanReadableLogsRules.coffee 2016-10-05 14:12:49 +01:00
Shane Kilkelly
95a66bbf00 Merge pull request #328 from sharelatex/sk-plain-text-email 
Sk plain text email
 2016-10-05 10:04:08 +01:00
Henry Oswald
3141f91b59 Merge pull request #322 from sharelatex/ho-password-limits 
Ho password limits
 2016-10-05 10:03:54 +01:00
Shane Kilkelly
73bb11e4a0 Ask user to type their email when deleting account, not "DELETE" 2016-10-04 15:57:08 +01:00
Paulo Reis
ef1aab1c27 Track header AB conversions only on click events. 2016-10-04 14:42:01 +01:00
Paulo Jorge Reis
38925feccd Merge pull request #331 from sharelatex/pr-ab-test-dropbox-teaser 
AB test dropbox teaser
 2016-10-04 14:35:05 +01:00
Paulo Reis
3925ba9364 Add assets for animated dropbox teaser. 2016-10-04 11:58:19 +01:00
Paulo Reis
ea8277ef78 Add assets for focused dropbox teaser. 2016-10-04 11:57:42 +01:00
James Allen
201012a131 Use comprehensive unicode letter regex for spell check matching 2016-10-04 11:24:48 +01:00
Shane Kilkelly
e699fcb1fa Add plain-text component to the project-invite email 2016-10-03 15:25:38 +01:00
Shane Kilkelly
b42a3b9188 Fix logging typo 2016-10-03 15:25:18 +01:00
Henry Oswald
ed906f085c fix spelling mistake in error message and comment out settings.defaults 2016-10-03 11:33:14 +01:00
James Allen
5188a138de Merge pull request #327 from sharelatex/ja-log-parser-improvements 
Update log parser to better handle Runaway argument errors
 2016-10-03 09:26:52 +01:00
James Allen
1e1c4ec570 Disable font face in PDFs for IE 11 as well 2016-09-30 15:12:27 +01:00
James Allen
901e32a050 Merge pull request #326 from sharelatex/ho-fingerprintmultiple 
Ho fingerprintmultiple
 2016-09-28 09:58:03 +01:00
Paulo Reis
cdd873a1cf Small style adjustments in the labels AB test. 2016-09-28 09:31:59 +01:00
Paulo Jorge Reis
cef367fde2 Merge pull request #325 from sharelatex/pr-ab-test-labels 
AB test labels
 2016-09-28 09:02:15 +01:00
Henry Oswald
4f3b57ceeb cleaned up comments 2016-09-27 16:23:40 +01:00
Henry Oswald
a00cb707cc fingerprints are grouped into lists with this change 
fingerprints are shared when require.js pulls in other resources.
this change means changes to either ace.js or mode-latex.js will
result in different fingerprints for those files.
 2016-09-27 16:21:04 +01:00
Paulo Reis
270bf81667 Cleanup. 2016-09-27 16:12:45 +01:00
Paulo Reis
b6d237e189 More granular tracking, in metabase. 2016-09-27 16:01:56 +01:00
Shane Kilkelly
b497182557 Add an acceptance test for registration and login 2016-09-27 11:55:51 +01:00
Paulo Reis
38d04e27c9 Restrict AB test to newly registered users. 2016-09-27 11:50:34 +01:00
Henry Oswald
6141eb4a44 null check user_id 2016-09-26 17:25:11 +01:00
Paulo Reis
6ccf7288e6 Register conversions. 2016-09-26 16:18:37 +01:00
Paulo Reis
d97313d22c Horizontal layout. 2016-09-26 16:09:27 +01:00
Paulo Reis
23671c7b18 Label styling. 2016-09-26 15:03:04 +01:00
Paulo Reis
9208fe7c30 Basic mark-up for AB testing labels. 2016-09-26 15:02:54 +01:00
Henry Oswald
8558ce1f75 improve error handling in update merger 2016-09-26 13:57:57 +01:00
Shane Kilkelly
fb6f6c13c9 Merge branch 'master' into sk-passport 2016-09-26 09:43:19 +01:00
Brian Gough
bba6008e4d Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change 
Ace syntax validator minimal change
 2016-09-26 09:25:50 +01:00
Shane Kilkelly
ab4916067e Merge branch 'master' into sk-passport 2016-09-26 09:18:24 +01:00
Shane Kilkelly
dd14e51713 Handle null, undefined and false in isUserLoggedIn 2016-09-23 16:53:07 +01:00
Henry Oswald
8a2b7d0461 server side protect passwords which are too long 2016-09-23 16:51:46 +01:00
Henry Oswald
0d0f0e8604 wip 2016-09-23 16:38:46 +01:00
Shane Kilkelly
f9030a0a38 get user_id directly 2016-09-23 16:25:23 +01:00
Shane Kilkelly
7384a08cb4 Pass req to function. 2016-09-23 16:21:07 +01:00
Henry Oswald
67f8ec756c Revert "wip" 
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
 2016-09-23 16:19:11 +01:00
Henry Oswald
7c0e338352 fix bug where users are always shown downgrade option when not required 2016-09-23 16:18:22 +01:00
Henry Oswald
5c2fbaafd3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-09-23 15:45:42 +01:00
Henry Oswald
0802ab6ddc wip 2016-09-23 15:44:47 +01:00
Brian Gough
4f9826c87b show beta program link for everyone on /settings 2016-09-23 15:28:15 +01:00
Brian Gough
0eaa359f6c use syntax validator for beta programme users only 2016-09-23 15:19:40 +01:00
Brian Gough
975b70e4fe add latex syntax highlighting 2016-09-23 15:19:40 +01:00
Brian Gough
d152095920 destroy ace sessions when no longer in use 
also set mode to "latex" when session is created, to avoid setting mode
to "text" (default) and then to "latex" which causes the text worker to
be unnecessarily created and destroyed.
 2016-09-23 15:19:40 +01:00
Brian Gough
0a350c8e3f infrastructure for using ace syntax checking 2016-09-23 15:19:40 +01:00
Shane Kilkelly
02587377a2 Remove ReferalMiddleware, dead code. 2016-09-23 14:42:57 +01:00
Shane Kilkelly
6e8185aeaf Merge branch 'master' into sk-passport 2016-09-23 10:28:35 +01:00
Shane Kilkelly
6c716ca252 Fix acceptance tests by updating invite-accept url 2016-09-23 10:28:17 +01:00
Shane Kilkelly
72ca1d6316 Merge branch 'master' into sk-passport 
# Conflicts:
#	app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
 2016-09-23 10:01:11 +01:00
James Allen
2b317cab6c Merge pull request #320 from sharelatex/ja-validate-filenames 
Don't allow files to be created with / or * characters
 2016-09-23 09:42:48 +01:00
Paulo Jorge Reis
f4ff72a2e4 Merge pull request #318 from sharelatex/ja-invite-emails-once 
Ja invite emails once
 2016-09-22 17:36:10 +01:00
James Allen
e15976be21 Use token in URL to force its precense when invite and allow easy dynamic notifications 2016-09-22 17:24:06 +01:00
Shane Kilkelly
dbac4bd008 update session when user settings change 2016-09-22 16:58:25 +01:00
Shane Kilkelly
7e449c60ed fix tests 2016-09-22 16:04:42 +01:00
Shane Kilkelly
636b1fe9e2 Copy to session.user, for compatibility 2016-09-22 15:49:09 +01:00
Shane Kilkelly
a0f156e1a9 wipe out more session access 2016-09-22 15:33:50 +01:00
James Allen
21f88bb20e Use ide.validFileRegex, not hard coded regex 2016-09-22 14:57:59 +01:00
James Allen
9506797384 Update log parser to better handle Runaway argument errors 2016-09-22 14:47:48 +01:00
Shane Kilkelly
ff1c72ee14 Fix up more session access 2016-09-22 14:30:34 +01:00
Shane Kilkelly
c959e0c65d Set req.user 2016-09-22 13:54:13 +01:00
Shane Kilkelly
6df569253a Fix session touch 2016-09-22 13:48:09 +01:00
Shane Kilkelly
7f24dd6f55 Fix tests for UserInfoController. 2016-09-22 13:37:27 +01:00
Shane Kilkelly
a3ace1fccd Increase timeout because slow tests 2016-09-22 11:33:54 +01:00
Shane Kilkelly
3b73d97931 Use getLoggedInUserId 2016-09-22 11:33:38 +01:00
Shane Kilkelly
64c9a3ae18 Fix logic, was wrong way around 2016-09-22 11:16:50 +01:00
James Allen
4386ab1225 Don't allow files to be created with / or * characters 
Requires the following translations:

  "files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters",
  "invalid_file_name": "Invalid File Name"
 2016-09-21 16:31:55 +01:00
Shane Kilkelly
41cc9e68b5 update npm shrink-wrap 2016-09-21 15:15:44 +01:00
Brian Gough
de2e0478c6 disable pdfjs fontface on Microsoft Edge 2016-09-21 13:58:14 +01:00
Shane Kilkelly
c12450f533 Merge branch 'master' into sk-passport 2016-09-21 13:17:54 +01:00
Shane Kilkelly
dde5b7b830 Regenerate session on login, protect against session-fixation attack. 2016-09-21 13:03:37 +01:00
James Allen
d904e50041 Make project invite notification dynamic and accept via ajax request 
Needs translations:

  "joining": "Joining",
  "notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>",
  "notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>",
  "open_project": "Open Project"
 2016-09-21 11:59:35 +01:00
James Allen
779ace2fb7 Merge branch 'master' into ja-invite-emails-once 2016-09-21 10:48:43 +01:00
James Allen
2478a95bcb Don't watch files as grunt default 2016-09-21 10:48:23 +01:00
James Allen
bb7985208b Lower case email before considering if it's duplciated when sharing 2016-09-21 10:48:04 +01:00
James Allen
a93c939dbc Send invite email and notification in the background 2016-09-21 10:11:35 +01:00
Shane Kilkelly
bb71433727 Remove getLoggedInUser 2016-09-21 09:27:51 +01:00
Shane Kilkelly
eca1dfa482 Remove dead code 2016-09-21 09:27:35 +01:00
James Allen
c2e14ded13 Add null checks for fileRefs and docs, which are not present when calling mkdirp 2016-09-20 16:55:12 +01:00
Henry Oswald
1a67e4982e change blog regex to look for src's which start with a slash 2016-09-20 15:43:36 +01:00
Henry Oswald
21ca9697ca log user_id not user 2016-09-20 15:11:14 +01:00
Henry Oswald
777cbf1c80 move comment for user is false next to if statment 2016-09-20 14:51:51 +01:00
Henry Oswald
d4863ae148 don't use cdn for blog posts which have a http on them 2016-09-20 14:48:35 +01:00
Shane Kilkelly
4eada48638 Merge branch 'master' into sk-passport 2016-09-19 15:40:25 +01:00
James Allen
0917fe10ca Return type when finding element by path so that we don't need a heuristic 2016-09-19 14:35:25 +01:00
Brian Gough
ebe3ba4fb8 Merge pull request #316 from sharelatex/pdfjs-font-patch 
Pdfjs font patch
 2016-09-19 11:24:50 +01:00
Brian Gough
64dc1784d3 switch to patched version of pdfjs 2016-09-19 11:15:27 +01:00
Brian Gough
6f50d56ceb apply pdfjs font patch 
https://github.com/mozilla/pdf.js/issues/2594#issuecomment-247644205
 2016-09-19 10:30:34 +01:00
Brian Gough
dd4a509d51 add copy of unpatched pdfjs-1.3.91 2016-09-19 10:29:55 +01:00
Shane Kilkelly
97a6ac0f00 Merge branch 'master' into sk-passport 
# Conflicts:
#	app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee
 2016-09-15 14:48:51 +01:00
Shane Kilkelly
2119dcbb58 Finalise login workflow, works with login form again. 2016-09-15 14:36:11 +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
53b3e3831d Update cancellation survey link 2016-09-14 10:51:19 +01:00
James Allen
a45aa7b80e Show word count error messages 2016-09-13 15:54:25 +01:00
James Allen
cc9791d3f4 Redirect to login with a redirect back to the page we want if not logged in 2016-09-13 11:23:47 +01:00
James Allen
1714b014bf Force true or false for userHasNoSubscription, not blank 2016-09-13 10:29:14 +01:00
Shane Kilkelly
438ac45854 fix unit tests 2016-09-07 16:40:49 +01:00
Shane Kilkelly
8e0103a1bc wip: fix unit tests for AuthenticationController 2016-09-07 14:05:51 +01:00
Shane Kilkelly
cc5ddc92bb use getSessionUser rather than getLoggedInUser 2016-09-07 10:30:58 +01:00
Shane Kilkelly
9758dd77b3 kill whitespace 2016-09-07 08:58:57 +01:00
Shane Kilkelly
3a5b3a8e8d wip: acceptance tests working 2016-09-06 15:55:34 +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
Shane Kilkelly
749658a916 WIP: fixing acceptance tests 2016-09-06 13:21:22 +01:00
James Allen
e412e662ee Set default compileTimeout to 3 minutes for onsite users 2016-09-06 11:41:21 +01:00
Brian Gough
afa910c32d turn on syntax check for all users 2016-09-06 11:19:32 +01:00
Shane Kilkelly
c8ee803570 fix limits on sharing, account for both members and invites. 2016-09-06 09:37:53 +01:00
Shane Kilkelly
6aef092dce fix typo 2016-09-06 09:29:58 +01:00
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
7bf3b9daf9 add event tracking for syntax check 2016-08-26 15:54:01 +01:00
Brian Gough
74959e7947 add Grunt task to run without parallel watch 2016-08-26 15:21:18 +01:00
Brian Gough
3c59de31df finalise display of syntax check error message 2016-08-26 15:14:57 +01:00
Brian Gough
092d7da479 use Syntax error for consistency in file check 2016-08-25 16:56:06 +01:00
Brian Gough
696a7206c1 clean up display of error message 2016-08-25 16:55:29 +01:00
Brian Gough
588be16255 handle try/turn off options for syntax check 2016-08-25 15:52:37 +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
7f20415048 only set compileExited on compile errors 2016-08-24 16:48:45 +01:00
Brian Gough
74bc157e7c added force recompile option 2016-08-24 16:48:37 +01:00
Henry Oswald
9238462fe4 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-24 16:34:47 +01:00
Henry Oswald
98770974df remove console.log 2016-08-24 16:34:33 +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
6a72c2fce0 comment settings back out 2016-08-23 16:46:23 +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 Jorge Reis
68a085e1eb Merge pull request #302 from sharelatex/ja-billing-details-update 
Redirect to working update billing details end point that shows a nic…
 2016-08-23 14:42:58 +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
Brian Gough
4b50505ec9 suppress all cascading chktex environment errors 2016-08-23 11:27:27 +01:00
Paulo Reis
f79bee7893 Loading indicator when submitting. 2016-08-23 11:27:09 +01:00
Brian Gough
6f11c2d7cc Merge changes to HumanReadableLogsRules 2016-08-23 10:50:01 +01:00
Brian Gough
f26ed03e7d Merge pull request #299 from sharelatex/roll-out-chktex 
Roll out chktex
 2016-08-23 10:28:58 +01:00
Paulo Reis
1ac31f318e Restart validation on form changes. 2016-08-23 10:06:00 +01:00
Paulo Reis
362d75ef81 Log subscription errors. 2016-08-23 09:59:46 +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
MCribbin
290b1ad134 Update HumanReadableLogsRules.coffee 
Added corrections to new hints:
-Double subscript
-Double superscript
-LaTeX Error: Something's wrong--perhaps a missing \item
-Misplaced \noalign
 2016-08-22 16:33:07 +01:00
Paulo Reis
861022aff0 Make scrollbar only visible when needed. 2016-08-22 16:32:59 +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
11ec486c13 Merge pull request #300 from sharelatex/pr-subscription-improvements 
Pr subscription improvements
 2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1 Add debug query string origin to invocations of the updateSubscription endpoint. 2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6 track when users accept invites 2016-08-19 18:33:03 +01:00
Paulo Reis
b3db66e12b Place tracking event on controller load. 2016-08-19 17:10:07 +01:00
Paulo Reis
92bc411df5 Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form 2016-08-19 16:48:33 +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
Henry Oswald
110820face use url.resolve to build url for freegeoip lookups 2016-08-19 15:40:54 +01:00
Henry Oswald
50b3403983 use url.resolve to build url for freegeoip lookups 2016-08-19 15:39:58 +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
Shane Kilkelly
a904427531 Fix broken test 2016-08-19 11:57:44 +01:00
Henry Oswald
d8e7bacec4 added logging in 2016-08-19 11:53:40 +01:00
Shane Kilkelly
c02854c9d8 Improve log messages 2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64 Add an expect404 option to apiRequest. 
Suppress error generation when 404 response is encountered.
 2016-08-19 11:52:04 +01:00
Henry Oswald
3d36dc7d6c mvp for not using cdn when blocked 2016-08-19 11:05:35 +01:00
Paulo Reis
67290fd6a7 Fix formatting on change and paste events. 2016-08-18 17:56:53 +01:00
James Allen
c653f59705 Add error handling to mkdir_p 2016-08-18 17:48:33 +01:00
Paulo Reis
26e21732f8 Added validations + minor fixes. 2016-08-18 17:41:55 +01:00
Paulo Reis
82a6cd82a6 Minor tweaks in the features list. 2016-08-18 16:56:36 +01:00
Paulo Reis
43b832965f Layout and styling for simple subscription form. 2016-08-18 16:56:23 +01:00
Paulo Reis
097df3a771 Minor fixes. 2016-08-18 16:55:54 +01:00
Brian Gough
133250c150 extend log hints for more chktex errors 2016-08-18 13:28:47 +01:00
Brian Gough
109e79db99 track cascading errors in Human Readable Log Hints 2016-08-18 13:21:27 +01:00
Shane Kilkelly
4a6df04c21 Merge branch 'master' into pr-subscription-improvements 2016-08-18 12:53:56 +01:00
Paulo Reis
1af5017e49 Better integration with Angular models. 2016-08-18 10:39:55 +01:00
Brian Gough
090f10e3be add log hints for new chktex messages 2016-08-18 09:47:57 +01:00
Paulo Reis
4814fc2606 Simple layout for subscription form. 2016-08-17 17:34:17 +01:00
Paulo Reis
79d9e54458 Basic port of Stripe JS credit card validation and formatting lib. 2016-08-17 17:34:04 +01:00
Shane Kilkelly
ece0491e3d Refactor. Handle republishing of notifications on resend. 2016-08-17 16:27:15 +01:00
Paulo Reis
672d4f8767 Setup AB test (alternative is still empty). 2016-08-17 12:11:17 +01:00
Shane Kilkelly
85f49d6c9c Make whole 'red button' in email a link 2016-08-17 10:37:44 +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
fc068b62a2 defend against undefined plan_code 2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716 Improve error handling 2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3 Add counts to log message 2016-08-16 11:33:14 +01:00
Shane Kilkelly
da40f54d55 Improve logging, add acceptance tests for joinProject json 2016-08-16 11:17:45 +01:00
Brian Gough
cb4f6391a2 updated comments 2016-08-16 10:59:27 +01:00
Shane Kilkelly
b68af254ff Correct logic for bailing out with no privileges 2016-08-16 09:59:42 +01:00
Brian Gough
7fcae775ee Merge pull request #297 from sharelatex/roll-out-chktex 
Roll out chktex
 2016-08-16 09:48:01 +01:00
Shane Kilkelly
d2183738c5 Improve logging for debugging 2016-08-16 09:04:11 +01:00
Brian Gough
93f69ca0a2 run chktex silently for all users 2016-08-15 16:48:48 +01:00
Brian Gough
8d6cdb03e8 restrict compile check options 
allowed options are validate/error/silent

validate = only run chktex, exit status 0
error = run compilation, exit(1) if chktex fails
silent = run chktex, but always do full compilation
 2016-08-15 16:46:53 +01:00
Brian Gough
7bec656bc2 sort latex output files into order in dropdown 2016-08-15 16:45:33 +01:00
Shane Kilkelly
d40cf6568d Set invites to empty array 2016-08-15 15:40:16 +01:00
Shane Kilkelly
36d969e6e6 Set invites to be an empty array if missing 2016-08-15 15:22:23 +01:00
Shane Kilkelly
40cb7e4590 defend against undefined property 2016-08-15 15:19:16 +01:00
Shane Kilkelly
492853f284 Defend against undefined invites and members 2016-08-15 14:56:02 +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
f92767f7b5 Address feedback, add ? checks where appropriate 2016-08-12 15:26:20 +01:00
Shane Kilkelly
e53394919f Rework how invite expiry functions. 2016-08-12 14:40:59 +01:00
Shane Kilkelly
d547bff4e5 Blur the resend button after response 2016-08-12 11:25:03 +01:00
Shane Kilkelly
a7bc8bffe0 Update markAsReadByKeyOnly url. 2016-08-12 09:59:25 +01:00
Brian Gough
7863b7cab6 when calling gotoLine also scrollToLine to put line in view 2016-08-11 16:46:30 +01:00
Brian Gough
daa1d80865 add extra delay to gotoLine event 2016-08-11 16:46:12 +01:00
Shane Kilkelly
a9042ff324 Enable enter key on share dialog button 2016-08-11 15:24:35 +01:00
Shane Kilkelly
276241495b Fix tests 2016-08-11 14:23:25 +01:00
Shane Kilkelly
ce039f8cd3 Remove the email when user id is added to project 2016-08-11 14:17:01 +01:00
Paulo Reis
228de5332e Unit test tracking code. 2016-08-11 14:09:57 +01:00
Paulo Reis
9bf9df9a4a Track login events. 2016-08-11 14:09:45 +01:00
Shane Kilkelly
826295167f Mark Notification as read by key alone 2016-08-11 14:04:11 +01:00
Brian Gough
9a399d3dd3 move "run syntax check" compile option out of beta 2016-08-11 13:55:47 +01:00
Brian Gough
a862592138 added syntax check to beta page, removed mendeley 2016-08-11 13:43:33 +01:00
Paulo Reis
6a210978fe Track registration events. 2016-08-11 12:29:58 +01:00
James Allen
0270d34d0f Use JSONB not JSON column type 2016-08-11 10:19:07 +01:00
Paulo Reis
64d0b8bc7c Update shrinkwrap. 2016-08-10 17:46:22 +01:00
Paulo Reis
b405b4dce6 Remove Countly integration. 2016-08-10 17:34:32 +01:00
Paulo Reis
6a3372fcbf Use new event tracking methods. 2016-08-10 17:33:56 +01:00
Paulo Reis
0ec8e22ccf Send events to Postgre. 2016-08-10 17:28:13 +01:00
James Allen
4886e8ba0e Rename metadata -> segmentation in Events table to play well with metabase 2016-08-10 17:22:35 +01:00
James Allen
056bb6b0f4 Use a JSON column for metadata 2016-08-10 17:17:59 +01:00
James Allen
93cd511211 Send events to custom DB backend 2016-08-10 16:42:56 +01:00
Shane Kilkelly
3cec6affab Test creating two invites at once 2016-08-10 15:24:09 +01:00
Shane Kilkelly
5351e79c7a Test creating, listing and revoking invites as owner 2016-08-10 14:39:27 +01:00
Brian Gough
abcfb2dd16 Merge pull request #290 from sharelatex/enable-chktex 
Enable chktex
 2016-08-10 11:49:31 +01:00
Shane Kilkelly
0e0ccb41ff cancel notification when accepting invite 2016-08-08 13:57:33 +01:00
Shane Kilkelly
110082390e Test the _trySendInviteNotfification helper 2016-08-08 10:34:54 +01:00
Shane Kilkelly
e0444cfc62 Make notification column layout explicit. 2016-08-05 16:41:11 +01:00
Shane Kilkelly
9b46c1b1f7 WIP: notification when user is sent an invite 2016-08-05 16:11:03 +01:00
Henry Oswald
93af1a70ac added notifications into settings.defaults 2016-08-05 15:16:01 +01:00
Henry Oswald
90e0f829f5 removed old grunt tasks, moved to sharelatex/sharelatex 2016-08-05 15:16:01 +01:00
Henry Oswald
24d3eed77c resized harvard 2016-08-05 15:16:01 +01:00
Shane Kilkelly
d59b51aacd Add error handlers. 2016-08-05 14:09:37 +01:00
Shane Kilkelly
eafd61a90e Refresh members and invites in client when status changes 2016-08-05 14:01:08 +01:00
Shane Kilkelly
8f7603c324 Add an endpoint to access project members 2016-08-04 16:47:48 +01:00
Shane Kilkelly
092c036406 Rate-limit calls to invite api 2016-08-04 09:50:47 +01:00
Paulo Jorge Reis
60f8e577a8 Merge pull request #293 from sharelatex/pr-wrap-long-words-chat 
Wrap long words chat
 2016-08-03 16:32:36 +01:00
Shane Kilkelly
721ea88bd0 If email is already invited, resend the invite 2016-08-03 16:30:34 +01:00
Brian Gough
42388f8b76 fix missing space in pdf jade template 2016-08-03 16:30:33 +01:00
Brian Gough
7ce406dd38 switch the compile dropdown menu to left, to avoid overflow into editor 2016-08-03 16:30:18 +01:00
Brian Gough
4d3629e5db add beta feature badge to syntax check 2016-08-03 16:29:46 +01:00
Paulo Reis
73f115fc57 Add i18n keys. 2016-08-03 16:09:45 +01:00
Paulo Reis
cf5c8e27e1 UI fix - do not allow multiple clicks to restore a deleted file. 2016-08-03 16:05:19 +01:00
Shane Kilkelly
a5ddcc3df7 Allow resending of invites 2016-08-03 15:42:19 +01:00
Shane Kilkelly
e7251aab53 Small wording changes 2016-08-03 14:06:08 +01:00
Paulo Reis
216779fafe Track-changes usage. 2016-08-03 12:36:42 +01:00
Paulo Reis
e6898d64c9 Track hovering of header features. 2016-08-03 12:17:19 +01:00
Shane Kilkelly
8cb93511df Update UI of share modal 2016-08-03 11:55:24 +01:00
Shane Kilkelly
6ea690225f Refactor view-invite to not use model calls. 2016-08-03 10:23:34 +01:00
Henry Oswald
892511820e fix logging on groupPlan invite notification 2016-08-02 17:09:42 +01:00
Shane Kilkelly
5f8952450e Test getInviteCount 2016-08-02 16:08:05 +01:00
Shane Kilkelly
3a3688d3d0 Include invites count in canAddXCollaborators 2016-08-02 15:42:50 +01:00
Shane Kilkelly
2494026b85 Move Helpers/EmailHelpers to Helpers/EmailHelper 2016-08-02 15:42:26 +01:00
Henry Oswald
418d1c56da nullcheck qqfile on upload files 2016-08-02 15:36:59 +01:00
Henry Oswald
928777b61c add null check to redis return value for getValueFromTokenAndExpire 2016-08-02 15:34:44 +01:00
Henry Oswald
2ad0bab976 use underscore.each so it doesn’t blow up on non array. 2016-08-02 15:33:41 +01:00
Brian Gough
38f76b305b change message to "Run syntax check" 2016-08-02 14:43:09 +01:00
Shane Kilkelly
13fe000176 Move email parsing code to Helpers/EmailHelpers 2016-08-02 14:30:42 +01:00
Shane Kilkelly
abbd059eae Refactor to existing addUserIdToProject function 2016-08-02 13:51:00 +01:00
Paulo Reis
01637386bd Use string split instead of regex. 2016-08-02 11:59:43 +01:00
Shane Kilkelly
63f8fe453a Use UserGetter rather than User model 2016-08-02 09:48:09 +01:00
Shane Kilkelly
dca1c9be5d Load invites on project load, rather than asynchronously. 2016-08-01 17:05:37 +01:00
Paulo Reis
ff62e50530 Integrate word wrapping filter in the chat component. 2016-08-01 16:42:54 +01:00
Paulo Reis
c6334ffab7 Add Angular filter for wrapping words larger than N characters. 2016-08-01 16:35:28 +01:00
Shane Kilkelly
a6b8bf6ece Undo debug change 2016-08-01 16:06:56 +01:00
Shane Kilkelly
291a26595c Remove referal id from invite email link 2016-08-01 15:56:07 +01:00
Shane Kilkelly
9787edd716 Add more assertions about project access 2016-08-01 15:55:56 +01:00
Shane Kilkelly
9e0ff3f628 test when the token is invalid 2016-08-01 15:21:06 +01:00
Shane Kilkelly
495bc1bcd3 Refactor 2016-08-01 15:16:10 +01:00
Shane Kilkelly
8af1a7b17a Test login workflow 2016-08-01 15:16:03 +01:00
Shane Kilkelly
263822d665 Also parse out login url 2016-08-01 13:54:49 +01:00
Paulo Reis
4b8ab2dbba More comments. 2016-08-01 13:35:49 +01:00
Shane Kilkelly
5f1aa4cc58 test registration with invalid token 2016-08-01 13:30:43 +01:00
Shane Kilkelly
69bd954001 test the registration workflow 2016-08-01 12:14:34 +01:00
Paulo Reis
0d4e1e5495 Try a smaller timeout + minor fixes. 2016-08-01 11:12:50 +01:00
Shane Kilkelly
5159cdd0e9 Test when the user recieves second invite to project 2016-08-01 10:57:20 +01:00
Shane Kilkelly
545ce79c71 Test clicking the invite after already accepting 2016-08-01 10:14:08 +01:00
Shane Kilkelly
9c530e1bb6 rename test case 2016-08-01 10:04:42 +01:00
Shane Kilkelly
74c824edde Test redirect to /register when user not logged in 2016-08-01 09:59:30 +01:00
Shane Kilkelly
7a8142a43c remove extraneous body parameter 2016-08-01 09:06:02 +01:00
Paulo Reis
16e8cd7820 Refactor Safari scroll patcher; ensure it works after PDF is reloaded. 2016-07-29 17:45:50 +01:00
Paulo Reis
9b3a28048e Integrate Safari scroll patcher. 2016-07-29 17:24:55 +01:00
Paulo Reis
f012a6fe32 Scroll patcher for Safari. 2016-07-29 17:24:45 +01:00
Brian Gough
e508f7b8a9 don't try to display a log hint link if there isn't one 2016-07-29 15:11:34 +01:00
Brian Gough
0742db7732 enable validation option only for beta programme users 2016-07-29 15:11:34 +01:00
Brian Gough
208798ebe3 add a log hint for mismatched brackets 2016-07-29 14:59:48 +01:00
Brian Gough
4d3b743e4d display validation errors only when doing validation 2016-07-29 14:59:48 +01:00
Brian Gough
a3c8202d0e support jumping to position with line and column from log entries 2016-07-29 14:59:48 +01:00
Brian Gough
5da1b90418 use validate as keyword for syntax checks 2016-07-29 14:59:48 +01:00
Brian Gough
14a0499b56 allow HumanReadableLogs to rewrite messages with regex 
also allow an explicit hintId for each rule
 2016-07-29 14:59:48 +01:00
Brian Gough
d4c5028350 allow HumanReadableLogs to accept an already parsed log 2016-07-29 14:59:48 +01:00
Brian Gough
e99176c0d0 fix tests 2016-07-29 14:59:48 +01:00
Brian Gough
ef85f1014c add menu option for checking with chktex 2016-07-29 14:59:48 +01:00
Brian Gough
e0d5075fdb include check option when compiling 2016-07-29 14:59:48 +01:00
Shane Kilkelly
39fc611964 Revoke invite after each test 2016-07-29 13:55:08 +01:00
Shane Kilkelly
e7c1f7f0fc Refactor, deduplicate tests 2016-07-29 13:39:18 +01:00
Shane Kilkelly
f3a1f32bb1 Test the invalid-invite page 2016-07-29 11:54:08 +01:00
Shane Kilkelly
b33d4e103d Test when the user does not accept the invite 2016-07-29 11:08:24 +01:00
Shane Kilkelly
f33d01f375 Test acceptance of invite 2016-07-29 11:04:07 +01:00
Shane Kilkelly
563247044b Start testing the invite page 2016-07-29 09:52:55 +01:00
Shane Kilkelly
23c94c9599 get invite and link for test 2016-07-28 16:00:18 +01:00
Shane Kilkelly
9c6195fbec Factor out link builder 2016-07-28 15:59:59 +01:00
Shane Kilkelly
7b18f88145 Merge branch 'master' into pr-email-tokens 2016-07-28 14:53:36 +01:00
Shane Kilkelly
748851b51e start ProjectInvite acceptance test module 2016-07-28 14:53:22 +01:00
Shane Kilkelly
29d333ae51 Increase timeout on acceptance tests 2016-07-28 14:50:08 +01:00
Henry Oswald
23cb6a9419 Merge branch 'master' into node-4.2 2016-07-28 13:54:06 +01:00
Shane Kilkelly
254705c3f1 Tidy up, and fall back to handling data.users. 2016-07-28 13:47:19 +01:00
Shane Kilkelly
ed65e16e54 If user is member of project, redirect to project. 
Leave invite in place to expire naturally.
 2016-07-28 11:15:11 +01:00
Shane Kilkelly
1cb9c3582d Don't return early if user is already member. 2016-07-28 09:47:07 +01:00
Paulo Reis
3825111713 No need to check for property existence. 2016-07-27 17:08:15 +01:00
Paulo Reis
4c2f69692e Namespace events which are sent only once. 2016-07-27 16:56:14 +01:00
Paulo Reis
a93980f080 Use existing localStorage module. 2016-07-27 16:53:44 +01:00
Paulo Reis
a3af95006b Minor fixes. 2016-07-27 16:22:23 +01:00
Paulo Reis
406175a410 Protection against possible local storage write errors. 2016-07-27 16:17:16 +01:00
Shane Kilkelly
e70f121461 Correct name of expireAfterSeconds index 2016-07-27 15:55:31 +01:00
Paulo Reis
64654257a1 Track a few high-frequency events only once. 2016-07-27 15:53:28 +01:00
Paulo Reis
5ea9558976 Add method to track event only once (stores sent events in local storage). 2016-07-27 15:53:04 +01:00
Shane Kilkelly
62d544ccfc Redirect to project if user is already member. 
If invite is missing, and current user is already a member
of the project, then just redirect to the project page
 2016-07-27 15:28:22 +01:00
Paulo Reis
f4d78a856c Disable page view and session tracking. 2016-07-27 14:20:39 +01:00
Shane Kilkelly
46ec17f2c4 Add redir query string to login link 2016-07-27 13:51:52 +01:00
Shane Kilkelly
e1af171534 Add a dot to end of sentence. 2016-07-27 11:07:26 +01:00
Shane Kilkelly
6f39813a56 Add translations 2016-07-27 10:56:22 +01:00
Shane Kilkelly
78948251a1 Change the Close button color 2016-07-27 10:28:01 +01:00
Shane Kilkelly
827629a74a Invalid-invite page, and re-jigg the share modal 2016-07-27 10:10:44 +01:00
Shane Kilkelly
1a8c86ab6b Merge branch 'pr-empty-autocomplete' 2016-07-27 08:42:24 +01:00
Paulo Reis
acd95b6215 Disable tracking of a few high frequency events. 2016-07-26 17:04:06 +01:00
Paulo Reis
5349ea6ed8 Avoid using FormData.set, Safari only has support for append. 2016-07-26 15:54:58 +01:00
Shane Kilkelly
72c9c3f020 If there are no completions matching, detach the completer. 
This prevents an invisible completer from swallowing keystrokes such as up/down
 2016-07-26 15:54:33 +01:00
Paulo Reis
6d0779b8f8 Add forgotten name attribute. 2016-07-26 14:47:48 +01:00
Paulo Reis
ab305ea07e Merge branch 'master' into pr-log-hints-negative-feedback 2016-07-26 14:27:15 +01:00
Shane Kilkelly
6162c5ec60 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-26 14:23:08 +01:00
Shane Kilkelly
e46901a21b Send an empty keys array when there is no data 2016-07-26 14:23:00 +01:00
Shane Kilkelly
855cc28483 Finish adding project and owner details to the accept-invite page 2016-07-26 14:14:14 +01:00
Shane Kilkelly
367b138cae fix failing tests 2016-07-26 12:09:58 +01:00
Paulo Reis
a3ee3134b1 Support for i18n. 2016-07-26 11:56:15 +01:00
Paulo Reis
24614effc4 Support other as answer, without further details. 2016-07-26 11:50:29 +01:00
Shane Kilkelly
2dede5f793 WIP: Working "accept invite" page 2016-07-26 11:46:41 +01:00
Paulo Reis
bfe3e160c9 Integrate with UI. 2016-07-26 11:37:51 +01:00
Paulo Reis
1c9d0a417f Forge a form submission to avoid CORS checking with wufoo. 2016-07-26 11:30:42 +01:00
Henry Oswald
81744e4301 use cdn for blog 2016-07-26 11:11:28 +01:00
Henry Oswald
232a752328 run another image compression 2016-07-26 10:04:01 +01:00
Shane Kilkelly
41755212f0 Update the register page with new message 2016-07-26 09:06:21 +01:00
Shane Kilkelly
b898c62e91 Add appropriate query strings to the end of invite link 2016-07-25 16:14:41 +01:00
Paulo Reis
32b57f228c Integrate feedback UI with wufoo service. 2016-07-25 16:12:56 +01:00
Paulo Reis
c083b42487 Basic wufoo submit service. 2016-07-25 16:12:34 +01:00
Shane Kilkelly
16dcbe2cd4 WIP: wire up share-modal frontend to invite system 2016-07-25 15:07:14 +01:00
Shane Kilkelly
b3add65de1 Start integrating invites into share frontend 2016-07-25 14:27:02 +01:00
Shane Kilkelly
73fed8b0bf Add a getAllInvites api endpoint 2016-07-25 11:17:47 +01:00
Shane Kilkelly
8dea179b01 Whitespace 2016-07-25 10:33:43 +01:00
Shane Kilkelly
ccf684cf07 test acceptInvite 2016-07-25 10:19:20 +01:00
Shane Kilkelly
5438f39f9e Start testing acceptInvite 2016-07-25 09:58:08 +01:00
Shane Kilkelly
78a410c39d Remove expiresAt logic from acceptInvite 2016-07-25 09:07:47 +01:00
Paulo Reis
37eb6252d2 Rewording + animation when shown the feedback panel. 2016-07-22 16:33:19 +01:00
Shane Kilkelly
78570817d5 Render a separate template if the invite is not found. 2016-07-22 16:28:00 +01:00
Shane Kilkelly
9e0c44573a Remove expiresAt, use mongo TTL instead. 2016-07-22 16:08:56 +01:00
Shane Kilkelly
b201f1a37a Test getInviteByToken. 2016-07-22 14:21:34 +01:00
Paulo Reis
b6cd6c2d7d UI logic to show or hide the negative feedback panel. 2016-07-22 14:14:58 +01:00
Henry Oswald
8492ea7d28 Merge pull request #285 from sharelatex/file-path-checks 
add file path check on element names
 2016-07-22 13:54:05 +01:00
Henry Oswald
f7a0860f0b Merge pull request #286 from sharelatex/ha-editor-close 
fix close editor button
 2016-07-22 13:49:26 +01:00
Shane Kilkelly
e34b124c73 Test revokeInvite 2016-07-22 13:33:21 +01:00
Paulo Reis
54eadf3256 Add textarea for 'other' feedback + styles. 2016-07-22 12:20:26 +01:00
Paulo Reis
95db6ba934 Basic mark-up for the extra log hint feedback. 2016-07-22 11:56:45 +01:00
Shane Kilkelly
c9cfcddbe9 test error case for inviteToProject 2016-07-22 11:54:16 +01:00
Shane Kilkelly
f866bd03bc Spy on the randomBytes function 2016-07-22 11:53:55 +01:00
Shane Kilkelly
9fba98cd45 Accept invite, and start testing the invite handler. 2016-07-22 11:38:00 +01:00
Shane Kilkelly
1139444790 add token to body of acceptInvite action. 2016-07-22 09:27:00 +01:00
Henry Oswald
ef6eefe1b1 add comment not to fingerprint worker 2016-07-22 09:05:39 +01:00
Henry Oswald
c7a3de45bb Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-07-22 09:05:14 +01:00
Henry Oswald
3029fb6335 add dark host option and don’t load pdfjs worker via cdn 2016-07-21 19:06:53 +01:00
Paulo Jorge Reis
50ad3a107f Merge pull request #287 from sharelatex/pr-highlight-biblio-search 
A|B test for bib search pop-up
 2016-07-21 17:06:59 +01:00
Paulo Reis
6a46b46cf4 Expose sign-up date as an user attribute in the editor. 2016-07-21 16:42:22 +01:00
Shane Kilkelly
546517db90 revokeInvite and getInviteByToken functions. 2016-07-21 16:19:15 +01:00
Shane Kilkelly
d9c6df0e47 start adding the ProjectInvite workflow. 2016-07-21 15:56:41 +01:00
Henry Oswald
6aca798a45 don’t use cdn on dark 2016-07-21 15:34:23 +01:00
Paulo Reis
79d95cbf9f Merge branch 'master' into pr-highlight-biblio-search 2016-07-21 14:51:34 +01:00
Paulo Reis
2c857c0afa Minor adjustments to make both variants coexist without affecting each other. 2016-07-21 14:24:52 +01:00
Shane Kilkelly
e0562a2301 Update ProjectInvite model 2016-07-21 14:20:09 +01:00
Paulo Reis
5c6d6f0e74 Pull back existing styles and namespace them as the control variant. 2016-07-21 14:12:14 +01:00
Paulo Reis
c076d76c7d Namespace new variant. 2016-07-21 14:11:17 +01:00
Shane Kilkelly
4db9d5a466 remove whatespace and comment 2016-07-21 13:34:20 +01:00
Shane Kilkelly
3311b43644 more tests for invite controller 2016-07-21 13:31:54 +01:00
Shane Kilkelly
23a9aadba5 start tests for invite controller 2016-07-21 10:08:22 +01:00
Shane Kilkelly
c3e51dd773 Revert "copy helper functions from CollaboratorsHandler" 
This reverts commit 0d5acd7bade584e4ff119dc22e5d5d3b3175dae2.
 2016-07-21 09:50:52 +01:00
Shane Kilkelly
049cced4fd copy helper functions from CollaboratorsHandler 2016-07-21 09:42:37 +01:00
Henry Oswald
ad60268707 clean up vars for buildjs path and change default to cdn.sharelatex.dev:3000 2016-07-21 09:38:24 +01:00
Shane Kilkelly
0f2600b198 finish out skeleton of invite controller 2016-07-21 09:32:14 +01:00
Paulo Reis
b0c3a89a83 Style button and content. 2016-07-20 17:10:03 +01:00
Paulo Reis
2d3aa02eed Make info cell a button container. 2016-07-20 17:04:02 +01:00
Shane Kilkelly
f7c2fa37ab Fill out getInviteByToken 2016-07-20 16:44:22 +01:00
Henry Oswald
e27d5ce969 use Url for lib name 2016-07-20 16:10:33 +01:00
Henry Oswald
97b42478d1 don’t fingerprint sentry 2016-07-20 16:03:01 +01:00
Paulo Reis
49f603922b Highlight info cell. 2016-07-20 15:32:10 +01:00
Shane Kilkelly
0dc4e2c0c1 Merge branch 'master' into pr-email-tokens 2016-07-20 15:23:37 +01:00
Shane Kilkelly
5b22be8a0b Further scaffolding 2016-07-20 15:22:48 +01:00
Henry Oswald
e8aad2abb1 don’t fingerprint main.js and ide.js 2016-07-20 15:17:01 +01:00
Henry Oswald
596fc2525b simplified buildJSPath 2016-07-20 14:48:58 +01:00
Henry Oswald
a3e40adbaf Merge pull request #283 from sharelatex/ho-cdn 
Ho cdn
 2016-07-20 14:19:37 +01:00
Shane Kilkelly
a4c7db5f20 skeleton of inviteToProject function 2016-07-20 14:14:56 +01:00
Shane Kilkelly
e383e49161 Add CollaboratorsInviteController and routes 2016-07-20 14:04:14 +01:00
Henry Oswald
6c78ab4ace got requirejs working nicely with cdn 2016-07-20 12:58:32 +01:00
Brian Gough
fcfdabd279 clean up pdfcontroller query string logic 2016-07-20 09:58:47 +01:00
Brian Gough
4e252976c7 add missing cache bust on log file 2016-07-20 09:58:47 +01:00
Henry Oswald
b589ab388f fix close editor button 
- only evaulate close on web router, not api/static assets
- allow /admin pages to still be available
 2016-07-19 17:15:20 +01:00
Henry Oswald
f8c38f30a8 got build js path working with mathjax 2016-07-19 15:41:33 +01:00
Brian Gough
13d6448ab8 Merge pull request #284 from sharelatex/fix-synctex-subdir-path 
work around for synctex paths containing /./
 2016-07-19 12:24:31 +01:00
Brian Gough
a93efde1ae add file path check on element names 2016-07-19 11:58:10 +01:00
Henry Oswald
0cbd9d0ff9 use url.resolve to adding https:// part 2016-07-19 11:41:36 +01:00
Shane Kilkelly
4e1df9f476 Fix wording of userHasSubscription to userHasNoSubscription 2016-07-19 11:37:58 +01:00
Shane Kilkelly
3aea3a68d1 Check the truth of subscription.customAccount, rather than definition. 2016-07-19 10:28:43 +01:00
Shane Kilkelly
effc3727be Don’t show upgrade prompts for users with custom subscription accounts. 
Set `hasValidSubscription` to true if user subscription is custom.
 2016-07-19 10:15:45 +01:00
Henry Oswald
a2a8b7123b created buildCssPath img and js path funcs 2016-07-18 17:18:51 +01:00
Brian Gough
1d74e6750c work around for synctex paths containing /./ 2016-07-18 17:00:34 +01:00
James Allen
62a444082d Add in /dev/csrf endpoint for easy automated testing 2016-07-18 16:47:54 +01:00
Henry Oswald
715ffcfbf2 changed ordering on static assets path, just tidying. 2016-07-18 16:24:48 +01:00
Shane Kilkelly
9f9852a1dd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-18 16:07:24 +01:00
Shane Kilkelly
57079fc986 fix styling of the import modal 2016-07-18 16:07:00 +01:00
Brian Gough
a3c97533ae Merge pull request #281 from sharelatex/stop-compile 
add support for stopping compile
 2016-07-18 15:01:26 +01:00
Brian Gough
ded9bcaa11 remove unwanted styling on 'stop compile' button 2016-07-18 15:00:16 +01:00
Henry Oswald
c21549220c mvp for cdn 2016-07-18 14:05:07 +01:00
Brian Gough
92d41dd74e added comment for per-user route to top-level directory 2016-07-18 11:16:09 +01:00
Brian Gough
5a02e8c656 add support for stopping compile 2016-07-15 16:28:52 +01:00
Henry Oswald
0576380811 allow placeholder for sharing project to be changed 2016-07-14 11:40:32 +01:00
Henry Oswald
4202b4795b fix ordering of deps for contact us 2016-07-14 11:15:44 +01:00
Paulo Reis
c23091da94 Always set feature flags, if available. 2016-07-14 11:07:10 +01:00
Paulo Jorge Reis
e4e6c58423 Merge pull request #280 from sharelatex/pr-user-segmentation 
User segmentation
 2016-07-14 10:15:16 +01:00
Paulo Jorge Reis
0b21f8f4f1 Merge pull request #279 from sharelatex/pr-track-trial-start 
Track trial start and subscription
 2016-07-14 10:14:49 +01:00
Paulo Reis
ab995671fc Namespace feature flags. 2016-07-14 10:10:14 +01:00
Paulo Reis
5d5bc57535 Add user name. 2016-07-14 09:55:11 +01:00
Paulo Reis
fee22db567 Refactor user blocks into a single script tag. 2016-07-14 09:47:25 +01:00
Paulo Reis
a261de9eb1 Set feature flags. 2016-07-14 09:37:04 +01:00
Paulo Reis
68906cb0c5 Avoid unneeded change_id event; id can be set as a Countly property, before initializing. 2016-07-13 16:29:53 +01:00
Brian Gough
d53fa5de47 avoid exception in pdf viewer when no visible pages 2016-07-13 14:14:51 +01:00
Brian Gough
d8c11a0824 fix scope for pdf page load error handler 2016-07-13 14:04:58 +01:00
Paulo Reis
688eebf469 Merge branch 'pr-track-trial-start' of github.com:sharelatex/web-sharelatex into pr-track-trial-start 2016-07-13 09:49:57 +01:00
Paulo Reis
4801d8c1c2 Track subscription form page flow. 2016-07-12 17:33:24 +01:00
Paulo Reis
0542d9e05d Track trials starts, with source. 2016-07-12 17:33:00 +01:00
Paulo Reis
b2da63f532 Track trials starts, with source. 2016-07-12 16:41:22 +01:00
Brian Gough
2e646729d1 avoid clobbering file urls in download dropdown 2016-07-12 14:37:08 +01:00
Henry Oswald
713f2110c1 use translations for title and meta description (google) 2016-07-12 14:25:25 +01:00
Paulo Reis
8eae4e4044 Revert "Use custom shrinkwrap to ignore the translations package." 
This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
 2016-07-12 13:42:46 +01:00
Paulo Reis
112a64ce84 Use custom shrinkwrap to ignore the translations package. 2016-07-12 13:37:26 +01:00
Paulo Jorge Reis
b3acf011ab Merge pull request #276 from sharelatex/pr-contact-form-suggestions 
Contact form suggestions
 2016-07-12 11:53:05 +01:00
Brian Gough
8c9fcfdd60 remove sentry downsampling on pdf errors 
load errors should be less frequent now
 2016-07-12 11:51:30 +01:00
Brian Gough
7555382e33 remove the render timeout 
pdfjs uses requestAnimationFrame to schedule the rendering, and this
does not fire if the tab is inactive. That causes an unwanted error if
switching tabs for more than the one minute timeout.
 2016-07-12 11:51:30 +01:00
Brian Gough
0ae639f1c3 enable per-page pdf downloads by default 2016-07-12 11:51:30 +01:00
Paulo Reis
1e62ce679b Make 'knowledge base' a link to the KB index page. 2016-07-12 11:44:48 +01:00
Paulo Reis
61b57905cb Merge branch 'master' into pr-contact-form-suggestions 2016-07-12 10:48:37 +01:00
Henry Oswald
a9f3a29b72 moved translations to dev dependency so its not included in shrinkwrap. 2016-07-12 10:17:58 +01:00
Paulo Reis
785bf1b5a2 New key for the message label. 2016-07-11 16:24:06 +01:00
Paulo Reis
02ba277473 Small styling fixes. 2016-07-11 16:21:35 +01:00
Brian Gough
b546c5eee9 cleanup, remove comments 2016-07-11 15:07:06 +01:00
Brian Gough
4b1ec24bc0 cancel existing load/render tasks correctly 2016-07-11 15:01:58 +01:00
Brian Gough
f68ab1e508 improve loading indicators 2016-07-11 15:01:24 +01:00
Paulo Reis
af93ac4413 Track suggestions usage. 2016-07-11 14:27:07 +01:00
Paulo Reis
9ef78b4bc2 Merge branch 'master' into pr-contact-form-suggestions 2016-07-11 13:54:06 +01:00
Paulo Reis
fb7c437098 Make other Algolia clients use the common factory. 2016-07-11 12:31:52 +01:00
Paulo Reis
bf67fedc73 Centralize Algolia methods in a common factory. 2016-07-11 12:24:48 +01:00
Brian Gough
379e6d2f90 nullify highlight timeout after clearing it 2016-07-11 12:17:49 +01:00
Brian Gough
ad83784a81 remove the renderTimer 
only display the page when it is fully rendered
 2016-07-11 12:17:49 +01:00
Brian Gough
70a82c10ce cleanup pdfJs 2016-07-11 12:17:49 +01:00
Brian Gough
41b0309e6e show progress bar when loading starts 2016-07-11 12:17:49 +01:00
Brian Gough
a4cd5c90c3 only process the render queue after we stop moving 2016-07-11 12:17:49 +01:00
Brian Gough
eaca616dd3 use progress bar for initial loading 2016-07-11 12:17:49 +01:00
Brian Gough
b8f677ac7c replace canvas with rendered page after 1 second 2016-07-11 12:17:49 +01:00
Brian Gough
0e550ac012 add spinner for loading, initially static 2016-07-11 12:17:49 +01:00
Brian Gough
c657a02db5 render offscreen pages 2016-07-11 12:17:49 +01:00
Brian Gough
83ea771aef include start method for spinner 2016-07-11 12:17:49 +01:00
Brian Gough
8c81f0a9ff prerender offscreen pages 2016-07-11 12:17:49 +01:00
Henry Oswald
6b2a11a4d4 use https for google fonts 2016-07-11 12:13:01 +01:00
Paulo Reis
7eafa5ca3f Make Countly server configurable via settings. 2016-07-11 11:02:52 +01:00
Henry Oswald
c7506391ca optimised oxford gif 2016-07-10 11:12:57 +01:00
Henry Oswald
94d760e32d import bootstrap font awseome via less not html 2016-07-10 11:10:43 +01:00
Henry Oswald
85936a1391 moved css min to exec, import was not working via grunt 2016-07-10 11:04:51 +01:00
Paulo Reis
444120f8b1 Merge branch 'master' into pr-contact-form-suggestions 2016-07-08 13:55:08 +01:00
Paulo Reis
e1fb4a51c6 Identify sampled events. 2016-07-08 11:17:18 +01:00
Paulo Jorge Reis
c5cf151add Merge pull request #275 from sharelatex/pr-separate-events-log-hints-feedback 
Track positive and negative feedback as different events
 2016-07-08 10:54:02 +01:00
Paulo Reis
c67ad84be8 Track positive and negative feedback as different events. 2016-07-08 10:26:40 +01:00
Paulo Reis
dfe9e05abe Use sampled tracking in editor recompiles. 2016-07-08 10:07:45 +01:00
Paulo Reis
07cce99c17 Add sampled tracking method. 2016-07-08 10:06:46 +01:00
Paulo Jorge Reis
3a24c4bff9 Merge pull request #272 from MCribbin/patch-2 
Update HumanReadableLogsRules.coffee
 2016-07-07 13:39:44 +01:00
Shane Kilkelly
0e9beb5653 remove daft redundancy. 2016-07-07 09:42:01 +01:00
Shane Kilkelly
896cbb5f4c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-07 09:35:53 +01:00
Shane Kilkelly
9e35bdcaea Refactor: add ? suffix to truth tests. 2016-07-07 09:35:44 +01:00
MCribbin
b62fbd4d3f Update HumanReadableLogsRules.coffee 2016-07-06 16:18:27 +01:00
Paulo Jorge Reis
efacd9e7f2 Merge pull request #267 from sharelatex/pr-log-dropdown 
"Other logs & files" dropdown / dropup
 2016-07-06 16:06:10 +01:00
MCribbin
dadee03ca3 Update HumanReadableLogsRules.coffee 
Added new linke for LaTeX Error: Unknown float option `q'.
Changed hint for "No positions in optional float specifier" to include quick fix (will probably need some clearer way of saying which square brackets need to be removed)
 2016-07-06 15:57:56 +01:00
Paulo Reis
54ec75d36a Avoid line-breaks when showing the log icon. 2016-07-06 15:55:36 +01:00
Shane Kilkelly
21eb104928 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-06 15:39:12 +01:00
Shane Kilkelly
dda0841af3 Return early if there are no keys to delete 2016-07-06 15:39:03 +01:00
Paulo Reis
b867c37d49 Merge branch 'master' into pr-log-dropdown 2016-07-06 15:35:28 +01:00
Paulo Jorge Reis
59065395ef Merge pull request #273 from sharelatex/pr-countly-integration 
Countly integration
 2016-07-06 15:00:47 +01:00
Paulo Reis
7a3d3d3ffd Make Countly track by internal ids. 2016-07-06 14:44:28 +01:00
Paulo Reis
8e2475afdc Track hints feedback in both GA and Countly; clean-up. 2016-07-06 14:24:50 +01:00
MCribbin
95f1435920 Update HumanReadableLogsRules.coffee 2016-07-06 14:16:21 +01:00
Shane Kilkelly
fc6cf75ad5 Merge branch 'master' into sk-session-revocation 2016-07-06 13:19:15 +01:00
Paulo Reis
0dd3a70b4b Use Countly tracking method where appropriate. 2016-07-06 12:32:33 +01:00
Paulo Reis
b841d41b68 Actually send the data to Countly. 2016-07-06 12:26:21 +01:00
Shane Kilkelly
9f724d0a04 Add tests to check if users can access a restricted page. 2016-07-06 12:14:01 +01:00
Paulo Reis
5c121a5f05 Track user log in and sign up. 2016-07-06 12:12:54 +01:00
Paulo Reis
7e1c1f7414 Remove heap integration. 2016-07-06 12:12:22 +01:00
Paulo Reis
c9b1faa1a1 Add user info to correlate with events. 2016-07-06 11:59:33 +01:00
Paulo Reis
909f7c15b5 Track log-related actions. 2016-07-05 16:27:14 +01:00
Paulo Reis
d5efe81a46 Track recompiles. 2016-07-05 16:02:46 +01:00
Paulo Reis
96f6603bd3 Track settings changes. 2016-07-05 15:37:13 +01:00
Shane Kilkelly
0362fee60f test the retain option to revokeAllUserSessions. 2016-07-05 15:32:32 +01:00
Paulo Reis
304529754d Track editor modals. 2016-07-05 15:16:55 +01:00
Shane Kilkelly
464866847f Fix name of UserSessionsManager test module. 2016-07-05 15:14:29 +01:00
Paulo Reis
71b8f86e89 Track editor macro views. 2016-07-05 15:07:16 +01:00
Shane Kilkelly
a1c662b9d8 Test session revocation on password change. 2016-07-05 14:55:08 +01:00
Shane Kilkelly
3f1a47eccb map the 'retain' values to session ids 2016-07-05 14:54:26 +01:00
Paulo Reis
a40cbdd84e Track share modal opening. 2016-07-05 14:32:56 +01:00
Shane Kilkelly
2caa80bbcb acceptance test for logging in two sessions. 2016-07-05 14:21:38 +01:00
Shane Kilkelly
5b9903551a add an array of session ids to retain. 2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308 clear sessions on password reset 2016-07-05 14:19:59 +01:00
Paulo Reis
fac3698c40 Better namespacing of sprite CSS classes. 2016-07-05 11:08:58 +01:00
Shane Kilkelly
bec3d2ad42 start acceptance tests for sessions 2016-07-05 10:24:24 +01:00
Paulo Reis
7dd1906eaf Initial Countly integration. 2016-07-04 16:51:31 +01:00
Paulo Reis
040739ef7f Comment out sprity and leave a not in README.md. 2016-07-04 16:03:29 +01:00
Shane Kilkelly
df0a7bc547 test the _checkSessions function. 2016-07-04 14:04:10 +01:00
Shane Kilkelly
699ba21032 test revokeAllUserSessions 2016-07-04 11:15:28 +01:00
Shane Kilkelly
dfcb47fb5c test untrackSession 2016-07-04 10:56:13 +01:00
Shane Kilkelly
2ae2e6ed4f Test trackSession 2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60 Begin testing UserSessionsManager. 2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3 check sessions on login and logout. 2016-07-04 09:27:38 +01:00
Paulo Reis
11f198d970 Merge branch 'master' into sprites 2016-07-01 16:27:09 +01:00
Paulo Reis
64a73b0356 Disable default 4px margin on grunt-sprity, also add the built files. 2016-07-01 16:02:40 +01:00
Paulo Reis
4f49a25639 Use a figure element instead of an img, as there is no src attribute. 2016-07-01 16:02:01 +01:00
Shane Kilkelly
6f20f565fe Add early-return guards 2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02 Add ip_address and session_created to the session user object. 2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7 Refactor method names in UserSessionsManager 2016-07-01 15:33:59 +01:00
Henry Oswald
6f4a7f4779 mvp for using sprites for flags, needs border removing 2016-07-01 15:04:39 +01:00
Shane Kilkelly
6938f1d055 No need to build extra string 2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f Clear out sessions 2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94 Fix logging. 2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1 set expiry on the user sessions set. 2016-07-01 11:24:46 +01:00
Shane Kilkelly
ab26edb44b Adjust UserController unit tests 2016-07-01 10:20:22 +01:00
Shane Kilkelly
88bef5c5ea Add revokeAllSessions handler, when password is reset 2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255 Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers 
remove scaffolding for per-user compiles so that it is always by default
 2016-06-30 15:16:28 +01:00
Brian Gough
73ad1fde5c comment out disabling of per user compiles 2016-06-30 15:15:37 +01:00
Henry Oswald
7cb266d904 removed imagemin 2016-06-30 14:59:05 +01:00
Brian Gough
c04e00026b remove scaffolding for per-user compiles so that it is always by default 2016-06-30 14:43:03 +01:00
James Allen
882e28a811 Don't choke on null projects 2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314 Remove a user from being a collaborator when their account is deleted 2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed Skip null user objects when getting collaborators 2016-06-30 13:56:21 +01:00
Paulo Reis
d93c96d43c Improve log hints ids. 2016-06-30 11:30:43 +01:00
Paulo Reis
c5f53ef431 Track log hints feedback. 2016-06-30 11:30:30 +01:00
Henry Oswald
05dedeebb8 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-29 15:36:53 +01:00
Henry Oswald
000c862ae1 return 404 if blog returns 403, caused by file not existing 2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5 save the session key string, rather than just the id 2016-06-29 15:12:12 +01:00
Paulo Reis
536c1ac65e Merge branch 'pr-project-filepath-regex' 2016-06-29 14:19:37 +01:00
Paulo Reis
36e09e3b0c Make the user id portion of the path optional. 2016-06-29 14:19:16 +01:00
Brian Gough
16b58a9420 Merge pull request #268 from sharelatex/per-user-containers-part-3 
add support for on-demand viewing of pdfs for per-user compiles
 2016-06-29 14:16:24 +01:00
Paulo Reis
72d498c6c8 Merge branch 'master' into pr-contact-form-suggestions 2016-06-29 11:58:07 +01:00
Paulo Reis
f50c73642a Integrate with KB index. 2016-06-29 11:57:43 +01:00
Shane Kilkelly
db213c0621 Begin keeping record of user sessions in reds. 2016-06-29 11:35:25 +01:00
Paulo Reis
d037cb93a9 Wiki styles clean-up. 2016-06-29 10:42:51 +01:00
Paulo Reis
5ad0c06770 Regex now matches new folder nomenclature. 2016-06-28 17:19:02 +01:00
Henry Oswald
8f14526354 added custom footer in email option 2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884 hook notifications handler up to make request which doesn't make request if url not set 2016-06-28 16:52:27 +01:00
Paulo Reis
a6d184358f Avoid inline-styles. 2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126 Dynamically determine if the files dropdown should drop up or drop down. 2016-06-28 15:48:11 +01:00
Shane Kilkelly
9e16f250f9 Merge branch 'sk-subscription-address' 2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf set postal_code as zip 2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe Test the createSubscription action (+4 squashed commits) 
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
 2016-06-28 13:59:52 +01:00
Paulo Reis
4263d3f8c6 Merge branch 'master' into pr-overflowing-images-wiki 2016-06-28 11:58:58 +01:00
Paulo Reis
86a8a180a8 Merge branch 'master' into pr-toggle-comment-keybinding-windows 2016-06-28 11:37:46 +01:00
Brian Gough
e0d262a6d8 fix shrinkwrap file 2016-06-28 11:18:20 +01:00
Paulo Reis
616fd5daf6 Merge branch 'master' into pr-ui-feedback-error-nav 2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac Merge branch 'master' into pr-ui-feedback-error-nav 2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619 Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds 
use parameter for bcrypt rounds, rehash passwords on login if necessary
 2016-06-28 10:49:33 +01:00
Brian Gough
afc89d8d27 added missing package grunt-execute 2016-06-28 10:42:36 +01:00
Brian Gough
6e187e3996 added npm shrinkwrap file 2016-06-28 10:42:36 +01:00
James Allen
883a9b512a Merge pull request #265 from MCribbin/patch-1 
Update HumanReadableLogsRules.coffee
 2016-06-28 10:33:24 +01:00
Shane Kilkelly
e194de50cf test _paypal.checAccountExists. 2016-06-28 10:17:06 +01:00
Henry Oswald
b8b833b753 moved wiki into module 2016-06-28 10:16:02 +01:00
Paulo Reis
da960a721f Vertical layout for LaTeX examples. 2016-06-28 10:09:12 +01:00
Shane Kilkelly
6bdfedc1b0 Test when a paypal stage produces an error 2016-06-28 09:09:57 +01:00
Shane Kilkelly
d21eb1b07f Add tests 2016-06-28 09:04:19 +01:00
Brian Gough
8d32fa1e87 enable per-user containers by default 2016-06-28 08:40:30 +01:00
Shane Kilkelly
709f8f2bea start testing the paypal workflow. 2016-06-27 16:34:00 +01:00
Paulo Reis
6a8499f515 Merge branch 'master' into pr-toggle-comment-keybinding-windows 2016-06-27 15:39:35 +01:00
Paulo Reis
3580d8377f Merge branch 'master' into pr-contact-form-suggestions 2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931 Integrate translations. 2016-06-27 15:38:13 +01:00
Paulo Reis
0551f27c83 Extra search options; only search after three chars have been entered. 2016-06-27 14:46:34 +01:00
Shane Kilkelly
3bf8da3e83 test _createCreditCardSubscription 2016-06-27 14:45:17 +01:00
Shane Kilkelly
2c1b326681 test the createSubscription function. 2016-06-27 14:29:19 +01:00
Shane Kilkelly
95d85538cc Clean up xml text block in test. 2016-06-27 14:00:30 +01:00
Shane Kilkelly
d853eb5916 Update existing RecurlyWrapper tests. 2016-06-27 13:54:54 +01:00
Brian Gough
8b15d40f8b add word count to per-user container 2016-06-27 12:41:50 +01:00
Shane Kilkelly
401565ba23 Fix references to the RecurlyWrapper object. 2016-06-27 12:14:43 +01:00
Paulo Reis
81b93ab5a9 Disable links to the docs when the wiki is not available. 2016-06-27 11:34:24 +01:00
Shane Kilkelly
eb92cfe8e0 Remove the postal_code from test, until recurly get back to us. 2016-06-27 10:40:08 +01:00
Shane Kilkelly
9938787e4a fix a few silly issues. Appears to work now 2016-06-27 10:38:10 +01:00
Paulo Reis
c2ace9a0a0 Restrict # of hits returned; clear results on empty search string. 2016-06-27 10:21:36 +01:00
Shane Kilkelly
72c73809f6 Generate address xml from object. 2016-06-27 09:44:40 +01:00
Henry Oswald
6526b29f96 add another null check on file inside fetchLogs 2016-06-25 13:56:45 +01:00
Paulo Reis
c82f4481e4 Show search results. 2016-06-24 17:10:18 +01:00
Paulo Reis
2c9812f62f Add algolia search. 2016-06-24 17:10:07 +01:00
Paulo Reis
f427ce88d9 Better Jade syntax. 2016-06-24 16:37:35 +01:00
Paulo Reis
dfc375adf8 Add more feedback on :hover. 2016-06-24 15:55:19 +01:00
MCribbin
9a399ebd15 Update HumanReadableLogsRules.coffee 
Space added after URL. '...' changed to '\u2026'
 2016-06-24 15:50:23 +01:00
Henry Oswald
9888d6631a don't error if references is not enabled 2016-06-24 15:46:37 +01:00
MCribbin
883ae307a9 Update HumanReadableLogsRules.coffee 
Changed extraInfoURL links from /Errors:... to /Errors/...
Added math mode description to "Missing $ inserted." (humanReadableHint might be too long with this extra description)
 2016-06-24 15:37:39 +01:00
Henry Oswald
6e59a10fb3 added more null checks for potential undefined notifications 2016-06-24 15:23:57 +01:00
Paulo Reis
c376c807d7 Forgotten href attribute. 2016-06-24 15:22:34 +01:00
Henry Oswald
51df3825e5 add null check on notifications handler 2016-06-24 15:11:22 +01:00
Henry Oswald
8d79b37651 return from _doIndexOperation if referneces is not setup eailer 2016-06-24 15:07:28 +01:00
Shane Kilkelly
026e9f46c8 WIP: process appears to work, setting address correctly 2016-06-24 15:03:46 +01:00
Henry Oswald
cc9f90c3e8 don't set referneces and notifications urls in default as open source does not use them yet 2016-06-24 15:03:15 +01:00
Shane Kilkelly
56bc840b88 WIP: fix up error handling and account for possibility of account already existing. 2016-06-24 14:11:28 +01:00
Paulo Reis
a33aeca9c3 Merge branch 'pr-latex-hints-improvements' 2016-06-24 14:07:57 +01:00
Henry Oswald
3887db8898 don't call notifications if notifications has no url 2016-06-24 14:06:04 +01:00
Paulo Reis
b4de353828 Merge branch 'master' into pr-latex-hints-improvements 2016-06-24 14:02:55 +01:00
Paulo Reis
d7a1c7f693 Inline links in the hint now match the theme. 2016-06-24 14:01:22 +01:00
Henry Oswald
90b605061b Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-24 13:35:27 +01:00
Henry Oswald
9a3e621c9c stripe off errors and kb from page titles 2016-06-24 13:15:22 +01:00
Paulo Reis
5f7ffb5a8c Make hint card area non-clickable. 2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d Better handling of whitespace. 2016-06-24 12:07:02 +01:00
Paulo Reis
91cbf2b321 Links within hint content also open in a new tab. 2016-06-24 11:56:31 +01:00
Shane Kilkelly
249381b6a8 WIP: initial work on sending address to recurly for paypal subscriptions 2016-06-24 11:42:58 +01:00
Paulo Reis
a587d5ddba Set up model options. 2016-06-24 11:02:29 +01:00
Paulo Reis
3014808a07 Merge branch 'master' into pr-latex-hints-integration 2016-06-24 10:48:42 +01:00
Paulo Reis
2da9cdb0db Hints as HTML. 2016-06-24 10:15:51 +01:00
Paulo Reis
9b25af3c8c Consolidate rules related to too-strict float specifiers. 2016-06-23 16:57:05 +01:00
James Allen
da41e64e97 Update HumanReadableLogsRules.coffee 2016-06-23 16:52:02 +01:00
Henry Oswald
d294117286 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-23 16:40:22 +01:00
Henry Oswald
5371669f89 if references has no url don't send post, silently return 2016-06-23 16:39:54 +01:00
Paulo Reis
5a890d0d8b Add log matching rules. 2016-06-23 16:39:05 +01:00
Paulo Reis
e51bdaaaaf Fine tuning of styles. 2016-06-23 15:01:07 +01:00
Paulo Reis
f62a45444d Prototype mark-up and styles. 2016-06-23 12:08:13 +01:00
Shane Kilkelly
cbdcc874e3 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-22 11:03:32 +01:00
Henry Oswald
50352c94f6 re minify aloglia and moment 2016-06-22 10:16:47 +01:00
James Allen
594ec9cbdd Revert "minify algolia and moment.js" 
This reverts commit f32a92b3c2b6c321ea7e7339110c644f9caa790c.
 2016-06-22 08:00:25 +01:00
Paulo Reis
d6c966934d Set the key binding which is reported on Windows. 2016-06-21 16:53:50 +01:00
James Allen
b693ced843 Merge pull request #263 from sharelatex/pr-human-readable-logs 
Human readable logs
 2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973 Minor UI improvements. 2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e Remove DataJoy link from the project page. 2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80 Merge branch 'ha_custom_image_logo' 2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91 Safety checks for non-existing values; avoid rendering the hint template when there is no hint. 2016-06-21 12:07:47 +01:00
Paulo Reis
1aa7d9c6b3 Explicitly set link color according to log entry type. 2016-06-21 10:49:24 +01:00
Paulo Reis
d8e0026bc6 Add class to enable per-hint feedback tracking. 2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd Show thank you note after receiving feedback. 2016-06-20 15:04:47 +01:00
Paulo Reis
baea017adb Better mark-up for analytics tracking. 2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc Use plain links instead of buttons. 2016-06-20 14:42:36 +01:00
Paulo Reis
ada018263a Merge branch 'master' into pr-human-readable-logs 2016-06-20 11:54:56 +01:00
Paulo Reis
1893ae68a9 Add feedback widget for log hints. 2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3 Hint card styling. 2016-06-20 09:45:14 +01:00
Henry Oswald
d35a48e683 minfiy css as well 2016-06-18 21:49:32 +01:00
Henry Oswald
ec727b70a5 reduced some other images 2016-06-18 19:59:39 +01:00
Henry Oswald
4fc9c9a263 compress to 7 levels and only watch public files 2016-06-18 19:16:45 +01:00
Henry Oswald
b1e4af098d compress images using grunt imagemin 2016-06-18 16:52:38 +01:00
Henry Oswald
1d26be30a9 added grunt imagemin used to compress images 2016-06-18 16:50:56 +01:00
Henry Oswald
fed71ea0bd minify algolia and moment.js 2016-06-18 16:43:10 +01:00
Henry Oswald
fe11a4d835 include sentry below the fold 2016-06-18 12:29:52 +01:00
Henry Oswald
d2e4e22511 health checks should be on api router with no sessions 2016-06-18 11:58:26 +01:00
Henry Oswald
acdb7f0d5c Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo 2016-06-17 14:55:41 +01:00
Paulo Reis
7316a429c0 Increase maximum brand image height. 2016-06-17 14:55:04 +01:00
Henry Oswald
9cd3698b0e Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo 2016-06-17 14:41:35 +01:00
Paulo Reis
732a0fdca0 Fit brand image into container. 2016-06-17 14:37:39 +01:00
Henry Oswald
8b79587c9b add settings as a value to reference in defaults file 2016-06-17 14:22:20 +01:00
Henry Oswald
d27d19e02a added override for navbar background image 2016-06-17 14:18:52 +01:00
Paulo Reis
2bfe0d0ba9 Basic mark-up for hint card. 2016-06-17 14:16:38 +01:00
Brian Gough
0906bef5f9 change default bcrypt rounds to 12, to match default in AuthenticationManager 2016-06-17 13:50:32 +01:00
Brian Gough
98a0c54004 use parameter for bcrypt rounds, rehash passwords on login if necessary 2016-06-17 12:22:03 +01:00
Paulo Reis
54d48ce0ea Support extra info URL in human readable hints. 2016-06-17 11:42:32 +01:00
Paulo Reis
40fda6e361 Support HTML in human readable log messages. 2016-06-16 16:29:19 +01:00
Paulo Reis
9b8d695e43 Match logs against ruleset; show human readable message when appropriate. 2016-06-16 15:53:39 +01:00
Paulo Reis
f167aacc08 Add sample rules file. 2016-06-16 15:29:00 +01:00
Brian Gough
5e30310aae restore popupDownloads=true for pdf downloads 2016-06-16 15:20:57 +01:00
Brian Gough
fcd5582e6e Merge pull request #259 from sharelatex/fix-per-user-containers 
Fix per user containers
 2016-06-16 14:12:57 +01:00
Brian Gough
02e3f7a02b change download links so they do not rely on build id 
prefer the top level files, because the build directories are more
ephemeral.  In a shared project they can expire if there are multiple
compiles.
 2016-06-16 14:05:21 +01:00
Brian Gough
f045eb65d3 add query string utility function 2016-06-16 14:03:42 +01:00
Brian Gough
8a0fa1321d add comments to router, downcase route 
express has case-insensitive routes
 2016-06-16 13:59:56 +01:00
Brian Gough
6873c1d972 fix download methods in CompileController 2016-06-16 13:59:24 +01:00
Paulo Reis
c54f3dae20 Create human readable logs module on top of LatexLogParser; use it in the PDF controller. 2016-06-16 11:14:45 +01:00
Shane Kilkelly
3e3dd199a0 Add id's to buttons on beta program page 2016-06-16 10:56:16 +01:00
Shane Kilkelly
241d3bfc14 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-16 10:17:47 +01:00
Shane Kilkelly
9919f5f44a Refactor heap analytics 2016-06-16 10:17:36 +01:00
Henry Oswald
101e98ed83 simpliyfied dashboard & fixed error with leave group shown to group owner 
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
 2016-06-16 09:17:43 +01:00
Shane Kilkelly
5ce0100371 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-16 08:50:15 +01:00
Henry Oswald
7dad0427e8 fixed logger in notifications builder 2016-06-15 17:40:54 +01:00
Shane Kilkelly
c8302e090f Merge branch 'master' into sk-heap-analytics 2016-06-15 15:35:47 +01:00
Shane Kilkelly
522ac8b59b initial port of heap code from DJ into sharelatex. 2016-06-15 15:35:03 +01:00
Paulo Reis
e891a47a9e Better support for larger text in keyboard tooltips. 2016-06-15 15:27:30 +01:00
Henry Oswald
a5abc7392d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-15 14:45:28 +01:00
Henry Oswald
8a9a65a80a fix the download and compile endpoint used by zip 2016-06-15 14:45:05 +01:00
Paulo Reis
e28e959941 Quick fix require statements. 2016-06-15 13:46:40 +01:00
Paulo Reis
73d16b5c9c Merge branch 'recompile_tooltip' 2016-06-15 13:42:51 +01:00
Henry Oswald
46374f39ff Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-15 12:08:16 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +01:00
Paulo Reis
d7e4009504 Small styling enhancements. 2016-06-15 10:48:40 +01:00
Paulo Reis
3310a3ea3f Change tooltip copy; get it from i18n catalogue. 2016-06-14 17:20:16 +01:00
Paulo Reis
a9e0185098 Added tooltip with keyboard shortcut in the recompile button. 2016-06-14 17:02:22 +01:00
Brian Gough
d6964feb2f Revert "enable per-user containers by default" 
This reverts commit e80b8cd907605d9a7aad16496d49efff4bb08810.
 2016-06-14 16:30:06 +01:00
Brian Gough
d0a273fac1 Merge pull request #257 from sharelatex/fix-synctex-position-calculation 
Fix synctex position calculation
 2016-06-14 15:07:48 +01:00
Brian Gough
77de4dd432 Merge pull request #258 from sharelatex/enable-per-user-container 
enable per-user containers by default
 2016-06-14 15:07:37 +01:00
Brian Gough
ed6c384b68 fix urls of downloaded files to those provided by clsi 2016-06-14 14:51:33 +01:00
Brian Gough
ecd9bed1c2 enable per-user containers by default 2016-06-14 14:21:56 +01:00
Brian Gough
991d3c7aa1 avoid exception when switching between full and split pdf view 2016-06-14 12:49:06 +01:00
Brian Gough
2840a7757f fix bug in synctex position calculation for syncToCode 2016-06-14 12:32:54 +01:00
Brian Gough
830d15136d fix missing variables in pdf sync 2016-06-14 08:49:08 +01:00
Paulo Reis
c815ba6ed2 Added Paulo Reis photo for the about page. 2016-06-13 15:34:16 +01:00
Henry Oswald
f9fdec8a15 whitelist /user/activate for non public access 2016-06-13 15:24:41 +01:00
Henry Oswald
84db5ec23a added logging and default calback 2016-06-13 13:38:30 +01:00
Henry Oswald
f3e48e332b explicit call to UserCreator.createNewUser 2016-06-13 13:38:17 +01:00
Henry Oswald
3bc3153490 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-13 13:24:04 +01:00
Henry Oswald
c52af1393e should be able to set first and last name via user details on registration 2016-06-13 13:21:44 +01:00
Brian Gough
49a7c3c27b Merge branch 'per-user-containers-part-2' 
Conflicts:
	app/coffee/Features/Compile/ClsiManager.coffee
	app/coffee/Features/Compile/CompileController.coffee
	app/coffee/Features/Compile/CompileManager.coffee
 2016-06-13 12:24:48 +01:00
Brian Gough
3c31988e9a enable on-demand viewing of pdfs for per-user compiles 2016-06-10 16:06:02 +01:00
Brian Gough
e6dcce21fd use build_id and user_id instead of build and user 2016-06-10 12:11:47 +01:00
Brian Gough
8bc5f53562 Merge pull request #253 from sharelatex/per-user-containers-part-1 
Per user containers part 1
 2016-06-10 09:40:00 +01:00
Brian Gough
47574d7c7e Merge pull request #252 from sharelatex/per-user-containers-part-0 
Per user containers part 0
 2016-06-08 15:55:17 +01:00
Shane Kilkelly
42f2b262c2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:41:38 +01:00
Henry Oswald
895af7c07a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-08 15:36:20 +01:00
Henry Oswald
ed17bd026d added delete user script in grunt 2016-06-08 15:36:08 +01:00
Shane Kilkelly
ad6e9e039d Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:31:24 +01:00
Shane Kilkelly
6ca2e2204b If user is in beta program, show link to opt-out page on the settings page. 2016-06-08 15:31:14 +01:00