codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 11:27:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2603 commits 27 branches 0 tags 134 MiB
Commit graph

2603 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
a792286161 Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more. 2014-04-11 22:30:28 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Nick Winter
b7f3d5310e #353 is fixed as far as I can tell; python3 and python2 both run setup. 2014-04-11 20:48:42 -07:00
Nick Winter
fc9d30ccae Smarter fix for #810, since not all 24-character strings are like MongoDB ids. 2014-04-11 20:38:34 -07:00
Nick Winter
137d2b0fd4 Fixed #419 to not redo node/mongo downloads when rerunning the script. 2014-04-11 20:37:06 -07:00
Nick Winter
8ea2a80088 Fixed #555. Fixed #350. 2014-04-11 19:58:52 -07:00
Nick Winter
99ead5d193 #223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff. 2014-04-11 19:51:20 -07:00
Nick Winter
dea1c7607a Horribly untested improvement for #555 which I will test momentarily. 2014-04-11 19:08:55 -07:00
Nick Winter
f0aa5e1d5e Fixed #681 by removing full-screen button in Safari. 2014-04-11 18:19:52 -07:00
Nick Winter
99b430c1b4 Fixed #714 with a hack. 2014-04-11 17:55:47 -07:00
Nick Winter
91c2f0fa33 Fixed #715, and some misc cleanup. 2014-04-11 17:36:15 -07:00
Michael Schmatz
7ddd84248b Simulator fixes! 
Fixed memory bug with aggregation framework
 2014-04-11 17:11:57 -07:00
Glen De Cauwsemaecker
7a866981f7 Merge https://github.com/codecombat/codecombat 2014-04-12 01:30:40 +02:00
Glen De Cauwsemaecker
e9715f078f Fixed merge conflicts for Jasper's commits. 2014-04-12 01:28:25 +02:00
Nick Winter
97d4017869 Hacky way to get play background to fit with new loading image. 2014-04-11 16:15:26 -07:00
Glen De Cauwsemaecker
795aae7bb7 new version number for the windows installer 2014-04-12 00:43:19 +02:00
Glen De Cauwsemaecker
8de39ad755 Merge https://github.com/codecombat/codecombat 2014-04-12 00:40:43 +02:00
Glen De Cauwsemaecker
6a995f5bae Finished Dutch translations for the Windows installer. 2014-04-12 00:40:38 +02:00
Scott Erickson
177dd2c8cd Set up Bootstrap 3 glyphicons. 2014-04-11 15:37:04 -07:00
Glen De Cauwsemaecker
3a97b258ec Merge branch 'i18n-wininstaller' of https://github.com/M-r-A/codecombat 2014-04-12 00:27:30 +02:00
Nick Winter
bbf26ecc9c Fixed lcoale line endings again. 2014-04-11 15:02:01 -07:00
Nick Winter
72d1a6fe5a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 14:59:19 -07:00
Nick Winter
1607790ea3 Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug. 2014-04-11 14:59:09 -07:00
George Saines
96f4f1a3d2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 14:51:25 -07:00
George Saines
722165b0ad adding ladder buttons and new load screen 2014-04-11 14:51:21 -07:00
Scott Erickson
bbb9fb7a64 Added a patches view. 2014-04-11 14:19:17 -07:00
Nick Winter
10bb17c38a Added getThangByID method to Thang. Handled a few error corner cases with the time popup. 2014-04-11 14:03:13 -07:00
Scott Erickson
cc0c588eb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:49:18 -07:00
Scott Erickson
ce84437345 Updated treema version. 2014-04-11 13:49:02 -07:00
Nick Winter
82b47f6c0f Added i18n for #809. 2014-04-11 13:37:39 -07:00
Nick Winter
b330e783bf Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons 2014-04-11 13:28:11 -07:00
Nick Winter
b2da399e29 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:20:14 -07:00
Nick Winter
5ccdf680db Updated all i18n tags. 2014-04-11 13:19:38 -07:00
Scott Erickson
0e26f317b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:18:28 -07:00
Scott Erickson
cce2fe3153 Removed an import that no longer exists. 2014-04-11 13:18:05 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Scott Erickson
d4abbd8ab3 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:54 -07:00
Scott Erickson
d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:29 -07:00
Alexei Nikitin
6d7a819def RU l10n for windows-script-installer 2014-04-11 23:24:25 +04:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Ruben Vereecken
a07457acac Finished minor refactorings 2014-04-11 20:09:50 +02:00
Ruben Vereecken
ba417630dc Validated Backbone Mediator is now a fully functioning bower component 2014-04-11 20:05:48 +02:00
Scott Erickson
2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:33:22 -07:00
Nick Winter
3751bf903e Merge pull request #806 from 1c7/master 
New features: chinese language version use Youku
 2014-04-11 10:33:10 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4 Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
Ruben Vereecken
f94dfeae6d Reached a steady state without bower component backbone mediator 2014-04-11 15:00:16 +02:00
Ruben Vereecken
fc8684967d Added initialization of the schema files 2014-04-11 14:37:08 +02:00
Ruben Vereecken
c2c0496883 Added schema stubs for about everything 2014-04-11 14:22:49 +02:00