915 commits

Author	SHA1	Message	Date
Henry Oswald	cb3eb88af2	Merge branch 'subscriptionimprovements'	2016-03-31 11:58:56 +01:00
Shane Kilkelly	059d3432c2	Allow citations like -parencite[page 6]{ to work.	2016-03-30 11:28:56 +01:00
Henry Oswald	c7da9f1eef	added different check to contact-us modal	2016-03-29 14:25:59 +01:00
Henry Oswald	e2dffdf722	when user contact us put project url at bottom of message	2016-03-24 14:23:18 +00:00
Henry Oswald	6662d4c2cd	wired up modal for learn and added translations	2016-03-24 12:05:54 +00:00
James Allen	9b84e1b164	Improve styling of wiki search	2016-03-24 11:38:56 +00:00
Henry Oswald	ce2cfeaa5b	don't show search bar in templates if its not configured	2016-03-24 09:52:19 +00:00
Henry Oswald	6a4e13d3c8	added templates angular file forgoten in last commit	2016-03-24 09:35:11 +00:00
Henry Oswald	de0aa1035d	pulled tempaltes search into its own file	2016-03-22 22:29:18 +00:00
Henry Oswald	9cfbbfa504	template search works nicely, needs styling	2016-03-22 22:16:38 +00:00
Henry Oswald	cf45b8bd74	Merge branch 'master' into templatessearch	2016-03-22 21:35:36 +00:00
Henry Oswald	c554b0630d	if user has subscription before joining group is given option to cancel personal one	2016-03-22 16:59:47 +00:00
Shane Kilkelly	62ececeef8	show logs on failure.	2016-03-22 16:59:40 +00:00
Shane Kilkelly	2c321a4803	If the compile request errors out, set view to 'errors'.	2016-03-22 15:51:05 +00:00
Shane Kilkelly	12b0e982c8	Don't raise an error if output.blg cannot be found.	2016-03-22 14:42:00 +00:00
Shane Kilkelly	d566ce3fd2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 14:38:56 +00:00
Shane Kilkelly	d5c280dc4d	Show the pdf if it was already loaded. ... This ensures the pdf will be visible if the user switches to fullscreen-view.	2016-03-22 14:38:48 +00:00
Henry Oswald	fbfd160c6d	default message to empty string	2016-03-22 14:02:15 +00:00
Shane Kilkelly	b8c3b427ee	Merge branch 'sk-pdf-error-display'	2016-03-22 14:00:12 +00:00
Shane Kilkelly	2dd9aa9424	Merge branch 'sk-environment-autocomplete'	2016-03-22 13:55:41 +00:00
Henry Oswald	cacb3bf39e	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-22 12:30:52 +00:00
Henry Oswald	69a7a1508b	modal != modal instance	2016-03-22 12:28:37 +00:00
James Allen	7637c858c8	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 12:14:18 +00:00
James Allen	4595c90363	Use translations for action in project delete modal	2016-03-22 12:12:11 +00:00
Henry Oswald	c777f498ad	Merge branch 'groove2'	2016-03-22 11:58:04 +00:00
Shane Kilkelly	45077cfba9	Merge branch 'master' into sk-pdf-error-display	2016-03-22 10:56:59 +00:00
Shane Kilkelly	723031f7f3	un-show logs on successful run.	2016-03-22 10:32:55 +00:00
Shane Kilkelly	293cb3c73e	fix typo	2016-03-22 10:32:44 +00:00
Shane Kilkelly	4f3755318f	Clean up.	2016-03-22 10:24:58 +00:00
Shane Kilkelly	59b131f251	First pass at refactoring the output panel views.	2016-03-22 09:39:33 +00:00
Shane Kilkelly	f58f1c3795	Account for the new too-recently-compiled error.	2016-03-21 15:16:17 +00:00
Shane Kilkelly	53dfa841cc	Add the beginnings of a clsi-maintenance-mode message	2016-03-21 15:00:25 +00:00
Shane Kilkelly	9b22efbd98	split errors into normal error, and renderingError.	2016-03-21 13:20:03 +00:00
Henry Oswald	4e78e34cdf	finished contact us with groove ... for settings file: <a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>	2016-03-21 11:41:05 +00:00
Henry Oswald	882297c353	working framework. not happy with groove. Can't set mailbox	2016-03-18 12:55:35 +00:00
Henry Oswald	209c8ebbfc	wip	2016-03-18 11:31:50 +00:00
James Allen	de02928454	Merge branch 'master' into ja_email_tokens	2016-03-17 17:01:26 +00:00
Shane Kilkelly	11d77df898	Fix weird tab behaviour	2016-03-17 16:18:46 +00:00
Shane Kilkelly	020fd2e88d	De-dupe autocomplete entries	2016-03-17 15:58:57 +00:00
Shane Kilkelly	53b46e42cd	Refactor, take indentation into account.	2016-03-17 15:27:20 +00:00
Shane Kilkelly	229ced6f2f	Remove Indentation.	2016-03-17 14:43:34 +00:00
Shane Kilkelly	95a6e1900e	Add autocomplete entries for the end{} commands	2016-03-17 14:09:45 +00:00
Shane Kilkelly	d655e99439	Parse existing begin commands too.	2016-03-17 12:07:21 +00:00
Shane Kilkelly	eebd25351d	Add the custom environments to the list of snippets	2016-03-17 11:23:53 +00:00
Shane Kilkelly	c25c2b676a	Parse \newenvironment{} commands.	2016-03-17 11:14:05 +00:00
Shane Kilkelly	115734f82e	Rename Snippets -> SnippetManager	2016-03-17 10:04:14 +00:00
Shane Kilkelly	7cc3f7613e	Move the getCompletions call for Snippets into the Snippets module.	2016-03-17 10:00:07 +00:00
Shane Kilkelly	2985a0b0b2	Account for later commands on the same line.	2016-03-16 11:42:30 +00:00
Shane Kilkelly	cff00c09b0	Add a '}' at the end of citation autocomplete if required.	2016-03-15 16:02:48 +00:00
Henry Oswald	3fc357a343	Merge branch 'master' into projectsizelimit	2016-03-14 10:31:07 +00:00