7670 commits

Author	SHA1	Message	Date
Henry Oswald	cfe13af6ff	Merge pull request #45 from chid/crash-fix ... add proper error handlers to the UserController class	2014-02-26 11:21:23 +00:00
Henry Oswald	cad8e0eb1c	Update bonus.jade - remove extra comma	2014-02-26 08:52:57 +00:00
Charley Peng	fa80b0c3d2	fixing incorrectly written variable	2014-02-26 08:58:51 +11:00
James Allen	128c982ba2	Add open source banner to footer	2014-02-22 11:26:36 +00:00
James Allen	ca1ebd0413	Take default features from settings	2014-02-22 10:50:59 +00:00
Henry Oswald	029077fe6e	downloading a file now sets the filename in header correctly	2014-02-20 22:33:12 +00:00
Henry Oswald	a9c48d666d	fixed broken delete effect due to project id quotes being rendered twice for some unknow reason	2014-02-20 21:26:26 +00:00
James Allen	d249158676	Don't try to fingerprint plans.css	2014-02-18 17:37:39 +00:00
Henry Oswald	347671c89b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-02-14 18:13:33 +00:00
Henry Oswald	65f849aad0	fixed bug where file uploader was calling cb on read stream not write stream, race condition created.	2014-02-14 18:13:22 +00:00
James Allen	fd911c278f	Move copyright images into brand directory	2014-02-14 11:44:09 +00:00
James Allen	4ec7deb7d6	Move plans.css to brand folder	2014-02-14 11:36:06 +00:00
James Allen	5ea231dea6	Sort iconshock icons into directory and add credit	2014-02-13 18:18:05 +00:00
James Allen	6eff979e2a	Move nide images into one folder	2014-02-13 15:35:44 +00:00
James Allen	7fb0dadbfd	Remove unneeded image files	2014-02-13 14:47:29 +00:00
Henry Oswald	b46f320882	linked to my twitter on about page	2014-02-13 14:32:07 +00:00
Henry Oswald	3c98dfec90	add Monendra to security acknowledgements list	2014-02-13 14:31:23 +00:00
James Allen	768fd20850	Allow NewletterManager to be called without a callback	2014-02-13 12:37:23 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00
Charley Peng	3f6e240401	adding callback on error	2007-03-01 16:53:59 +11:00