Commit graph

2739 commits

Author SHA1 Message Date
Michael Schmatz
b93b5d3062 Added xavismeh to french translators 2014-02-06 14:42:56 -08:00
Michael Schmatz
7dcc351e75 Merge pull request #346 from xavismeh/i18n-fr
Improved FR translation
2014-02-06 14:39:42 -08:00
Michael Schmatz
24043eaee9 Refactored queue files and moved scoring queue out of commons queue 2014-02-06 14:32:35 -08:00
Nick Winter
642d88fe93 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 14:00:31 -08:00
Nick Winter
6af2d34f59 Fixed a ton of memory leaks, but not all of them. 2014-02-06 14:00:27 -08:00
Michael Schmatz
609547a37c Refactored queue routing structure 2014-02-06 13:25:11 -08:00
Scott Erickson
1e184c9590 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 13:23:04 -08:00
Scott Erickson
6484f787c5 Tweaked layer order updating to fallback to sorting by x if y and z are the same. 2014-02-06 13:22:47 -08:00
Michael Schmatz
721ca5f9ca Credits for FR translation
Merged in xavismeh's translation changes

Dummy credits commit
2014-02-06 20:57:30 +01:00
Michael Schmatz
f2b4ffb123 Merged in xavismeh's translation changes 2014-02-06 11:20:59 -08:00
Nick Winter
b696a3f188 Don't count on Olark being there. 2014-02-06 11:16:57 -08:00
Michael Schmatz
958ce4dfcf Merge pull request #345 from tohann/master
correct systems tab view test describe
2014-02-06 11:11:57 -08:00
Michael Schmatz
d28f162c52 Merge pull request #344 from smoratinos/master
delete unused code on server
2014-02-06 10:45:19 -08:00
Scott Erickson
332ea0df2c Fixed the level editor save view knowing if the level has changes to save. 2014-02-06 10:30:49 -08:00
Nick Winter
5ef7e188ea Merge branch 'master' into production 2014-02-06 10:19:34 -08:00
Scott Erickson
f3d1a43bbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 10:19:01 -08:00
Nick Winter
ea99a7b139 Turned off Olark for now. 2014-02-06 10:17:54 -08:00
Scott Erickson
9fd12b15bf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 09:29:13 -08:00
Nick Winter
847faf4d10 Possibly hooked up scaleFactorX and scaleFactorY. 2014-02-06 08:27:49 -08:00
Trent Ohannessian
b021c32bac correct systems tab view test describe 2014-02-06 09:24:56 -06:00
Nick Winter
2a8d0eb694 Updates for ThangsList refreshing its Thangs. 2014-02-05 20:08:28 -08:00
Michael Schmatz
3ccaa6796a Improved routes and put in session access 2014-02-05 16:41:01 -08:00
GlenDC
6138ff8b87 Making progress, git checkout is complete, working on configuration... 2014-02-06 01:13:50 +01:00
Nick Winter
cc3465fd6f Improvement for errors updating action of non-existent Thangs in HUD. 2014-02-05 15:54:34 -08:00
Scott Erickson
6728712064 Fixed the thang components edit view in both locations now. 2014-02-05 15:39:08 -08:00
Scott Erickson
25e2895b64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3 Improvements to how Tome subviews manage Thang updates. 2014-02-05 15:16:59 -08:00
Sébastien Moratinos
8e841b397d delete unused code on server 2014-02-06 00:16:47 +01:00
Scott Erickson
7041a12244 Fixed display of actions using container in the thang editor. 2014-02-05 15:16:07 -08:00
Michael Schmatz
b174b10642 Added message class for SQS, basic scoring routes 2014-02-05 15:07:15 -08:00
Scott Erickson
f900009770 Actions without a container or animation to show don't show anything. 2014-02-05 14:57:05 -08:00
GlenDC
cc8469c208 Git repository checkout sucessfull 2014-02-05 23:52:44 +01:00
Scott Erickson
88beb4db5f Fixed the positioning of the thang components view in the thang editor. 2014-02-05 14:39:56 -08:00
GlenDC
99e41b8bbb Git is now part of the project. 2014-02-05 23:23:39 +01:00
Scott Erickson
323d3570ec Fix for the dynamic programming level of project dota. 2014-02-05 13:39:41 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -08:00
Michael Schmatz
308f34bc76 Merge branch 'feature/task-queue' of github.com:codecombat/codecombat into feature/task-queue
Conflicts:
	server_setup.coffee
2014-02-05 09:42:25 -08:00
Michael Schmatz
5c328d09f5 Added scoring and queue modules 2014-02-05 09:39:14 -08:00
Michael Schmatz
177eb60e48 Merge pull request #342 from codecombat/master
Merge server refactor into task queue
2014-02-05 09:38:18 -08:00
Michael Schmatz
63b5b50f96 Allowed multiple versions of MongoDB 2014-02-05 08:53:04 -08:00
Michael Schmatz
32bae5362e Merge pull request #340 from smoratinos/master
server refactor db routes
2014-02-05 08:45:49 -08:00
GlenDC
becd046472 Making git automatic && making it more userfriendly 2014-02-05 01:48:11 +01:00
GlenDC
047d89e802 Fixed some bugs, implemented strict y/n checking and started on git repository check out steps... 2014-02-05 00:46:03 +01:00
GlenDC
30758cf777 Added python to the installation list 2014-02-04 23:30:11 +01:00
Sébastien Moratinos
f58acf0fbb rename some variables 2014-02-04 23:28:21 +01:00
Sébastien Moratinos
baf5ada19d use a mapping for handlers, schemas, and routes 2014-02-04 23:27:24 +01:00
Sébastien Moratinos
23a07303e3 move database setup (mongodb) out of db route (http endpoint) 2014-02-04 23:26:04 +01:00
GlenDC
6c7fded313 bug fix and now able to set env variables. 2014-02-04 23:19:11 +01:00
GlenDC
dc5fdafdf8 Update to some files for the windows dev setup 2014-02-04 21:38:15 +01:00
Michael Schmatz
84636360f4 Merge pull request #339 from smoratinos/master
refactor server test directory
2014-02-04 12:25:06 -08:00