Glen De Cauwsemaecker
|
b95d7d4cb4
|
Fixed grammar error in files
|
2014-04-12 20:18:55 +02:00 |
|
Scott Erickson
|
00d3c48a0c
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-12 10:52:45 -07:00 |
|
Scott Erickson
|
94e75b852c
|
Removed a log.
|
2014-04-12 10:51:31 -07:00 |
|
Scott Erickson
|
30f785f7cf
|
Moved the model schemas into a models folder.
|
2014-04-12 10:51:02 -07:00 |
|
Scott Erickson
|
5a794306fe
|
Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas
|
2014-04-12 08:53:24 -07:00 |
|
Scott Erickson
|
775821feec
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-12 08:52:50 -07:00 |
|
Scott Erickson
|
6eab5003f8
|
Merge branch 'feature/jsondiffpatch'
|
2014-04-12 08:52:35 -07:00 |
|
Scott Erickson
|
10b1660419
|
Fixed the level editor so you can save again.
|
2014-04-12 08:48:49 -07:00 |
|
Glen De Cauwsemaecker
|
34c883b7df
|
Moved language selection to the top and starting localized the hardcoded stuff.
|
2014-04-12 16:55:59 +02:00 |
|
Aditya Raisinghani
|
3078036da1
|
Deleted updated schemas.
|
2014-04-12 15:33:57 +05:30 |
|
julycoolwind
|
9078061af2
|
Update zh-HANS.coffee
Translate items under editor.
|
2014-04-12 17:56:56 +08:00 |
|
Aditya Raisinghani
|
e04787475c
|
Rebased master to get updated schemas and added patch schema
|
2014-04-12 15:16:42 +05:30 |
|
Aditya Raisinghani
|
b932bf1e7c
|
Deleted schemas from /server and modified files to point to /app/schemas
|
2014-04-12 14:45:59 +05:30 |
|
Aditya Raisinghani
|
6fb5b59a01
|
Refactored schemas to be in /app
|
2014-04-12 14:33:55 +05:30 |
|
Nick Winter
|
059b5e9b66
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-11 23:08:26 -07:00 |
|
Nick Winter
|
a4284e6209
|
Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization.
|
2014-04-11 23:07:48 -07:00 |
|
Scott Erickson
|
35fe47bbac
|
Merge branch 'feature/jsondiffpatch'
|
2014-04-11 22:52:58 -07:00 |
|
Scott Erickson
|
53579b2632
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
|
2014-04-11 22:52:05 -07:00 |
|
Scott Erickson
|
308adec7c7
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
|
2014-04-11 22:52:00 -07:00 |
|
Scott Erickson
|
0eb74ab287
|
Added buttons for performing actions on patches.
|
2014-04-11 22:33:09 -07:00 |
|
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 |
|
Ting-Kuan
|
65a32a262d
|
Before change dependency without name.
|
2014-04-12 00:03:56 -04: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 |
|
Ting-Kuan
|
a6235842b6
|
Change populate model to accept resource name.
|
2014-04-11 22:35:20 -04: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
|
a56b1d6ade
|
Merge pull request #820 from codecombat/master
Master into production
|
2014-04-11 17:13:02 -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
|
29f5f1159c
|
Merge branch 'master' into production
|
2014-04-11 15:16:38 -07: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 |
|