8639 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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