Michael Schmatz
aaf9bf1253
Merge pull request #1323 from codecombat/master
...
Master into production
2014-07-14 11:15:31 -07:00
Michael Schmatz
787920edc6
Update bower to fix tmp module issue
2014-07-14 11:10:14 -07:00
Ruben Vereecken
e748417007
GET /auth/name/<name> now serves possible free names
...
anonymous users are now warned if their new name is already chosen
User Settings is now without auto-save
Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.
Refactored conflicted name checking so it can be used in more places
Signup form now has an optional name field
Covered extra case where the debounced check happened too late. Support for submitting on enter.
Worked in scott's comments and got tests working again
2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9
Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.
2014-07-14 11:05:59 -07:00
Scott Erickson
ef30f6f477
Merge branch 'rubenvereecken-master'
2014-07-14 10:36:25 -07:00
Scott Erickson
8fb26ce8fb
Fixed a server error caused by the recent removal of trailing slashes on urls I think.
2014-07-14 10:11:49 -07:00
Scott Erickson
9893f39ad1
Handling merge conflict.
2014-07-14 10:04:07 -07:00
Ruben Vereecken
ae4a5eb460
Deduplicated bootstrap include
2014-07-14 18:52:23 +02:00
Nick Winter
7446c9ee08
Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.
2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2
Don't ask for team again if we already have a child window.
2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00
Merge branch 'jayant1992-master'
2014-07-14 07:33:59 -07:00
Nick Winter
6486f8042a
Merge branch 'kinez-patch-13'
2014-07-14 07:30:23 -07:00
Nick Winter
42cf0b5cce
Added missing starting quote.
2014-07-14 07:30:18 -07:00
Nick Winter
d27dbdddbb
Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13
2014-07-14 07:29:47 -07:00
Nick Winter
0e273d7e38
Merge pull request #1320 from kumabotz/better-spacing
...
Use spl (space left) util instead of trailing space for spacing
2014-07-14 07:28:50 -07:00
Tery Lim
0f4a7df982
Use spl instead of trailing space for spacing
2014-07-14 13:56:27 +08:00
Inez KEMENES
ca3a2b620b
Update hu.coffee
...
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
2014-07-14 07:22:19 +02:00
Nick Winter
d84aae4331
Merge branch 'master' into production
2014-07-13 20:20:21 -07:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed
Less geometric random borders for the terrain generator
2014-07-14 08:11:33 +05:30
Nick Winter
bd47b3bc83
Fixed #1210 based on #1313 .
2014-07-13 18:53:01 -07:00
Nick Winter
1d9afbabd2
Fixes for duplicate Thang IDs and reverting randomized Thangs.
2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4
Merge branch 'master' of git://github.com/jayant1992/codecombat
2014-07-13 18:21:27 -07:00
Nick Winter
5121eedfb3
Merge branch 'rubenvereecken-remove_trailing_slashes'
2014-07-13 17:34:58 -07:00
Nick Winter
b1b9f87ebe
Fixed root test view URL to not need the trailing slash.
2014-07-13 17:34:51 -07:00
Nick Winter
709e2da477
Merge branch 'remove_trailing_slashes' of git://github.com/rubenvereecken/codecombat into rubenvereecken-remove_trailing_slashes
2014-07-13 17:31:23 -07:00
Jayant Jain
493ebd07e6
Changes randomise to randomize
2014-07-14 06:01:09 +05:30
Nick Winter
f92b29a4a3
Added rotate to Vector APIs.
2014-07-13 17:25:24 -07:00
Michael Schmatz
2a5a366c12
Made language selection in opponent modal
2014-07-13 17:22:06 -07:00
Nick Winter
daff7a2640
Merge pull request #1314 from TheSecretSquad/issue#1213
...
Added point marker shape, and split updateSize method into helpers.
2014-07-13 17:08:11 -07:00
Nick Winter
a076822a08
Merge pull request #1306 from kerradus/master
...
update ru.coffee
2014-07-13 17:07:45 -07:00
Nick Winter
01fdc5b520
Merge pull request #1311 from rubenvereecken/pretty_wizard_modal
...
Bootstrappified Wizard Settings modal
2014-07-13 17:07:07 -07:00
Nick Winter
cfd88dc187
Merge branch 'master' into production
2014-07-13 16:40:11 -07:00
Nick Winter
6eea28dc19
Error handling for syntax errors in component code.
2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e
Added point marker shape, and split updateSize method into helpers.
2014-07-13 19:31:34 -04:00
Nick Winter
6dc2a48b75
Tracking time spent reading initial guides.
2014-07-13 16:07:15 -07:00
Ruben Vereecken
bd7c2d0d36
Bootstrappified Wizard Settings modal
2014-07-14 00:25:24 +02:00
Scott Erickson
ebfb329da7
Fixed a bug where pressing escape would not properly end scripts in the session state.
2014-07-13 13:11:45 -07:00
Jayant Jain
deecd7d2ff
Deletes previously randomised thangs when generating again
2014-07-14 01:34:32 +05:30
Jayant Jain
b934d22cbd
Batches insertion of thangs to treema to speed up terrain generation
2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd
Moves randomise modal template and view to editor/level/modal
2014-07-14 01:34:32 +05:30
Jayant Jain
be223197df
Updates i18n tags and en.coffee
2014-07-14 01:33:45 +05:30
Scott Erickson
9652f070c3
Merge branch 'jthemphill-mediator-schema'
2014-07-13 12:56:52 -07:00
Scott Erickson
667ea14442
Merge branch 'mediator-schema' of https://github.com/jthemphill/codecombat into jthemphill-mediator-schema
2014-07-13 12:20:11 -07:00
Scott Erickson
3b6d17286b
Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.
2014-07-13 12:19:51 -07:00
Dmitry
e60832bcfa
Update ru.coffee
...
some fixes
2014-07-13 23:13:42 +04:00
Darredevil
9f76745fc2
Merge pull request #7 from codecombat/master
...
update
2014-07-13 22:10:30 +03:00
Nick Winter
202a562c51
Merge pull request #1303 from maryannv/patch-1
...
Add space before "Contribute"
2014-07-13 12:08:27 -07:00
Ruben Vereecken
3d510b98d6
Express now removes all trailing slashes.
2014-07-13 20:49:13 +02:00
Ruben Vereecken
b392b81b55
Covered extra case where the debounced check happened too late. Support for submitting on enter.
2014-07-13 20:26:46 +02:00
