2203 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	7e216391b7	wip	2016-03-12 10:55:17 +00:00
Henry Oswald	36966f0c9b	wip	2016-03-10 17:11:28 +00:00
Henry Oswald	789abe504d	added random ticket number to groove tickets	2016-03-02 12:23:51 +00:00
Henry Oswald	8a4a320f4b	done -> close on modal for sharing	2016-03-01 20:17:15 +00:00
Shane Kilkelly	ca43d27244	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-29 15:52:09 +00:00
Shane Kilkelly	b005f8233e	guard against null and undefined keys in \cite{} autocomplete	2016-02-29 15:52:02 +00:00
Henry Oswald	43102e0ffc	lowercase and trim add user to group email address	2016-02-25 14:15:56 +00:00
James Allen	155831c3e7	Skip top-level directory if it exists in zip upload	2016-02-24 17:21:20 +00:00
James Allen	d3e3deb679	Fix padding around active toolbar links	2016-02-24 16:37:03 +00:00
James Allen	71ca358e0e	Show confirmation if upload will overwrite files	2016-02-24 16:37:03 +00:00
James Allen	c6dcb64b18	Overwrite text files from uploads	2016-02-24 16:37:03 +00:00
Shane Kilkelly	34bfdcc246	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-24 10:27:44 +00:00
Shane Kilkelly	4f3a4880d9	remove margin above search results.	2016-02-24 10:27:29 +00:00
James Allen	2c20b7d16f	Bring full screen PDF icon into scrollable div	2016-02-23 15:25:04 +00:00
James Allen	ff7632d6c7	Don't reload editor with file tree or PDF viewer hidden	2016-02-23 15:21:54 +00:00
James Allen	fde7efbb9f	Fix rename button styling in editor	2016-02-23 15:21:54 +00:00
James Allen	f21aa0dd94	Don't allow project names to be blank	2016-02-23 15:21:53 +00:00
Henry Oswald	b504732733	fixed calls to addUserToGroup and added more logging	2016-02-22 16:50:41 +00:00
Henry Oswald	103bb1c88f	add more error logging to group handler	2016-02-22 16:01:26 +00:00
Shane Kilkelly	1e1f57a80b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-22 12:04:43 +00:00
Shane Kilkelly	2d954baa62	match cite commands like footcite too.	2016-02-22 12:04:15 +00:00
Henry Oswald	85a8bc97ed	add leave group button for group subscriptions	2016-02-19 12:27:32 +00:00
Shane Kilkelly	b505f0d455	Merge branch 'sk-references-search' ... Conflicts: app/coffee/Features/References/ReferencesController.coffee	2016-02-19 11:30:55 +00:00
James Allen	bf36413491	Improve styling of upgrade messages	2016-02-18 14:53:49 +00:00
Shane Kilkelly	ef1cec8582	update the search_example.gif	2016-02-18 13:54:13 +00:00
Henry Oswald	29e4b324fd	improve calls for invite notifications and auto mark as read	2016-02-18 11:43:43 +00:00
Henry Oswald	f824a3e28a	kill off dead code in group handler	2016-02-18 11:42:26 +00:00
Shane Kilkelly	8384433231	Clean up and add comments to references-search styles.	2016-02-18 10:47:28 +00:00
Henry Oswald	bd54cc722a	fixed broken tests in AuthenticationController	2016-02-18 10:16:50 +00:00
Henry Oswald	fc4bd94a6e	don't create notification if user is already part of group	2016-02-18 10:06:21 +00:00
Shane Kilkelly	d94e3181c3	update references search preview gif.	2016-02-17 16:44:41 +00:00
Henry Oswald	c8084406d3	user notifications auto created on login for joinging groups	2016-02-17 16:24:09 +00:00
Henry Oswald	8a417035ea	remove unned debug line	2016-02-17 16:23:52 +00:00
Shane Kilkelly	f23a11eacb	Refine call-to-action styling in references upgrade dialog.	2016-02-17 15:45:04 +00:00
Shane Kilkelly	9c9a9c5c76	preview gif for references search.	2016-02-17 14:49:37 +00:00
Henry Oswald	5f719e7105	change robots.txt to ignore all	2016-02-16 12:38:27 +00:00
Henry Oswald	735f7bd51e	change res.send to res.sendStatus for new express	2016-02-16 12:38:27 +00:00
Henry Oswald	4017eab888	don't show outline on new doc/folder/upload buttons on select	2016-02-16 12:38:27 +00:00
Henry Oswald	f5910762c1	fixed missign translation for when email is already registered	2016-02-16 12:38:27 +00:00
James Allen	b3a2d44937	next -> callback	2016-02-16 11:12:07 +00:00
Shane Kilkelly	e7e6b1008b	styles for spinner.	2016-02-15 16:11:59 +00:00
Henry Oswald	87ef2cc563	Merge branch 'nodemailer2'	2016-02-15 14:52:58 +00:00
Henry Oswald	ef148da7aa	remove un needed require	2016-02-12 17:15:13 +00:00
Henry Oswald	05bf048885	upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending ... on what is in settings file	2016-02-12 17:13:45 +00:00
Shane Kilkelly	2901d12eaa	update styles for search modal.	2016-02-12 16:24:35 +00:00
James Allen	e4960e782f	Merge branch 'ja-multi-select'	2016-02-12 11:56:10 +00:00
James Allen	9d8b91532b	Fix parent highlight bug in jquery ui	2016-02-11 15:41:56 +00:00
Shane Kilkelly	8542a08927	Refine styles.	2016-02-11 15:03:19 +00:00