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
c43c44e052
Merge pull request #370 from sharelatex/sk-sessions-cluster
...
Sk sessions cluster
2016-11-10 14:49:13 +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