Commit graph

620 commits

Author SHA1 Message Date
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Michael Schmatz
57cfb2bac6 Removed server side tests due to lack of mongodb text search 2014-01-27 18:32:56 -08:00
Michael Schmatz
1e83c7bef2 Added mongodb to be started on VM boot 2014-01-27 18:28:21 -08:00
Michael Schmatz
2f33ea41f8 Added server tests to TravisCI 2014-01-27 18:22:28 -08:00
Michael Schmatz
a2028268b9 Disabled failing tests 2014-01-27 18:11:33 -08:00
Scott Erickson
096d318e96 Fixed #283 2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5 Fixed #278 2014-01-27 16:59:34 -08:00
Michael Schmatz
7a7ebcd63a Disabled failing camera tests until the axes are changed 2014-01-27 16:53:32 -08:00
Scott Erickson
9c7ac3dfdc Fixed the top nav height. 2014-01-27 16:20:13 -08:00
Scott Erickson
22e6942165 Fixed account settings page. 2014-01-27 16:07:17 -08:00
Michael Schmatz
7534f47be4 Refactored server.coffee 2014-01-27 15:36:35 -08:00
Scott Erickson
056b81115d Fixed profile page. 2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab Level preview now loads from backups so that brunch reloads don't cause the preview to break. 2014-01-27 11:00:36 -08:00
Scott Erickson
36a46a07f2 Updated the names file. 2014-01-27 10:50:58 -08:00
Scott Erickson
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -08:00
Scott Erickson
8768d710ba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-27 10:06:45 -08:00
Scott Erickson
f1518a28e2 Fixed the camera when locked to never go to a new target. 2014-01-27 10:06:34 -08:00
Michael Schmatz
bf6e91883e Fixed es-ES.coffee compilation errror 2014-01-27 09:00:03 -08:00
Michael Schmatz
668ba81e78 Merge pull request #285 from DanielRodriguezRivero/patch-2
Update es-ES.coffee
2014-01-27 08:59:28 -08:00
Michael Schmatz
298057ae58 Merge pull request #288 from atlantisguru/patch-1
Updated hu.coffee
2014-01-27 08:30:22 -08:00
Scott Erickson
692b24dde0 #267 2014-01-26 15:59:33 -08:00
Scott Erickson
26e9dc3b09 Fixed system order in the level view. 2014-01-26 15:37:32 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Scott Erickson
ae2bb625c8 Refactored storage module. 2014-01-26 14:44:08 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Bubori Attila
e8c42b8d2b Updated hu.coffe
Editor section translated to hungarian.
2014-01-25 23:27:44 +01:00
Nick Winter
fd758f2d4b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-24 17:48:14 -08:00
Nick Winter
d262dfaca7 A few visual tweaks to the spell view flow. 2014-01-24 17:48:11 -08:00
Scott Erickson
46dd4044aa I'm pretty sure it's working now. 2014-01-24 17:42:47 -08:00
Scott Erickson
eafa82357c MailChimp webhook fix. 2014-01-24 17:35:34 -08:00
Scott Erickson
3122dd9594 More tweaks to the mail module. 2014-01-24 17:19:20 -08:00
Scott Erickson
7bc6d0f6ed No longer returning error messages when given bad input, because then MailChimp won't accept it as a webhook. 2014-01-24 13:55:23 -08:00
Scott Erickson
e821e61d09 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-24 13:47:34 -08:00
Scott Erickson
c4114f9f92 More fixes. 2014-01-24 13:47:25 -08:00
Nick Winter
e3b89da7fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-24 13:46:55 -08:00
Nick Winter
45329df4cd Temp fix for debugger bug on a relevant session. 2014-01-24 13:46:51 -08:00
Scott Erickson
ced57ac35d More tweaks. 2014-01-24 13:22:56 -08:00
Scott Erickson
6d76f7b346 Merge branch 'production' 2014-01-24 13:15:40 -08:00
Scott Erickson
dd9c4007a2 Reverting back to super log mode cause it stopped working. 2014-01-24 13:14:31 -08:00
Nick Winter
bfaf13fc9c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-24 13:03:09 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08:00
Scott Erickson
2aae746e63 Merge branch 'master' into production 2014-01-24 12:54:35 -08:00
Scott Erickson
79032b1c35 Couple remaining fixes. 2014-01-24 12:54:15 -08:00
Scott Erickson
4450747671 Finished setting up the mailchimp webhook. 2014-01-24 12:53:41 -08:00
Scott Erickson
df0d2e54ee Merge branch 'master' into production 2014-01-24 12:39:18 -08:00
Scott Erickson
a71b688a15 Fixed the mailchimp webhook. 2014-01-24 12:39:05 -08:00
Scott Erickson
fb59521748 Merge branch 'master' into production 2014-01-24 12:25:43 -08:00