 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 |
|
|
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 |
|