Commit graph

5407 commits

Author SHA1 Message Date
Ruben Vereecken
8e82702348 Fixed an async case that failed a test only sometimes 2014-07-13 21:32:25 +02: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
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02: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
Scott Erickson
843ed97643 Another fix for mongoose i18n locale object hack. 2014-07-13 10:05:58 -07:00
Nick Winter
868a6ed43b Fixed a couple i18n issues. Fixed #1302. 2014-07-13 09:31:56 -07:00
Nick Winter
49e6ed13ba Fixed LatestVersionReferenceNode's collection initialization. 2014-07-13 09:11:06 -07:00
Nick Winter
373c1688ed Merge pull request #1287 from rubenvereecken/user_patch
Noty errors don't show up on user save fails anymore
2014-07-13 08:54:20 -07:00
Ruben Vereecken
605bf85729 Signup form now has an optional name field 2014-07-13 17:47:08 +02:00
Ruben Vereecken
0be03aa1fe Refactored conflicted name checking so it can be used in more places 2014-07-13 17:47:08 +02:00
Ruben Vereecken
252edef9e5 Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all. 2014-07-13 17:47:08 +02:00
Ruben Vereecken
c3427bc200 User Settings is now without auto-save 2014-07-13 17:47:08 +02:00
Ruben Vereecken
a9074ce603 anonymous users are now warned if their new name is already chosen 2014-07-13 17:47:07 +02:00
Ruben Vereecken
1a587b607f GET /auth/name/<name> now serves possible free names 2014-07-13 17:47:07 +02:00
Nick Winter
8a7e7e82a0 Let's try a heads-up whenever there's a JS error. 2014-07-13 08:37:39 -07:00
Nick Winter
bbc1228c9c Merge pull request #1307 from kumabotz/minor-cleanup
Remove extra require and minor cleanup
2014-07-13 08:25:16 -07:00
Tery Lim
bc3b0645ea Remove extra require and minor cleanup 2014-07-13 23:18:55 +08:00
Nick Winter
83248f039c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-13 07:52:35 -07:00
Nick Winter
39f6874682 Merge pull request #1304 from Imperadeiro98/master
Update pt-PT.coffee
2014-07-13 07:48:42 -07:00
Dmitry
b1aa0a1973 update ru.coffee 2014-07-13 15:33:50 +04:00
Maryann Vellanikaran
f9c92d2731 Add space before "Contribute"
Before: http://cl.ly/image/0p1f1P1D0P2d
After: http://cl.ly/image/3a0x12070C28
2014-07-12 15:45:53 -07:00
Nick Winter
d48f5256a7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-12 10:19:19 -07:00
Scott Erickson
57a2ce8306 Merge branch 'master' into production 2014-07-12 10:17:54 -07:00
Scott Erickson
f4b22fedc9 Tweaking the visuals for the i18n treema node to mostly ignore the property required to get around mongoose not handling empty objects. 2014-07-12 09:58:28 -07:00
Scott Erickson
8cb7cd770c Fixed i18n population because mongoose has problems with empty objects. 2014-07-12 09:58:28 -07:00
Jeff Hemphill
a8d369ed1a Add schemas for tome subscriptions 2014-07-12 01:55:35 -07:00
Imperadeiro98
178e147565 Update pt-PT.coffee 2014-07-12 08:54:16 +01:00
Nick Winter
89dc724d31 Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay
Centered CoordinateDisplay background and label
2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5 Centered CoordinateDisplay background and label 2014-07-11 22:10:13 -04:00
Nick Winter
c62f5f3fa0 Skipping docs for language-inappropriate entries in spell palette. 2014-07-11 18:42:55 -07:00
Nick Winter
f13f0ddfef Merge pull request #1296 from dreamist/patch-1
Update th.coffee
2014-07-11 18:11:57 -07:00
Nick Winter
81dde109e5 Merge branch 'master' into production 2014-07-11 18:10:12 -07:00
Nick Winter
17ba4bc8a7 Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter. 2014-07-11 18:07:00 -07:00
Nick Winter
788562f2ea Merge pull request #1295 from Imperadeiro98/master
Updated some strings
2014-07-11 14:28:29 -07:00
Michael Schmatz
fede037e89 Fixed time NaN 2014-07-11 13:55:31 -07:00
dreamist
ca78638a21 Update th.coffee
One fix and a few more translations
2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea Update pt-PT.coffee 2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349 Update pt-PT.coffee 2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489 Fixed a issue with headers
There was a issue with the headers that is now corrected.
2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f Update pt-PT.coffee 2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567 Update pt-PT.coffee 2014-07-11 15:17:16 +01:00
Nick Winter
8b92b08448 Merge branch 'master' into production 2014-07-10 19:30:54 -07:00
Nick Winter
65e39ad4e3 Propagated i18n updates. 2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Nick Winter
3d5cd29519 Removed some logging. 2014-07-10 17:35:59 -07:00