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 |
|
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 |
|
Scott Erickson
|
476d153717
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-16 08:07:54 -07: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 |
|
Nick Winter
|
329a788698
|
Merge branch 'master' into production
|
2014-04-15 12:09:51 -07:00 |
|
Nick Winter
|
e49344bd87
|
A few job profile fixes and cleanup.
|
2014-04-15 10:45:54 -07:00 |
|
Nick Winter
|
fcb1341295
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-15 09:28:23 -07:00 |
|
Nick Winter
|
9194f842e6
|
Added some job description fields.
|
2014-04-15 09:28:19 -07:00 |
|
Scott Erickson
|
b59e974a2e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-15 09:02:03 -07:00 |
|
Scott Erickson
|
06a61d214e
|
Fixed server tests.
|
2014-04-15 09:01:51 -07:00 |
|
Nick Winter
|
2859db4279
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-15 08:39:22 -07:00 |
|
Nick Winter
|
03df078d5a
|
Couple job profile fixes.
|
2014-04-15 08:39:18 -07:00 |
|
Scott Erickson
|
d65498998d
|
Merge pull request #851 from JasperDhaene/master
Added some schemas
|
2014-04-15 08:18:03 -07:00 |
|
Inez KEMENES
|
844643454d
|
Update hu.coffee
|
2014-04-15 17:03:17 +02:00 |
|
JasperDhaene
|
6d35712424
|
Merge pull request #1 from JasperDhaene/schemas
Added some schemas
|
2014-04-15 11:23:10 +02:00 |
|