9115 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Caleb Cooper	145b201087	Put brackets around the example ca path for ldap starttls support in the default config. This resolves an issue where the system was breaking the path into an array and trying to act on the first item in that array, "/", rather than the full path.	2016-04-15 13:46:11 -04:00
Shane Kilkelly	fbf5d35fa5	Merge branch 'master' into sk-tpr	2016-04-15 09:46:16 +01:00
Shane Kilkelly	9d027b88ba	Bug fix: re-introduce the project-too-large error message	2016-04-15 09:45:48 +01:00
Henry Oswald	ffa04c7b55	add project url onto query string for compile hashing	2016-04-13 15:38:04 +01:00
Shane Kilkelly	939d7cd042	Merge branch 'master' into sk-tpr	2016-04-11 16:41:34 +01:00
Shane Kilkelly	749d2aa013	Merge branch 'sk-safari-freeze-fix'	2016-04-11 14:47:03 +01:00
Shane Kilkelly	76697599ae	Use the _ide version of browserIsSafari	2016-04-11 14:45:26 +01:00
Shane Kilkelly	e3b2ec9977	Add a ide.browserIsSafari boolean flag.	2016-04-11 14:35:59 +01:00
Shane Kilkelly	8d6003dcc5	Add commentary	2016-04-11 09:58:37 +01:00
Shane Kilkelly	4fd4a0372c	In Safari, limit iterations of the command-parsing loop.	2016-04-11 09:55:53 +01:00
Henry Oswald	010bb61baf	add michael pic	2016-04-11 08:26:06 +01:00
Henry Oswald	862057b32c	Merge pull request #236 from heukirne/master ... update ldapjs	2016-04-06 15:37:06 +01:00
Henrique Dias	ae79ce75b7	Update settings.defaults.coffee	2016-04-06 11:32:08 -03:00
Henrique Dias	38c8eb868a	Update package.json	2016-04-06 11:30:26 -03:00
Henry Oswald	424e09ec05	getGroupSubscriptionMemberOf gets plan code	2016-04-05 16:03:46 +01:00
Henry Oswald	bd54218cc9	added grunt as depenency	2016-04-05 14:17:36 +01:00
Damien	77eba3ea22	Correct alignment for word count dialog ... on less than `md` sized screen	2016-04-04 23:47:40 +02:00
Henry Oswald	633839c98b	for support tickets include browser/os and hide email address if ... set already. This way we know who they are logged in with which has caused condfusion.	2016-04-04 16:05:42 +01:00
Shane Kilkelly	a686d187ad	Pull refProviders into user model	2016-04-01 11:36:19 +01:00
Henry Oswald	3d719af71e	if subscription is downgraded don't use plan code on subscription, use default instead	2016-03-31 18:04:20 +01:00
Henry Oswald	81cd2adfd3	member_ids != members_id	2016-03-31 17:36:06 +01:00
Henry Oswald	d80191c03b	added more logging and missing err handler in subscription updater	2016-03-31 17:28:03 +01:00
Shane Kilkelly	0ce514a5a6	Add features to the user object in ide.	2016-03-31 17:10:49 +01:00
Henry Oswald	5a201153c7	refactored subscription updater again adding _setUsersMinimumFeatures ... single place you can call and the users minimum features are set	2016-03-31 16:58:16 +01:00
Henry Oswald	cb3eb88af2	Merge branch 'subscriptionimprovements'	2016-03-31 11:58:56 +01:00
Henry Oswald	db8fb63bb5	fixed change payment details page ... also increased size of year field for firefox users and removed unnded options in new plan page	2016-03-31 11:54:52 +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	1a651b38f4	added sendgrid as email option	2016-03-29 14:15:33 +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	e9478e0843	Merge branch 'templatessearch'	2016-03-24 12:06:41 +00:00
Henry Oswald	6662d4c2cd	wired up modal for learn and added translations	2016-03-24 12:05:54 +00:00
James Allen	63c183402c	Style active and focus states of search results too	2016-03-24 11:42:48 +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	7634fcf3af	added missing page button (not wired up) to /learn	2016-03-23 18:23:09 +00:00
Henry Oswald	90092a0c61	improved styling, not perefect still	2016-03-23 16:05:38 +00:00
James Allen	3fe0674462	Revert "Add error handling in mkdir_p" ... This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319. Apparently mkdirp needs errors to be ignored to work...	2016-03-23 15:33:01 +00:00
James Allen	4d0fe3bf5d	Add error handling in mkdir_p	2016-03-23 15:18:10 +00:00
James Allen	ae5467894b	Standardise on one Errors file	2016-03-23 15:14:49 +00:00
James Allen	a95c941cb9	Fix FileStore unit tests	2016-03-23 15:13:32 +00:00
James Allen	bad9a0282d	Add missing error handler	2016-03-23 14:38:11 +00:00
James Allen	c827407a99	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-23 11:29:59 +00:00
James Allen	3d8ac9f292	Add in a few null checks ... These were discovered by using a project that was messed up with the moving folder bug where the folder ended up without an id, docs or fileRefs array	2016-03-23 10:54:36 +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