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