Michael Schmatz
|
8604a0ed3c
|
Update rules about location restrictions
Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.
|
2014-05-22 10:34:46 -07:00 |
|
George Saines
|
a2fbe5865a
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-22 09:55:34 -07:00 |
|
George Saines
|
4ffbdf004c
|
modifying oreilly logo size
|
2014-05-22 09:55:30 -07:00 |
|
Michael Schmatz
|
7026d2036f
|
Merge pull request #1067 from codecombat/master
Fix random game results not being sent back
|
2014-05-22 09:03:46 -07:00 |
|
Michael Schmatz
|
8fabbadff3
|
Fix random game results not being sent back
|
2014-05-22 09:02:57 -07:00 |
|
Nick Winter
|
61fc5f5ff1
|
Merge branch 'master' into production
|
2014-05-21 21:56:32 -07:00 |
|
Nick Winter
|
48f5347075
|
Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.
|
2014-05-21 21:56:11 -07:00 |
|
Michael Schmatz
|
87909c34b8
|
Merge pull request #1065 from codecombat/master
No reset of scores when session resubmit
|
2014-05-21 16:59:11 -07:00 |
|
Michael Schmatz
|
482965fe0f
|
No reset of scores when session resubmit
|
2014-05-21 16:58:51 -07:00 |
|
Michael Schmatz
|
2d433cb2ad
|
Merge pull request #1064 from codecombat/master
Fix selection
|
2014-05-21 16:52:01 -07:00 |
|
Michael Schmatz
|
d59c163493
|
Fix selection
|
2014-05-21 16:51:10 -07:00 |
|
Michael Schmatz
|
21397564fe
|
Merge pull request #1063 from codecombat/master
Master into production
|
2014-05-21 15:35:49 -07:00 |
|
Michael Schmatz
|
7bc4a0451c
|
Weighted random selection of games
|
2014-05-21 15:34:19 -07:00 |
|
Nick Winter
|
4fc1341a64
|
Added a way to remove SuperModel resources to fix ladder tab refreshing.
|
2014-05-21 15:33:28 -07:00 |
|
Scott Erickson
|
037dbe97c6
|
Some remaining work to get the delayed show guide script set up.
|
2014-05-21 14:50:27 -07:00 |
|
Scott Erickson
|
4929f81fcc
|
Fixed the level editor preview window not loading on repeated opens.
|
2014-05-21 14:28:52 -07:00 |
|
Scott Erickson
|
18f694b010
|
Fixed up the level loader to include session objects as world necessities.
|
2014-05-21 12:53:28 -07:00 |
|
Scott Erickson
|
c43081636f
|
Fixed the facebook event schema.
|
2014-05-21 12:35:37 -07:00 |
|
Nick Winter
|
06866e48de
|
Merge pull request #1059 from rafagomes/patch-1
Updated some words and phrases
|
2014-05-21 11:27:54 -07:00 |
|
Nick Winter
|
3c9321afab
|
Merge pull request #1060 from domenukk/fixxss
+ more than one </script> tag in username no longer breaks the page, part 2
|
2014-05-21 11:18:06 -07:00 |
|
Dominik Maier
|
b95a475969
|
+ more than one </script> tag in username no longer breaks the page.
(aka. Javascript never ceases to surprise me)
|
2014-05-21 20:12:46 +02:00 |
|
Rafael Gomes
|
09db5cb9ee
|
Updated some words and phrases
Just a few words and phares until have more experience in the project.
|
2014-05-21 14:38:08 -03:00 |
|
Nick Winter
|
511dcef313
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-21 10:30:03 -07:00 |
|
Michael Schmatz
|
fc4047b429
|
Merge pull request #1058 from codecombat/master
More temp fixes for 422s
|
2014-05-21 10:29:56 -07:00 |
|
Michael Schmatz
|
585b907f4e
|
More temp fixes for 422s
|
2014-05-21 10:29:16 -07:00 |
|
Nick Winter
|
8fb1237810
|
Added noty error messages when unable to save CocoModels.
|
2014-05-21 10:27:47 -07:00 |
|
Jayant Jain
|
8f1f378bcb
|
Fixes issue with thang being added twice upon click
|
2014-05-21 10:27:47 -07:00 |
|
Jayant Jain
|
c05780de4c
|
Resolves #170, thang can be directly placed by dragging onto the map
|
2014-05-21 10:27:46 -07:00 |
|
Michael Schmatz
|
e7d1899910
|
Merge pull request #1057 from codecombat/master
Temp fix for occasional 422
|
2014-05-21 10:16:34 -07:00 |
|
Michael Schmatz
|
02f8458dfe
|
Temp fix for occasional 422
|
2014-05-21 10:16:01 -07:00 |
|
dpen2000
|
ce661a5493
|
Update simulate_tab.coffee
Add back in current user to nearby simulators
|
2014-05-21 15:06:52 +01:00 |
|
Burlutskiy Ivan
|
70403409f3
|
Update ru.coffee
reverted team translation by @M-r-A request.
|
2014-05-21 12:18:44 +04:00 |
|
Michael Schmatz
|
85c63fc1ca
|
Merge pull request #1050 from codecombat/master
Made backbone mediator validate only on development.
|
2014-05-20 15:59:53 -07:00 |
|
Scott Erickson
|
a8b54f3cdc
|
Made backbone mediator validate only on development.
|
2014-05-20 15:58:57 -07:00 |
|
Michael Schmatz
|
aecc88f32d
|
Merge pull request #1049 from codecombat/master
Master into production
|
2014-05-20 15:56:07 -07:00 |
|
Michael Schmatz
|
47c41e0a6e
|
Added error handling for findNearestBetterSessionID
|
2014-05-20 15:55:25 -07:00 |
|
Scott Erickson
|
a7f24ab04f
|
Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel.
|
2014-05-20 15:36:15 -07:00 |
|
Michael Schmatz
|
e9e36f8c7d
|
Merge pull request #1046 from codecombat/master
Master into production
|
2014-05-20 15:36:12 -07:00 |
|
Michael Schmatz
|
a6352c214a
|
Add temp error handling for updateSessions
|
2014-05-20 15:35:44 -07:00 |
|
Nick Winter
|
88ef5ffe93
|
Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L.
|
2014-05-20 15:24:57 -07:00 |
|
Michael Schmatz
|
f06b154fa1
|
Merge pull request #1045 from codecombat/master
Master into production
|
2014-05-20 15:14:26 -07:00 |
|
Michael Schmatz
|
de93dfd357
|
Stopgap measure for incorrectly formatted session results
|
2014-05-20 15:12:25 -07:00 |
|
Nick Winter
|
c712494d17
|
Merge branch 'gutierri-master'
|
2014-05-20 15:10:07 -07:00 |
|
Nick Winter
|
de9f1fab0d
|
Merged.
|
2014-05-20 15:09:48 -07:00 |
|
Michael Schmatz
|
c5e8c441cf
|
Merge pull request #1044 from codecombat/master
Revert "Stop sending out untranspiled code"
|
2014-05-20 14:59:43 -07:00 |
|
Michael Schmatz
|
6fde166190
|
Revert "Stop sending out untranspiled code"
This reverts commit f794ec4a46.
|
2014-05-20 14:59:06 -07:00 |
|
Michael Schmatz
|
14170b6412
|
Merge pull request #1043 from codecombat/master
Master into production
|
2014-05-20 14:33:56 -07:00 |
|
Michael Schmatz
|
f794ec4a46
|
Stop sending out untranspiled code
|
2014-05-20 14:33:01 -07:00 |
|
Burlutskiy Ivan
|
a8a50df025
|
Update ru.coffee
Fixed previous typos; uncommented translations.
|
2014-05-21 01:32:15 +04:00 |
|
Scott Erickson
|
70525ec57a
|
Fixed the music starting when you restart the level, even if music is off.
|
2014-05-20 13:43:52 -07:00 |
|