1549 commits

Author	SHA1	Message	Date
Henry Oswald	b237a022c3	added rate limiting on wiki endpoint	2016-04-28 17:24:00 +01:00
Shane Kilkelly	74205ce11b	Remove features.mendeley and features.zotero from User model	2016-04-28 16:01:47 +01:00
Henry Oswald	ae522e8b9b	Merge pull request #235 from mdamien/patch-1 ... Correct alignment for word count dialog	2016-04-27 16:12:03 +01:00
Shane Kilkelly	07ad6eb704	actually use the rendering-error state.	2016-04-25 12:42:03 +01: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
Shane Kilkelly	939d7cd042	Merge branch 'master' into sk-tpr	2016-04-11 16:41:34 +01:00
Henry Oswald	424e09ec05	getGroupSubscriptionMemberOf gets plan code	2016-04-05 16:03:46 +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
Henry Oswald	1a651b38f4	added sendgrid as email option	2016-03-29 14:15:33 +01: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	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	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	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	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
Henry Oswald	a6859e22b3	if user is member of group on downgrade use the group subscription	2016-03-22 16:05:46 +00:00
Shane Kilkelly	b212f33505	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 15:21:00 +00:00
James Allen	9706585d21	Fix translate in delete modal confirm button	2016-03-22 14:44:13 +00:00
Shane Kilkelly	d566ce3fd2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 14:38:56 +00:00
Henry Oswald	cc84aaf834	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-22 14:19:54 +00:00
Henry Oswald	7fb0249b2b	null check subscription for custom accounts page	2016-03-22 14:19:46 +00:00
James Allen	a597ebfd90	Only show deleted files in track changes view	2016-03-22 14:13:50 +00:00
Shane Kilkelly	b8c3b427ee	Merge branch 'sk-pdf-error-display'	2016-03-22 14:00:12 +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
James Allen	aa1f2cc8a9	Remove #s in href on project list buttons	2016-03-22 12:11:59 +00:00
Henry Oswald	c777f498ad	Merge branch 'groove2'	2016-03-22 11:58:04 +00:00
James Allen	49bb4f07ea	Move delete docs into view in file-tree element	2016-03-22 11:15:52 +00:00
Shane Kilkelly	45077cfba9	Merge branch 'master' into sk-pdf-error-display	2016-03-22 10:56:59 +00:00