Nick Winter
e64796bba6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 16:53:05 -08:00
Nick Winter
01845a0175
Some translations weren't done yet.
2014-02-27 16:52:58 -08:00
Scott Erickson
04a0337b92
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 16:44:54 -08:00
Scott Erickson
df196cc531
Modals now stop the level from starting until they close.
2014-02-27 16:44:11 -08:00
Nick Winter
de4c9cb60d
Merge pull request #436 from M-r-A/master
...
Fix link in legal.jade
2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc
Fix link in legal.jade
2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9
Added an async name checker for the wizard settings modal.
2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 14:08:04 -08:00
Scott Erickson
d5fce3ee99
Added a handler for fetching a user id given a name.
2014-02-27 14:07:11 -08:00
Scott Erickson
02cb9155c0
Improved a bunch of things with the wizard settings view.
2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39
Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu
...
Changed English(Au) in two wrong places to Luthanian and Norwegian
Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa
Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess
Update not_found.jade
A couple tweaks to gokul1794's commits.
2014-02-27 12:07:57 -08:00
Scott Erickson
f991bc3a58
Removed some vestigial wizard coloring code from the settings account view.
2014-02-27 12:02:08 -08:00
Nick Winter
6c2d4fac7d
Noticed a tab and converted to spaces.
2014-02-27 11:58:45 -08:00
Nick Winter
6075f4cbe7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 11:58:22 -08:00
Nick Winter
794cdf78b0
Merge pull request #432 from Akhil-T/master
...
Fix for "Type str doesn't support the buffer API"
2014-02-27 11:57:35 -08:00
Nick Winter
7453ada074
Uncommented some translations that were added.
2014-02-27 11:57:23 -08:00
Nick Winter
ffbef0de5b
Merge pull request #428 from Darredevil/patch-1
...
Added more names for #53
2014-02-27 11:50:59 -08:00
Nick Winter
33ff7a48aa
Merge pull request #426 from M-r-A/patch-1
...
Update ru.coffee
2014-02-27 11:08:39 -08:00
Nick Winter
190ab6e792
Merge pull request #417 from Vic020/patch-1
...
Update zh-HANS.coffee
2014-02-27 11:08:10 -08:00
Michael Schmatz
5d2c430779
Merge pull request #435 from yangshun/editor-modal-input-focus
...
Auto-focus on the modal's input field for creation of new entities in editor.
2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e
Re-added submit form event
2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77
Merge pull request #434 from yangshun/play-button
...
Deferred saving of latest level
2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f
Merge pull request #427 from yangshun/music-button
...
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950
Added newline to end of file.
2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2
Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379
2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204
Merge branch 'master' into play-button
2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1
Trigger storage of latest level only after the level is guaranteed to be able to load
2014-02-27 14:08:25 +08:00
Akhil Thampy
673b5ff04e
Fix for "Type str doesn't support the buffer API"
...
subprocess.check_output("mongod --version",shell=True) returns a byte
string so to convert it to a regular string we should do this :
mongo_version_string = subprocess.check_output("mongod
--version",shell=True)
mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
2014-02-26 23:15:04 -06:00
Akhil-T
312d880508
Merge pull request #1 from codecombat/master
...
Fixes error "Type str doesn't support the buffer API"
2014-02-26 23:01:07 -06:00
Scott Erickson
8d828939b6
Fixed a bug where the jingle wouldn't play during level loading if the audio had been loaded previously.
2014-02-26 20:23:13 -08:00
Scott Erickson
74186b7772
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60
Fixed uploading images for articles.
2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9
Home button on ladder level goes to ladder.
2014-02-26 18:58:25 -08:00
Scott Erickson
4e8c0b65e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 18:49:43 -08:00
Scott Erickson
7052b0600b
Made mouse dragging not interrupt selecting units so much.
2014-02-26 18:42:39 -08:00
Nick Winter
48122000ed
Gold shows up as an int in the HUD now.
2014-02-26 18:09:09 -08:00
Nick Winter
5c1c17c8dd
Green Guide button for attention.
2014-02-26 17:52:08 -08:00
Nick Winter
99e1f6290b
Merge branch 'master' into production
2014-02-26 17:45:23 -08:00
Nick Winter
081274579b
Forget old goals.
2014-02-26 17:45:08 -08:00
Michael Schmatz
f82483b905
Changed session scheduling
2014-02-26 17:31:01 -08:00
Nick Winter
0cf20b577d
Added a delay to the property documentation on spell debug hover.
2014-02-26 17:23:59 -08:00
Nick Winter
172242d226
Re-denormalize session if things have changed. Removed some logs.
2014-02-26 17:06:21 -08:00
M-r-A
1c675ea2e2
Update ru.coffee
2014-02-26 16:40:51 -08:00
Scott Erickson
0fd1c03b7f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 15:56:25 -08:00
Scott Erickson
c86feb13e8
Fixed the region and point choosers for the level editor.
2014-02-26 15:56:05 -08:00
Scott Erickson
ea73d91a6b
Made the docs modal larger.
2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95
Implemented espionage mode
2014-02-26 14:14:43 -08:00
Darredevil
55ab142d75
Added more names for #53
2014-02-26 23:21:03 +02:00
Michael Schmatz
a052180250
Improved match scheduling
2014-02-26 12:14:02 -08:00
M-r-A
1a7e1f2384
Update ru.coffee
2014-02-26 10:56:40 -08:00