codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2542 commits 27 branches 0 tags 134 MiB
Commit graph

2542 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
JasperDhaene
6d35712424 Merge pull request #1 from JasperDhaene/schemas 
Added some schemas
 2014-04-15 11:23:10 +02:00
Nick Winter
04014ef2d7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 16:34:18 -07:00
Glen De Cauwsemaecker
a9806a6fa3 Added m website url to the about page 2014-04-15 03:12:54 +02:00
Glen De Cauwsemaecker
1354bc3d59 Merge https://github.com/codecombat/codecombat 2014-04-15 02:05:38 +02:00
Glen De Cauwsemaecker
891cf74a8a Resolved merge conflicts of Jasper's translations 2014-04-15 02:04:52 +02:00
Nick Winter
1239617bd4 Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp. 2014-04-14 16:34:11 -07:00
Nick Winter
954afad3f0 Fixed bug with job profile approval locale string tag. 2014-04-14 15:32:57 -07:00
Nick Winter
89ec5c900b Trying synchronous spritesheet building during level loading for speed. 2014-04-14 14:50:25 -07:00
Nick Winter
2b7e629c7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 14:49:42 -07:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
Michael Schmatz
5223661b66 Made spectate mode use top 20 players only 2014-04-14 14:28:29 -07:00
Nick Winter
1c9d49afe8 Merge pull request #848 from gosnat/patch-1 
Update play_view.coffee
 2014-04-14 13:45:50 -07:00
gosnat
ebddcb57a9 Update play_view.coffee 
Adding the "Find the Spy" level to the user created list.
 2014-04-14 15:43:23 -05:00
Michael Schmatz
6c4349df70 Improved simulation leaderboard performance 2014-04-14 11:39:31 -07:00
Nick Winter
239b130d9c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 11:18:30 -07:00
Nick Winter
1794e5e040 Fixed #813 (sort of). 2014-04-14 11:18:02 -07:00
Scott Erickson
522dc6fb7d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 11:14:19 -07:00
Scott Erickson
dd36cdd092 Fixed #836 2014-04-14 11:14:09 -07:00
Michael Schmatz
415e34e701 Fixed isRanking and reduced logging 2014-04-14 11:01:55 -07:00
Michael Schmatz
b40e4dca37 Simulation leaderboard aggregation framework and local fixes 2014-04-14 08:46:46 -07:00
Glen De Cauwsemaecker
df17021344 Merged conflicts and fixed line endings windows => unix 2014-04-14 10:12:23 +02:00
OlenaGapak
aea7b3ada0 Update uk.coffee 
Ukrainian localization
 2014-04-14 10:36:55 +03:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Nick Winter
fbc8b6ac35 Propagated new i18n tags. 2014-04-13 19:04:43 -07:00
Nick Winter
bf4ced545a Merge pull request #840 from julycoolwind/patch-2 
Translate some items under 'common','versions'  and 'editor'.
 2014-04-13 19:02:54 -07:00
林鑫
2bf654c8fa Translate some items under 'common','versions' and 'editor'. 2014-04-14 08:57:04 +08:00
Nick Winter
84884ca7d7 Merge pull request #837 from dpen2000/FixesTo831 
Additional fix on #831
 2014-04-13 17:07:37 -07:00
dpen2000
2345a7d8e8 Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code 2014-04-13 19:58:50 -04:00
Nick Winter
7fcff825a8 Fixed #310 by tweaking the styling to emphasize stroke over fill. 2014-04-13 16:42:21 -07:00
Nick Winter
7b14215339 Fixed footer background color on LevelView. 2014-04-13 16:06:47 -07:00
Nick Winter
ba38509a1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-13 15:29:22 -07:00
Nick Winter
af0b8aa5e2 A few fixes and cleanup for #831. 2014-04-13 15:28:16 -07:00
Nick Winter
3d945492b0 Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2 2014-04-13 14:48:45 -07:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Michael Schmatz
e32524536e Quick fix for crashing server 
Undo when investigating which schema does this
 2014-04-13 14:06:29 -07:00
Jasper D'haene
2cde44319c added some app schemas + missing schema stub 2014-04-13 16:05:11 +02:00
Jasper D'haene
4157447337 completed bus schemas 2014-04-13 15:23:24 +02:00
JasperDhaene
59c60472a5 added line breaks 2014-04-13 14:11:10 +02:00