907 commits

Author	SHA1	Message	Date
Chrystal Maria Griffiths	5d6a307234	Merge pull request #1664 from sharelatex/as-fix-read-only-comment ... Only show add comment button if user has permission GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f	2019-04-10 09:52:41 +00:00
Paulo Jorge Reis	9c5c6922b9	Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection ... History drag and drop selection GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01	2019-04-09 10:11:13 +00:00
Simon Detheridge	364561d5fb	Merge pull request #1666 from sharelatex/cmg-rttc-typo ... Remove duplicate text on review panel GitOrigin-RevId: 20d37f392ed28ebbe31bae4f66892414b2966b87	2019-03-25 16:34:18 +00:00
Simon Detheridge	cd9ed1dd6b	Merge pull request #1663 from sharelatex/cmg-rttc-typo ... Fix lack of whitespace typo on review panel GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275	2019-03-25 15:52:38 +00:00
Alasdair Smith	e6e3c023ed	Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax ... Fix broken messages in chat due to mathjax XSS filtering GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647	2019-03-18 12:12:10 +00:00
Alasdair Smith	41f75b5936	Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss ... Fix potential Angular XSS issues GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842	2019-03-18 10:37:15 +00:00
Timothée Alby	1edf1964c8	Merge pull request #1607 from sharelatex/spd-succserror ... Don't show 'No errors' message if PDF generation fails GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79	2019-03-14 16:02:32 +00:00
Timothée Alby	b86a949f50	Merge pull request #1485 from sharelatex/cmg-comments-track-changes ... Add comments highlighting to rich text track changes GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5	2019-03-11 11:08:10 +00:00
Douglas Lovell	ce8695c951	Merge branch 'dcl-i1261b' ... GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6	2019-03-11 11:05:47 +00:00
Paulo Jorge Reis	46c6d11574	Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar ... Show the toolbar in SL history projects. GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b	2019-03-11 11:01:56 +00:00
Chrystal Maria Griffiths	e379691767	Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener ... Add some missing rel="noreferrer noopener" attributes GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d	2019-02-15 13:33:54 +00:00
Chrystal Maria Griffiths	d9692b7f91	Merge pull request #1168 from sharelatex/cmg-range-prototype ... Rich text track changes pt. 1 view changes GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d	2019-01-30 14:07:06 +00:00
James Allen	286dd564e2	Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection ... Fix history default file selection and bug when comparing with version zero GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1	2019-01-29 10:12:17 +00:00
James Allen	abb259a98b	Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4 ... Upgrade to angular-sanitize 1.6.4 GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e	2019-01-29 10:12:02 +00:00
Douglas Lovell	2a72804434	Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing' ... GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3	2019-01-24 12:13:23 +00:00
Douglas Lovell	c294a8425b	Merge remote-tracking branch 'origin/ns-new-file-modal' ... GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c	2019-01-24 12:13:02 +00:00
Douglas Lovell	59d4bd6182	Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling' ... GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2	2019-01-24 12:12:56 +00:00
Simon Detheridge	6650dfe494	Merge pull request #1419 from sharelatex/as-fix-invites-permissions ... Fix invite permissions in share modal GitOrigin-RevId: 8fe073faebcd84236ac58671820166a2ad73262f	2019-01-18 10:37:11 +00:00
Paulo Jorge Reis	4563ce864c	Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes ... History compare labels fixes GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3	2018-12-18 11:48:49 +00:00
Paulo Jorge Reis	d5c651c132	Merge pull request #1276 from sharelatex/pr-fix-history-v1 ... Undo rename and removal of the v1 history list controller. GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694	2018-12-17 12:16:20 +00:00
Paulo Jorge Reis	217bc180ac	Merge pull request #1251 from sharelatex/pr-history-labels-compare ... History labels compare GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c	2018-12-17 10:10:48 +00:00
James Allen	e603afe106	Merge pull request #1217 from sharelatex/ja-download-zip-version ... Add option to download zip file of version in history GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68	2018-12-05 12:32:26 +00:00
Douglas Lovell	aae0484458	Merge branch 'master' into dcl-i1207 ... GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc	2018-11-30 13:24:27 +00:00
Douglas Lovell	ed3147a58f	Allow open from template button when lacking source ... GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a	2018-11-30 13:24:23 +00:00
James Allen	1070cd36bb	Merge pull request #1163 from sharelatex/ja-zotero ... Add support for Zotero linked files GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941	2018-11-28 11:35:27 +00:00
Paulo Jorge Reis	794e6e146d	Merge pull request #1180 from sharelatex/pr-ieee-basic-styling-fixed ... IEEE basic styling fixed GitOrigin-RevId: 2f3fb3850435b52cea5228ac4a0dd2c1a874e36c	2018-11-22 15:32:58 +00:00
Paulo Jorge Reis	2f551922d6	Merge pull request #1179 from sharelatex/revert-1167-pr-ieee-basic-styling ... Revert "IEEE basic styling" GitOrigin-RevId: 1e473bddcfbc9b1a8aef6f4dd23ea3a716eddd71	2018-11-22 13:30:47 +00:00
Paulo Jorge Reis	41c12e2c52	Merge pull request #1167 from sharelatex/pr-ieee-basic-styling ... IEEE basic styling GitOrigin-RevId: 43a308fa8ce49d7b809b21fc95aefb41dcbaf46e	2018-11-22 11:11:34 +00:00
Paulo Jorge Reis	49388c868b	Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui ... Editor cobranding UI GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5	2018-11-07 11:43:31 +00:00
Paulo Reis	a957593b62	Avoid adding custom toggler attributes when the feature flag is false.	2018-10-19 10:34:07 +01:00
Paulo Reis	4232732646	Avoid using Angular eval for user-provided strings in the layout directive.	2018-10-19 10:00:52 +01:00
Hugh O'Brien	3b766bf523	Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id ... Create projects with brand variation id	2018-10-16 11:17:09 +01:00
Timothée Alby	89590d5199	Merge pull request #1003 from sharelatex/cmg-split-screen-button ... Switch between pdf and editor with full-screen button	2018-10-11 10:54:53 +01:00
Paulo Reis	29787c42c5	Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates.	2018-10-10 14:09:47 +01:00
Chrystal Griffiths	7ae39a0f84	Revert to ng-show	2018-10-09 10:30:24 +01:00
Chrystal Griffiths	849c5253c7	Avoid duplicating code	2018-10-08 17:50:10 +01:00
Tim Alby	cf47fc0b1c	fix link to link sharing help page	2018-10-08 16:07:11 +01:00
Chrystal Griffiths	d51549c4f0	Use ng-if to switch between pdf and editor	2018-10-05 11:19:20 +01:00
Brian Gough	2692090f3f	support a mainFile parameter for templates	2018-09-24 15:27:16 +01:00
Chrystal Griffiths	915bd18058	Read-only collaborators table	2018-09-14 11:47:18 +01:00
Chrystal Griffiths	3b43cf9075	Slight copy change	2018-09-13 17:57:11 +01:00
Chrystal Griffiths	b51fc01bde	Remove temporary solution	2018-09-13 17:17:18 +01:00
Chrystal Griffiths	57ac858004	Style the notice	2018-09-13 12:19:44 +01:00
Chrystal Griffiths	46eadfada4	Conditionally show sharing bits	2018-09-07 17:23:03 +01:00
Paulo Reis	fbf98d89f2	Improve the collapsing behaviour of 'change' entries in track-changes.	2018-09-01 15:36:02 +01:00
Paulo Reis	4ff7410391	Disable the review button when history is open.	2018-08-31 17:10:15 +01:00
Paulo Reis	fc7b5bdd63	* Share button shown to all users, with a tooltip for non-admin; remove its id.	2018-08-31 15:33:56 +01:00
Paulo Jorge Reis	4be364cd93	Merge pull request #864 from sharelatex/pr-history-restore-placeholder ... Add a placeholder "restore" button, showing a tooltip.	2018-08-30 11:25:25 +01:00
Paulo Jorge Reis	cb4d4145a1	Merge pull request #855 from sharelatex/pr-v2-light-theme ... v2 light theme	2018-08-30 11:24:52 +01:00
Jessica Lawshe	3a2400b212	Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links ... remove wufoo latex error response logging	2018-08-29 12:24:22 -05:00