Commit graph

1530 commits

Author SHA1 Message Date
iraladson
7885b21b4b Update names.coffee 2014-03-05 14:03:57 -06:00
Nick Winter
5ec06159a6 Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging. 2014-03-05 12:00:29 -08:00
Nick Winter
17543e7021 Merge pull request #476 from Darredevil/patch-3
Update ro
2014-03-05 11:44:03 -08:00
Darredevil
ea98a9917d Update ro 2014-03-05 20:40:14 +02:00
Scott Erickson
0a8d5b5b97 Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master 2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782 further changes in design of highlighting lines in code 2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a Moved 'skip tutorial' text to locales. 2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3 new UI design for executing and executed lines in ACE editor 2014-03-05 02:00:38 +01:00
Scott Erickson
03b60838b6 Merge remote-tracking branch 'origin/master' 2014-03-04 12:21:07 -08:00
Scott Erickson
9726840d8a Trying to handle a case where a user did not have their user account created. 2014-03-04 12:21:02 -08:00
Scott Erickson
3680d628e7 Fixed showing generic errors. 2014-03-04 12:06:31 -08:00
Nick Winter
567bbcb0b9 Merge pull request #474 from Darredevil/patch-2
Update for ro.coffee
2014-03-04 11:32:29 -08:00
Darredevil
e02780e441 Update for ro.coffee
-first 80 lines done
2014-03-04 21:26:52 +02:00
Nick Winter
1532396ceb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 11:15:35 -08:00
Nick Winter
4556536df4 Hooked up new HUD icons. 2014-03-04 11:15:31 -08:00
Nick Winter
378d928f1a Merge pull request #473 from Leventhan/more-thang-names
Added even more names for #53
2014-03-04 11:11:23 -08:00
Yos Riady
195b1941ea Added even more names for #53 2014-03-05 02:53:54 +08:00
George Saines
3ea4439fc1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 10:24:23 -08:00
Nick Winter
2f653c966e Simulator now swaps in empty methods when code doesn't compile. 2014-03-04 08:30:50 -08:00
Ruben Vereecken
d43ff5d217 Added an anonymous check on the Fork button 2014-03-04 11:24:38 +01:00
Nick Winter
ebf6adb596 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:51:05 -08:00
Nick Winter
9aa1d5a26c Okay, we'll just let Cloudflare compress things. 2014-03-03 18:50:59 -08:00
George Saines
33e2571934 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:04:01 -08:00
George Saines
113c71e141 adding new hud icons 2014-03-03 18:03:54 -08:00
Scott Erickson
1f091b93b8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 17:15:54 -08:00
Scott Erickson
246bbefc91 Made the file uploading just overwrite files with the same name. 2014-03-03 17:14:13 -08:00
Scott Erickson
881ec1a4b3 Added a fix for files with spaces. 2014-03-03 17:03:02 -08:00
Nick Winter
65d9186ef1 Fixed actions showing up under dialogue bubbles on repeated toggling. 2014-03-03 16:55:36 -08:00
Scott Erickson
1b257252f9 Merge branch 'production' 2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47 HUD properties now flow into columns more evenly, have max styling. 2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661 Reworked the victory modal styling a bit. 2014-03-03 16:39:56 -08:00
Nick Winter
873c560a06 Added Alexandru's Bubble Sort Bootcamp Battle to /play. 2014-03-03 16:22:50 -08:00
Nick Winter
df95e8c784 Experimenting with using compress() in production. 2014-03-03 16:19:35 -08:00
Nick Winter
c944e78271 Ladder views now show level descvription content if present. 2014-03-03 14:59:39 -08:00
Scott Erickson
e231952fcf Added the jquery minicolors image. 2014-03-03 14:17:36 -08:00
Ruben Vereecken
b7fbf67e89 Enabled Fork button again. Previous commits solve issue #455 2014-03-03 22:52:37 +01:00
Scott Erickson
9dc1a8c4a9 Merge branch 'master' into production 2014-03-03 13:22:40 -08:00
Ruben Vereecken
0aa8e7bb7d Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet 2014-03-03 22:21:56 +01:00
Scott Erickson
d66a9d6be0 Set up a generic choose tab for root views so hash->tab behavior is baked in. 2014-03-03 13:21:05 -08:00
Nick Winter
461d66c795 Typo in my matches team ranking. 2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b Multiplied visible scores by 100 for more awesome. 2014-03-03 12:27:32 -08:00
Nick Winter
0ad11fa7ef Merge branch 'master' into production 2014-03-03 12:22:48 -08:00
Ruben Vereecken
05b4f536c1 Fixed a link to point correctly 2014-03-03 21:22:04 +01:00
Nick Winter
0c45b6c0e3 Fixes for ladder refreshing. 2014-03-03 12:21:59 -08:00
Ruben Vereecken
ee920afea9 Disabled buttons for non-owners in Article Editor 2014-03-03 21:13:02 +01:00
Michael Schmatz
a5864c4f0c Live leaderboard updating 2014-03-03 12:10:27 -08:00
Scott Erickson
1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
2014-03-03 12:08:11 -08:00
Scott Erickson
4ef9280a46 Merge remote-tracking branch 'origin/master'
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
2014-03-03 12:07:57 -08:00
Scott Erickson
fb75ad36e7 Added team icons to the ladder play view. 2014-03-03 12:04:31 -08:00