20619 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Henry Oswald	ca8a21c425	change async to series ... no real gain from parallel, series might reduce the cpu load if it finds the doc early	2014-11-26 21:53:57 +00:00
Henry Oswald	5e570d52a0	modfied setRootDocAutomatically to work async ... was causing cpu to block for along time on big projects	2014-11-26 17:19:21 +00:00
Brian Gough	a15ee57d77	working on zoom/fit buttons	2014-11-26 16:52:54 +00:00
Brian Gough	6c1cee1431	save pdf position and scale	2014-11-26 16:18:59 +00:00
Brian Gough	7b66802bf5	set up pdf viewer app in base	2014-11-26 16:18:39 +00:00
Brian Gough	d0fb34b2aa	Merge branch 'master' into pdfng	2014-11-26 15:42:42 +00:00
Henry Oswald	393a637673	remove a couple of required coffee-scritps which are not required	2014-11-26 15:37:53 +00:00
Henry Oswald	857d867191	added locks into editor controller for new/move/deletes ... filesystem import manager uses the unlocked version	2014-11-26 15:32:23 +00:00
Brian Gough	33d94af930	Merge branch 'master' into pdfng	2014-11-26 14:17:02 +00:00
Henry Oswald	bd841b4795	coppied the lock manager over from doc updater	2014-11-25 16:52:27 +00:00
Brian Gough	643bda6095	add pdfng module and use it by default	2014-11-25 16:49:09 +00:00
Brian Gough	81b8594944	upgrade pdf.js to v1.0.712	2014-11-25 15:58:01 +00:00
Henry Oswald	ba784c3e62	changed swiss franks to show Fr for display issues	2014-11-25 13:18:57 +00:00
Henry Oswald	d070c0acd8	fixed SGD collab price	2014-11-25 13:14:38 +00:00
Henry Oswald	3bae278c92	Revert "increased timeout for geoip to 3 seconds" ... This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.	2014-11-25 13:10:00 +00:00
Henry Oswald	d91064a369	increased timeout for geoip to 3 seconds	2014-11-25 11:51:03 +00:00
Henry Oswald	dbecadcaea	Merge branch 'master' into multicurrency	2014-11-25 11:35:59 +00:00
Henry Oswald	dd37436da2	delete old cookie keys	2014-11-25 11:35:46 +00:00
James Allen	99ac814c7d	Truncate error stack traces to 10 lines	2014-11-25 09:17:26 +00:00
Henry Oswald	02ef07dca4	broken free trial func into own file. added ab test on upgrade button colour	2014-11-24 23:59:55 +00:00
James Allen	7a9f7f0870	Don't print massive stack trace when there is no room_id	2014-11-24 22:28:50 +00:00
James Allen	d08f2dec97	Merge pull request #229 from sharelatex/force-npm-rebuild ... force an npm rebuild to work around issue #129, missing bcrypt bindings	2014-11-24 16:29:00 +00:00
Henry Oswald	6c0f03e9c7	added ab test to show collar plan to people in editor	2014-11-24 16:21:03 +00:00
Brian Gough	a0e43f5559	force an npm rebuild to work around issue #129, missing bcrypt bindings file ... see https://github.com/npm/npm/issues/5400	2014-11-24 16:13:31 +00:00
James Allen	d62dc7ca3a	Don't be so verbose with client update errors	2014-11-24 15:42:26 +00:00
James Allen	43a008c0bc	Stub logger in unit tests	2014-11-24 15:42:13 +00:00
James Allen	afca9ba0cb	Fix unit tests	2014-11-24 14:26:51 +00:00
James Allen	b8fdbdb406	Handle errors in request pipes	2014-11-24 13:58:41 +00:00
James Allen	970125b7a8	Check for null project in joinProject	2014-11-24 13:43:08 +00:00
James Allen	3578e41c9c	Add null check into FileTypeManager isDirectory check	2014-11-24 13:39:07 +00:00
James Allen	d4af0fe36d	Wrap smoke test in domain to catch errors	2014-11-24 13:36:10 +00:00
James Allen	c28e09076b	Add missing logger include in smoke test	2014-11-24 13:33:03 +00:00
James Allen	0ed7d0c811	Ignore messages with null room_id	2014-11-24 12:09:12 +00:00
James Allen	57a34e940e	Authorize users before updating their cursor positions	2014-11-24 12:05:05 +00:00
Henry Oswald	a52b91691a	Merge branch 'master' into multicurrency	2014-11-21 13:16:29 +00:00
Henry Oswald	6d22bda88f	added new currencies removed ab test as well	2014-11-21 13:13:53 +00:00
James Allen	6fd2e5e6d7	Add in real-time service	2014-11-21 12:45:19 +00:00
James Allen	485459c839	Use real-time server for websockets	2014-11-21 12:44:41 +00:00
James Allen	a48c8aad92	Support anonymous access	2014-11-21 11:48:59 +00:00
James Allen	2a05045600	Add in redis health check	2014-11-20 16:56:09 +00:00
Henry Oswald	e23b0f0076	bump redis package	2014-11-20 12:53:41 +00:00
Henry Oswald	24b3226fcf	bump redis version	2014-11-20 12:50:55 +00:00
Henry Oswald	3334a55944	bump package	2014-11-20 12:50:31 +00:00
Henry Oswald	917ce27a2c	add a double message check	2014-11-20 12:50:19 +00:00
Henry Oswald	db0322e054	added redis health check	2014-11-20 11:40:52 +00:00
Winston Li	8483e0b86a	Accounting for trailing slashes and .git in project name.	2014-11-20 11:37:32 +00:00
Winston Li	a654529090	Removed print statements.	2014-11-20 11:25:00 +00:00
Winston Li	c42db9eb8b	Throwing RepositoryNotFoundException when not found.	2014-11-20 11:23:31 +00:00
Henry Oswald	851764f269	bump package.json	2014-11-20 11:10:22 +00:00
Henry Oswald	119ae80853	bump package.json	2014-11-20 11:09:57 +00:00