Commit graph

86 commits

Author SHA1 Message Date
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +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
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
James Allen
bf7038f506 Adapt review panel line height to editor 2017-01-13 14:52:08 +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
e3e8541a63 Add class when review panel should layout to the left. 2017-01-12 16:49:47 +00:00
James Allen
898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +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
15d8f6c661 Sort out scroll bar positions and scroll position transitions 2016-11-17 14:29:35 +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
f170fd4b83 Refactor Ace directive to have a single events bridge. 2016-11-17 10:40:08 +00:00
James Allen
379afe4aa5 Refactor scroll handling into directive 2016-11-16 15:23:29 +00:00
Paulo Reis
d7d21b106c Isolate review-panel markup. 2016-11-16 14:42:07 +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
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +00:00
Paulo Reis
8a11c8c3ca Show add comment button when review panel is off. 2016-11-15 16:02:12 +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
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Paulo Reis
0c600ba9b8 Support overflowing panes in UI layout. 2016-11-15 10:34:19 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
Paulo Reis
7201bde2a3 Add comment UI. 2016-11-14 11:19:00 +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
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
Paulo Reis
6c5c1549b6 Add comment replies via enter keypress. 2016-11-11 10:51:32 +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
Paulo Reis
997addf355 More entry header styling + entry body. 2016-11-10 12:35:35 +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
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
6d7f4e9e6a Add basic comment replying 2016-11-09 15:25:41 +00:00