codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3410 commits 27 branches 0 tags 134 MiB
Commit graph

3410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
8f4535853b Fixed the component history button. 2014-04-17 11:29:12 -07:00
Scott Erickson
6057bd94b9 Refactored how the editor sets up its special nav through base.jade. 2014-04-17 11:27:20 -07:00
Scott Erickson
4c1143f026 Tweaked the versions history modal. 2014-04-17 11:22:33 -07:00
Scott Erickson
8a2b762446 Fixed a bug where opening a modal by data attributes would sometimes open it multiple times. 2014-04-17 11:12:09 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Nick Winter
40367e701c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-17 10:12:26 -07:00
Nick Winter
eec1888b22 gzipping when in production but not going through Cloudflare. 2014-04-17 10:12:23 -07:00
Ting-Kuan
360e594f3d Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views 
Conflicts:
	server/commons/Handler.coffee
 2014-04-17 12:58:29 -04:00
Ting-Kuan
070e354eee Handler for test. 2014-04-17 12:56:21 -04:00
ONion
498bb21280 Update zh-HANS.coffee 
more translation
 2014-04-17 13:27:43 +08:00
ONion
8724e23f1b Update zh-HANS.coffee 
add punctuation
 2014-04-17 12:57:44 +08:00
ONion
cf9cd1a228 Update zh-HANS.coffee 
Translate some
 2014-04-17 12:55:58 +08:00
Nick Winter
8577218fa7 Merge pull request #860 from dpen2000/FixLeaderboards 
Fix players above the current player coming out in wrong order
 2014-04-16 15:33:09 -07:00
dpen2000
a6ed7c9bff Fix players above the current player coming out in wrong order in original and simulators leaderboard 2014-04-16 18:20:59 -04:00
Michael Schmatz
e764277874 Merge pull request #850 from dpen2000/MoreSimulatorsLeaderboardImprovements2 
Implement rank column in simulators leaderboard
 2014-04-16 13:26:42 -07:00
Nick Winter
f95d814e90 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 12:57:31 -07:00
Nick Winter
f6242bbbac Fixed case on de-CH.coffee. 2014-04-16 12:28:39 -07:00
Nick Winter
1a4274a6db Broken German up into multiple country-specific Germans. 2014-04-16 12:28:15 -07:00
Glen De Cauwsemaecker
0bf4c81c91 Merge branch 'enGB' of https://github.com/edtrist/codecombat 2014-04-16 20:11:03 +02:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Nick Winter
cc9e200db8 Merge branch 'patch-2' of git://github.com/npani13/codecombat into npani13-patch-2 2014-04-16 11:01:28 -07:00
Nick Winter
d65699736f Fixed accidental hu.coffee truncation from #833. 2014-04-16 10:58:27 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
edtrist
0047835021 Added some specific en-GB spellings 2014-04-16 18:42:37 +01:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
Scott Erickson
9ed876d12a Some bug fixes to get Anya import to work. 2014-04-16 09:25:34 -07:00
dpen2000
62e2de6cee Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now 2014-04-16 17:07:25 +01:00
Scott Erickson
b9a978dd13 Fixed the colors tab view. 2014-04-16 08:44:04 -07:00
Scott Erickson
d5b0a83186 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 08:40:11 -07:00
Scott Erickson
bf7117d1c6 Merge pull request #854 from dpen2000/ShadowsIssue 
Fix #736 Invisible thangs still have shadows
 2014-04-16 08:38:59 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Scott Erickson
476d153717 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 08:07:54 -07:00
Scott Erickson
995b163442 Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views 2014-04-16 08:04:22 -07:00
Scott Erickson
25f72a58e6 Added a line for testing the loading system. 2014-04-16 08:03:50 -07:00
Scott Erickson
94c4179417 Fixed some things that were keeping brunch from working. 2014-04-16 08:03:41 -07:00
Ting-Kuan
c53eb562a3 Remove debug msg. 2014-04-16 02:31:18 -04:00
Ting-Kuan
52a73ceae3 Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
Nick Winter
9f5eae8898 Merge pull request #855 from edtrist/FixConsoleWarn 
Fix console.warning bug that prevents page from loading
 2014-04-15 19:43:49 -07:00
edtrist
5aa1afbf7a Fix console.warning bug that prevents page from loading 2014-04-16 00:03:43 +01:00
dpen2000
eae2ba6913 Fix #736 Invisible thangs still have shadows 2014-04-15 18:32:29 -04:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
dpen2000
a74f89c30c Implement rank column in simulators leaderboard 2014-04-15 23:13:10 +01:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Glen De Cauwsemaecker
868dce91fa Merge branch 'patch-4' of https://github.com/kinez/codecombat 2014-04-16 01:47:16 +02:00
Scott Erickson
e06c3dbb0b Fixed the thangs tab view preventing the new patches view from handling clicks correctly. 2014-04-15 13:21:33 -07:00
Scott Erickson
1efabc3738 Fixed the fix. 2014-04-15 12:31:35 -07:00
Scott Erickson
69fba34f64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-15 12:27:46 -07:00
Scott Erickson
b238ccaf27 Fixed the context-menu preventer in the level editor. 2014-04-15 12:27:35 -07:00
Scott Erickson
bb53e963b6 Removed a hack no longer needed. 2014-04-15 12:27:11 -07:00