1196 commits

Author	SHA1	Message	Date
Henry Oswald	40c3c3e1ce	added customAccount to subscription model	2014-10-10 15:57:27 +01:00
Henry Oswald	7b37bed2cd	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-10 15:45:09 +01:00
Henry Oswald	b90003b11e	added custom user dashboard page	2014-10-10 15:44:53 +01:00
Henry Oswald	3ba3a91043	if its a custom account redirect to /user/subscription/custom_account	2014-10-10 15:11:22 +01:00
James Allen	a8afe3a0d7	Improve file uploader CSS	2014-10-10 13:40:00 +01:00
Henry Oswald	c7a3cb87c2	added modules folder	2014-10-10 09:50:53 +01:00
Henry Oswald	e5ab40c911	added example session invalidation code	2014-10-09 18:10:01 +01:00
Henry Oswald	e7984a90d7	unlink dropbox when a user cancels	2014-10-09 17:05:41 +01:00
Henry Oswald	9924882b59	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-09 16:45:26 +01:00
Henry Oswald	9803f8bd70	changed uni page holder and footer	2014-10-09 16:45:04 +01:00
James Allen	4743b460f5	Only show rename or deleted message once	2014-10-09 09:13:38 +01:00
James Allen	bc94ea56cb	Add projects to tag after creating the tag	2014-10-09 08:39:15 +01:00
James Allen	3bf7948510	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-10-08 17:18:57 +01:00
James Allen	accd8207b2	Show password reset expired message rather than server error if that's what has happened	2014-10-08 17:18:24 +01:00
Henry Oswald	1f5d7ee6a8	Merge pull request #116 from mickaobrien/keyboard-shortcuts ... Added keyboard shortcuts to bold and italicise text	2014-10-08 16:56:03 +01:00
James Allen	7258fadd17	Improve styling of plan name and price on subscription form	2014-10-08 16:52:37 +01:00
Mick O'Brien	834e27f3c5	Fix indentation in italics shortcut	2014-10-08 16:34:44 +01:00
James Allen	696e8d24e1	Fix z index of more updates buttons	2014-10-08 16:32:42 +01:00
Mick O'Brien	b7db72e574	Replace $isEmpty check	2014-10-08 16:17:38 +01:00
Henry Oswald	c2c29bb282	university site renders via prozy ok	2014-10-08 16:07:44 +01:00
James Allen	8f7dff1518	Don't show empty sync menu list for collaborators	2014-10-08 15:57:56 +01:00
Mick O'Brien	72fc630e81	Added keyboard shortcuts to bold and italicise text	2014-10-08 15:44:01 +01:00
James Allen	3a9d8c2b31	Make Dropbox unlinking consistent with github	2014-10-08 14:02:37 +01:00
James Allen	82dc3cf654	Don't reload module views each request by default	2014-10-08 12:39:36 +01:00
James Allen	b62fb3960c	Fix javascript compiling when there are no modules	2014-10-08 12:22:04 +01:00
James Allen	128c672edd	Merge branch 'github-sync' ... Conflicts: package.json	2014-10-08 12:13:37 +01:00
James Allen	e406034ad6	Add in Dropbox description	2014-10-07 14:42:03 +01:00
James Allen	dbd85a05f1	Send user features and features switches to views where needed	2014-10-07 13:31:13 +01:00
Henry Oswald	8789a4bde1	server rejects rename of entitys over 150 chars	2014-10-07 11:16:26 +01:00
Henry Oswald	b01b05e49b	server rejects project names over 150 chars	2014-10-07 11:14:02 +01:00
Henry Oswald	28b1e6bfe5	added client side checks on how long project or entity names can be ... 150 chars should be safely under the 1024 bytes mongo index limit	2014-10-07 11:08:08 +01:00
James Allen	6c7c09075c	Treat paths properly in project content update methods	2014-10-03 11:33:18 +01:00
James Allen	10732d112d	Hook module system into project list page	2014-10-03 11:32:59 +01:00
Henry Oswald	b05c6bb001	fixed hiding lang popup in firefox	2014-10-02 17:27:02 +01:00
James Allen	13a96c925b	Add in endpoints to allow updating project files when the project id is know	2014-10-02 14:15:30 +01:00
Henry Oswald	3442786930	fixed template error	2014-09-30 21:52:00 +01:00
Henry Oswald	de6135c777	added missing translations	2014-09-30 11:41:47 +01:00
Henry Oswald	9faf4771e7	added ab test controller so it is always loaded	2014-09-29 17:33:54 +01:00
Henry Oswald	e35a32d7d7	take minor versions of redis-sharelatex	2014-09-29 12:48:26 +01:00
Henry Oswald	2375dbb851	run succesful login before each smoke test to avoid any rate limit issues	2014-09-29 11:45:34 +01:00
Henry Oswald	7f2df4bbd3	renamed rate limiter tests	2014-09-29 11:42:46 +01:00
Henry Oswald	49e7777b6d	bumped redis-sharelatex	2014-09-29 11:42:28 +01:00
Henry Oswald	0d056434e6	fixed tests	2014-09-26 17:49:31 +01:00
Henry Oswald	9a97245c01	Merge branch 'redis-sentinal'	2014-09-26 17:40:53 +01:00
Henry Oswald	81307324fc	v2, seems to work...	2014-09-26 17:04:33 +01:00
Henry Oswald	a0174c649b	added a couple of missing translations	2014-09-26 16:35:57 +01:00
Henry Oswald	ca4dc9bf00	added missing translation	2014-09-26 15:04:25 +01:00
Henry Oswald	f73629f8d9	v1 of sentinal support	2014-09-26 14:52:00 +01:00
Henry Oswald	ab46d6ec1a	30 != 7 days	2014-09-26 11:33:34 +01:00
Henry Oswald	b1562984c0	added tr flag	2014-09-26 11:25:29 +01:00