codecombat/app
Michael Schmatz 693da57f13 Merge branch 'feature/linkedin-profile-import'
Conflicts:
	app/templates/account/profile.jade
	app/views/account/profile_view.coffee
2014-06-08 18:37:33 -07:00
..
assets Fixed karma tests. 2014-06-07 18:15:57 -07:00
collections Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
lib Add linkedIn link, field of study support to LinkedIn import 2014-06-08 18:15:18 -07:00
locale Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
models Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
schemas Basic functionality done, needs validation error handling 2014-06-07 11:45:49 -07:00
styles Wrapped LinkedIn button in a .btn. 2014-06-08 18:51:45 -06:00
templates Merge branch 'feature/linkedin-profile-import' 2014-06-08 18:37:33 -07:00
views Merge branch 'feature/linkedin-profile-import' 2014-06-08 18:37:33 -07:00
application.coffee Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
initialize.coffee Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
treema-ext.coffee Merge branch 'master' into feature/loading-views 2014-04-25 14:31:58 -07:00