Nick Winter
|
e2e7b876a4
|
Merge branch 'master' into production
|
2014-03-11 19:41:31 -07:00 |
|
Nick Winter
|
b7ae1f7e25
|
The sessions should set isRanking false when they win.
|
2014-03-11 19:40:22 -07:00 |
|
Nick Winter
|
b560827e32
|
Working on cleaning up some server errors.
|
2014-03-11 19:17:58 -07:00 |
|
Darredevil
|
cd4fa9b8c2
|
Merge pull request #1 from codecombat/master
test request
|
2014-03-12 03:53:44 +02:00 |
|
Nick Winter
|
2b487eeed8
|
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
|
2014-03-11 18:30:25 -07:00 |
|
Nick Winter
|
3f9de34ec7
|
Merge branch 'master' into production
|
2014-03-11 18:16:47 -07:00 |
|
Nick Winter
|
4f9db0a7f7
|
Merged in all names.
|
2014-03-11 18:11:48 -07:00 |
|
Nick Winter
|
ce895ffd75
|
Merge pull request #524 from Darredevil/master
Added GetALLToLocations and KeepALLFromLocations
|
2014-03-11 18:09:50 -07:00 |
|
Nick Winter
|
40ea643f67
|
Merge pull request #523 from dkundel/master
Avoid flickering of editor when executing the script.
|
2014-03-11 18:07:17 -07:00 |
|
Nick Winter
|
8d718a4b16
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 18:06:52 -07:00 |
|
Nick Winter
|
8c57b31c54
|
Fixed a couple bugs with the matches tab.
|
2014-03-11 18:06:48 -07:00 |
|
Darredevil
|
07ab1a5b32
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-12 02:52:26 +02:00 |
|
Dominik Kundel
|
c7ca878c69
|
added class property that got missing
|
2014-03-12 01:26:11 +01:00 |
|
Michael Schmatz
|
8eb5f1b830
|
Merge pull request #517 from Darredevil/patch-10
Update ro.coffee
|
2014-03-11 17:26:05 -07:00 |
|
Darredevil
|
fb1e653d17
|
Merge pull request #2 from Darredevil/patch-8
Added descripton
|
2014-03-12 02:20:42 +02:00 |
|
Darredevil
|
a6c508a442
|
Added descripton
|
2014-03-12 02:20:28 +02:00 |
|
Darredevil
|
b1d61d3681
|
Added GetALLToLocations and KeepALLFromLocations schemas
|
2014-03-12 02:11:22 +02:00 |
|
Darredevil
|
012c25a817
|
Added GetALLToLocations and KeepALLFromLocations
|
2014-03-12 01:57:30 +02:00 |
|
Alexandru
|
5f2587da18
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-12 01:38:54 +02:00 |
|
Nick Winter
|
392534878a
|
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
|
2014-03-11 16:31:39 -07:00 |
|
Alexandru
|
4552455284
|
Merge branch 'master' of https://github.com/Darredevil/codecombat
|
2014-03-12 01:23:55 +02:00 |
|
Scott Erickson
|
eeff462051
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 16:23:20 -07:00 |
|
Scott Erickson
|
da58b68fa0
|
Fixed a bug with the music player where sometimes it wouldn't loop.
|
2014-03-11 16:23:04 -07:00 |
|
Dominik Kundel
|
714c6ddf9b
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-11 23:50:51 +01:00 |
|
Dominik Kundel
|
4c7da1ea69
|
update Gutter only if changed
|
2014-03-11 23:47:27 +01:00 |
|
Nick Winter
|
852b1c97ac
|
Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.
|
2014-03-11 13:59:12 -07:00 |
|
Nick Winter
|
bba3c78107
|
Ties are not victories in the emails.
|
2014-03-11 13:20:52 -07:00 |
|
Michael Schmatz
|
4062bba245
|
Created initial spectate level view
|
2014-03-11 13:12:45 -07:00 |
|
Ruben Vereecken
|
8709cdc472
|
Finished Article History
|
2014-03-11 19:33:27 +01:00 |
|
Nick Winter
|
d012e0d7a9
|
Merge pull request #508 from Rahazan/patch-2
Update Dutch Translations
|
2014-03-11 09:46:18 -07:00 |
|
Sam Epps
|
11ca60765d
|
Added some additional names to names.coffee
|
2014-03-11 17:16:09 +01:00 |
|
Nick Winter
|
3576805145
|
Merge branch 'master' into production
|
2014-03-10 22:05:23 -07:00 |
|
Nick Winter
|
eac219a2be
|
Inserted score history graph into ladder update emails.
|
2014-03-10 22:03:33 -07:00 |
|
Nick Winter
|
32baf2ae79
|
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
|
2014-03-10 21:30:46 -07:00 |
|
Nick Winter
|
c393ecd51a
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-10 20:22:31 -07:00 |
|
Nick Winter
|
6ce65488aa
|
Added simple rank history graph. Improving ladder update mail.
|
2014-03-10 20:22:25 -07:00 |
|
Darredevil
|
97633dec26
|
Update ro.coffee
Getting there...
Please suggest alternatives for lines 297 and 331
|
2014-03-11 04:24:11 +02:00 |
|
Michael Schmatz
|
93d0e293cd
|
Merge pull request #509 from Darredevil/patch-7
Update ro.coffee
|
2014-03-10 16:17:39 -07:00 |
|
Darredevil
|
6b48577e56
|
Update ro.coffee
|
2014-03-11 01:03:20 +02:00 |
|
Ruben Vereecken
|
af73e5a594
|
Added a versions modal for every type
|
2014-03-10 23:29:34 +01:00 |
|
Ruben Vereecken
|
8e989ec08f
|
Got the level history view set up as before, but better
|
2014-03-10 23:17:19 +01:00 |
|
Michael Schmatz
|
c88c973fa7
|
Added 2.6.0-rc1 to allowed Mongo versions
|
2014-03-10 14:18:34 -07:00 |
|
Nick Winter
|
c4a3b71786
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 13:57:51 -07:00 |
|
Tigrowski
|
a5edfbcaa7
|
Update pl.coffee
|
2014-03-10 21:57:16 +01:00 |
|
Tigrowski
|
50469a8ae4
|
Update pl.coffee
|
2014-03-10 21:40:53 +01:00 |
|
Michael Schmatz
|
09e2ed3089
|
Merge pull request #514 from codecombat/master
Merge database/ladder fixes into production
|
2014-03-10 13:21:35 -07:00 |
|
Nick Winter
|
93028483b9
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-10 13:20:10 -07:00 |
|
Nick Winter
|
6055512ac7
|
Working on ladder updates.
|
2014-03-10 13:20:00 -07:00 |
|
Michael Schmatz
|
d4abad88a2
|
Removed leaderboard mongo sort
|
2014-03-10 12:57:27 -07:00 |
|
Ruben Vereecken
|
68b10d9023
|
History now shows a loading bar upon opening
|
2014-03-10 20:06:36 +01:00 |
|