15 commits

Author	SHA1	Message	Date
Scott Erickson	056f081cdb	Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide ... Conflicts: app/views/modal/signup_modal.coffee	2014-05-05 16:48:35 -07:00
Michael Schmatz	6644c6a9ee	Push for george	2014-04-24 15:27:37 -07:00
Aditya Raisinghani	ffd057899e	Removed anon name collisions and reset anon user name if name is taken in interim.	2014-04-13 17:55:49 +05:30
Nick Winter	dd46f9d039	Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.	2014-04-09 16:46:44 -07:00
Scott Erickson	0a78368217	Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it.	2014-04-02 13:12:24 -07:00
Nick Winter	a319e183b6	Fixed a little mistake with user signup.	2014-03-31 14:02:15 -07:00
Nick Winter	389323953b	Fixed #180.	2014-03-31 13:56:13 -07:00
Shrihari	5845125b43	Migrate .on, .once - Fixed a small error	2014-03-24 12:32:29 +05:30
Shrihari	67f5270bfc	Migrate .on, .once - Batch 1	2014-03-24 12:23:41 +05:30
Scott Erickson	9726840d8a	Trying to handle a case where a user did not have their user account created.	2014-03-04 12:21:02 -08:00
Scott Erickson	ae2bb625c8	Refactored storage module.	2014-01-26 14:44:08 -08:00
Nick Winter	e2414f7c5a	Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.	2014-01-09 10:49:34 -08:00
Scott Erickson	5a4de61999	Bug fix.	2014-01-06 17:56:34 -08:00
Scott Erickson	975a7453bd	Refactored initial User creation.	2014-01-06 17:45:35 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00