codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 01:55:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3109 commits 27 branches 0 tags 134 MiB
Commit graph

2301 commits

Author SHA1 Message Date
Nick Winter
0b947dbeee Let's try 30 FPS for a while now. 2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Michael Schmatz
544cc62cdb First steps towards hover debugger improvements 2014-04-28 15:05:54 -07:00
Scott Erickson
e5e146c3c1 Got rid of an extraneous log. 2014-04-28 14:59:51 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Nick Winter
7e16fa5bd6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 14:01:43 -07:00
Nick Winter
6d75b5593a Fixed bug with pointer animation. 2014-04-28 14:01:33 -07:00
Scott Erickson
3a28f190a1 Merge branch 'master' into feature/loading-views 2014-04-28 11:55:17 -07:00
Scott Erickson
6f2e309d6d Added one last resource name. 2014-04-28 11:53:57 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Scott Erickson
8164c6881c Fixed a patches resource name. 2014-04-28 11:10:27 -07:00
Scott Erickson
01f2a556f9 Set up the patches view with the new loading system, fixing a few things in the meanwhile. 2014-04-28 11:09:21 -07:00
Nick Winter
4a2f2700bc Don't show tutorial level link if tutorial level doesn't exist for a ladder level. 2014-04-28 10:54:03 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Alexei Nikitin
d82c62f4e6 Update ru.coffee 
I am extremely dissatisfied the support of CodeCombat internationalization by programmers. Make changes to the requirements of the new code; it must be completely covered by the i18n tags reflected in en.coffee.
 2014-04-28 09:23:56 -07:00
dpen2000
0a8ec096f7 Make components read only for anonymous users 2014-04-28 02:03:08 -04:00
dpen2000
3165a2b654 Change all lines setting readonly from being admin only to being authenticated only 2014-04-28 02:03:08 -04:00
Nick Winter
0de5e715c7 Double-checked i18n propagation. 2014-04-27 20:28:53 -07:00
Nick Winter
d245dfd34c Merge pull request #915 from dpen2000/HideCreateComponentsSystems 
Hide Create New System/Component links in menus from non-admins
 2014-04-27 20:25:06 -07:00
Nick Winter
8cb8c63f21 Fixed merge conflicts in uk.coffee. 2014-04-27 20:23:13 -07:00
Nick Winter
c1637fe37a Fixed merge conflicts in es-419.coffee. 2014-04-27 20:19:05 -07:00
Nick Winter
3e3611e57d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-27 20:14:12 -07:00
Nick Winter
938a2bca1d Merge pull request #900 from julycoolwind/patch4 
Translate items under multiplayer_launch
 2014-04-27 20:13:27 -07:00
Nick Winter
e65202434b Merge pull request #890 from treby/update_ja_resource 
Update ja resource.
 2014-04-27 20:12:14 -07:00
Nick Winter
fc6ad1dd01 Properly tracking first-frame team gold. Slightly more visible team gold on hover. 2014-04-27 20:11:11 -07:00
Nick Winter
a7179ae3b2 Fixed some more gold view stuff. 2014-04-27 15:33:16 -07:00
Nick Winter
2ec225b0d0 Enabled API protection for Find the Spy. 2014-04-27 14:30:32 -07:00
Nick Winter
dac4f05fd9 Improved legibility of gold font. Moved Done button to not conflict with gold display. 2014-04-27 14:19:39 -07:00
Nick Winter
d542898663 Fixed indentation / commenting on a few lines from #924. 2014-04-27 09:40:43 -07:00
belian
75f37864da Update fr.coffee 
New update for "fr.coffee"
 2014-04-27 11:52:55 +02:00
Nick Winter
fa0e7f04f7 Fixed a thing. 2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
14cffc5875 Did some refactoring to simplify using SuperModel and registering models and collections. 2014-04-26 12:54:03 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
14d62915f4 Got projection and backups set back up, partially fixed the level editor. 2014-04-25 16:14:05 -07:00
Scott Erickson
9a2311e792 Removed logic for dynamically finding referenced models. 2014-04-25 15:33:57 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
d8d2a57c38 Listed a few new levels. 2014-04-25 15:00:46 -07:00
Scott Erickson
7640a6365b Removed some logs. 2014-04-25 14:59:17 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Nick Winter
2ff97c3bcd I guess emails might not be there. 2014-04-25 10:55:37 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
abe07e6395 Potential popup blocker fix 2014-04-25 09:17:04 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
61458c97d6 Fixed jqxhr error display 2014-04-25 07:50:29 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
dpen2000
69b3fe4b8c Hide Create New System/Create New Component links in menus from non-admins 2014-04-24 19:24:08 -04:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
0975a86345 Propagated i18n. 2014-04-24 14:32:56 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Scott Erickson
e2c2657f34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 13:23:40 -07:00
Scott Erickson
472f8899dd Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master 
Conflicts:
	app/views/editor/level/edit.coffee
 2014-04-24 13:17:43 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Scott Erickson
0a313a110c Removed a piece of logging. 2014-04-24 12:07:11 -07:00
Scott Erickson
cfbd7b9b12 Fixed #911 2014-04-24 11:51:00 -07:00
Scott Erickson
8ab50205aa Fixed more buttons in treema. 2014-04-24 11:50:49 -07:00
Scott Erickson
84d21490ab Fixed some treema styling. 2014-04-24 11:38:30 -07:00
Scott Erickson
1eb2adbc61 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 11:22:50 -07:00
Scott Erickson
76f36294b0 Fixed #908, while keeping things like opening revert or contact modals in the level editor from breaking. 2014-04-24 11:22:43 -07:00
Nick Winter
73f39095e6 Upgraded table sorter. 2014-04-24 11:09:01 -07:00
lordbam
8b9bc0c504 Update uk.coffee 
I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end
 2014-04-24 17:25:11 +03:00
tmrdja
14ebc957de Changed responsive view for LevelEditor 2014-04-24 11:51:16 +02:00
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe Updated janky include_flow skip levels. 2014-04-23 16:11:47 -07:00
Darredevil
47eef39bc7 Added Gold Rush level 2014-04-24 02:07:59 +03:00
Nick Winter
68f3eeb770 Two tiny profile improvements. 2014-04-23 11:26:20 -07:00
Michael Schmatz
628a784ac4 Progress towards LinkedIn integration 2014-04-23 11:25:36 -07:00
Nick Winter
d1ceec16bb Propagated i18n tags, as reminded by #884. 2014-04-23 10:48:31 -07:00
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
marianoluzza
0db33213f3 Update es-419.coffee 
Various sections translated
 2014-04-23 13:44:13 -03:00
林鑫
de1eb3860a Translate items under multiplayer_launch 2014-04-23 17:26:39 +08:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
Scott Erickson
9c8841e838 Merge remote-tracking branch 'origin/master' 2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02 Hack to fix a bug with the components view in the thang editor. 2014-04-22 16:42:41 -07:00
dpen2000
dd00e2abe6 Replace generic text Sign Up to Create a New Content 2014-04-23 00:37:10 +01:00
Glen De Cauwsemaecker
afc447e596 Removed double got_questions i18n tag in en.coffee from commit e439e3f 2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker
7da89e8b00 Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master 2014-04-22 23:44:50 +02:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Michael Schmatz
7419b269f1 Merge pull request #894 from codecombat/feature/worker-lint 
Background linting/transpilation/hasChangedSignificantly
 2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28 Removed web worker logging listener 2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a Renamed test_worker to aether_worker 2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d Removed superfluous comment 2014-04-22 11:51:51 -07:00
Michael Schmatz
3bbedbc100 Added background transpile 2014-04-22 11:46:17 -07:00
Nick Winter
ab77176ed0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e Fixed race condition 2014-04-22 11:04:56 -07:00
Scott Erickson
bb0cbf1151 Removed some old code that didn't work out. 2014-04-22 10:43:08 -07:00
Scott Erickson
e8da248302 Made the level editor not break when using units that are incomplete. 2014-04-22 10:39:15 -07:00
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor 
Still checking for bugs
 2014-04-22 08:54:35 -07:00
treby
6937d656c7 Added translate contributor. 2014-04-22 08:55:00 +09:00
treby
4898ff78a1 Updated ja.coffee 2014-04-22 08:54:10 +09:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
Michael Schmatz
0f435b41ae Merge pull request #885 from codecombat/master 
Merge master into worker-lint
 2014-04-21 14:13:43 -07:00
Scott Erickson
1e50ef36ce Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming 2014-04-21 12:53:11 -07:00
tmrdja
826a5f56db Added responsive view for LevelEditor 2014-04-21 21:15:22 +02:00
Scott Erickson
c754f7b943 Merge branch 'master' into feature/loading-views 2014-04-21 11:53:18 -07:00
Scott Erickson
9bc8ae11da Fixed some indentation. 2014-04-21 11:42:21 -07:00
Michael Schmatz
69ef951dba Merge pull request #874 from dpen2000/FixSystemsListDeltaIssue 
Fix deltas referring to last system saved
 2014-04-21 10:56:53 -07:00
JasperDhaene
e439e3fec8 added missing i18n tag 2014-04-21 19:56:38 +02:00
JasperDhaene
c49dc9457d fixed some lines to fit proper context 2014-04-21 19:54:14 +02:00
JasperDhaene
4d7e6ba849 fixed some lines to fit proper context 2014-04-21 19:52:27 +02:00
JasperDhaene
6a1d43435a fixed some lines to fit proper context 2014-04-21 19:50:43 +02:00
Michael Schmatz
486d1b75ff Changed moar to More 2014-04-21 10:40:22 -07:00
Daniel
baff84f0ae Update es-ES.coffee 
Hi!
I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon.
Cheers!
 2014-04-21 01:13:34 +02:00
Nick Winter
5e2f3ac7cb Merge pull request #878 from JasperDhaene/master 
Update Dutch locale
 2014-04-20 13:21:07 -07:00
JasperDhaene
ef9ee024e1 update nl-NL.coffee 2014-04-20 21:34:43 +02:00
JasperDhaene
ad212d428c update nl-BE.coffee 2014-04-20 21:33:19 +02:00
JasperDhaene
6a03ddad74 Update nl.coffee 2014-04-20 21:31:11 +02:00
Nick Winter
6fa3d81fa1 Merged, fixed conflicts, restored rest of file. 2014-04-20 11:44:44 -07:00
Nick Winter
a829f3a537 Merge branch 'patch-2' of git://github.com/kinez/codecombat 2014-04-20 11:42:05 -07:00
Nick Winter
baca3876ca Merge pull request #869 from treby/improve_ja_resources 
Updated  for Japanese(ja).
 2014-04-20 11:20:46 -07:00
Inez KEMENES
4a2bcc2030 Update hu.coffee 2014-04-20 19:04:07 +02:00
Nick Winter
f281aa8e2d Fixed quotes. 2014-04-19 17:43:01 -07:00
Nick Winter
b806436232 Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3 2014-04-19 17:40:58 -07:00
Nick Winter
0787349d32 Merge pull request #873 from dpen2000/patch-1 
Modify links on community page
 2014-04-19 17:38:20 -07:00
Nick Winter
4249ddce15 Merge pull request #868 from M-r-A/i18n 
Update ru
 2014-04-19 17:34:34 -07:00
dpen2000
de69f740e4 Fix deltas referring to last system saved 
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
 2014-04-19 19:59:21 -04:00
dpen2000
c241b06f76 Modify links on community page 2014-04-19 20:03:22 +01:00
Scott Erickson
044556e5a4 Fixed a bug with the level editor that prevented selecting thangs to add. 2014-04-19 10:27:14 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
7321052c18 Fix supermodel with resource value and fix ladder view under supermodel resource management. 2014-04-19 13:06:47 -04:00
Ting-Kuan
375aca2c0a Fix: Some level systems load forever. 2014-04-19 12:08:40 -04:00
林鑫
984f2c2cc4 Translate some items under common,account_settions,employers,play_level. 2014-04-19 23:22:03 +08:00
Alexei Nikitin
ac47a88c39 Update ru 2014-04-19 13:54:51 +04:00
treby
fb2bf865cd Added some translation for Japanese. 2014-04-19 16:42:34 +09:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
Nick Winter
7186b414cf Merge pull request #861 from onion7878/patch-1 
Update zh-HANS.coffee
 2014-04-18 17:49:55 -07:00
Michael Schmatz
a7867e5e2d Added background linting 
Background hasChangedSignificantly is soon!
 2014-04-18 14:59:08 -07:00
dpen2000
75b759b1dc Add system names into delta messages 2014-04-18 17:25:25 -04:00
dpen2000
b20f8fd260 Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee 2014-04-18 21:06:57 +01:00
George Saines
fced3e821a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 13:02:11 -07:00
George Saines
71ee31ef49 styling the community page 2014-04-18 13:02:07 -07:00
Nick Winter
f38d17c64f Protected candidates from view by employers they work(ed) at. 2014-04-18 12:48:13 -07:00
Nick Winter
a88089b7fc Sass don't like that. 2014-04-18 09:54:27 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Ting-Kuan
75224e0cd9 hideLoading on ThangEditView and ComponentConfigView. 2014-04-17 22:41:07 -04:00
Ting-Kuan
64f986c286 Remove dependency management in supermodel. 2014-04-17 22:16:29 -04:00
Scott Erickson
8adca4a1da Added a transactional email for when changes are made, to notify watchers. 2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412 Creators of documents are automatically added as watchers. Added a patch creation email for watchers. 2014-04-17 17:09:01 -07:00
Ting-Kuan
69fe4428e4 Before merge to master. 2014-04-17 19:52:09 -04:00
Ting-Kuan
a5e2069d60 Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts. 2014-04-17 19:37:31 -04:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Scott Erickson
21e8d7b26f Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
Scott Erickson
7ccaa8c843 Fixed a bug, colored a badge. 2014-04-17 14:39:52 -07:00
Scott Erickson
cdaf2ebfaf Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
Ting-Kuan
b7439ed1ca Fix loading bar and retry block in ladder_view, #857. 2014-04-17 16:54:26 -04:00
Scott Erickson
781a8ec913 Fixed the play and save buttons. 2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Scott Erickson
b5406b0149 Set up the rest of the component/system buttons and nav bars. 2014-04-17 13:24:17 -07:00
Ting-Kuan
fe96289bf6 debugging: ladder_view doesn't show loading bar. 2014-04-17 15:57:08 -04:00
Nick Winter
2230b32829 Merge pull request #863 from dpen2000/FixTypeError 
Fix javascript error occuring when e is null/undefined
 2014-04-17 11:37:51 -07:00
Scott Erickson
9eff958dcb Fixed the level and component watch buttons. 2014-04-17 11:35:09 -07:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
dpen2000
7bc9bb5328 Fix javascript error occuring when e is null/undefined 2014-04-17 14:32:35 -04:00
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
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
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
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
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
e49344bd87 A few job profile fixes and cleanup. 2014-04-15 10:45:54 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Ting-Kuan
e58a5ee4b5 add debug msg. 2014-04-15 13:31:52 -04:00
Nick Winter
9194f842e6 Added some job description fields. 2014-04-15 09:28:19 -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
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
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
npani13
5d16f8e5ba Create de-ch.coffee 
Speechdata for Swissgerman (CH)
 2014-04-14 20:21:58 +02: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
dd36cdd092 Fixed #836 2014-04-14 11:14:09 -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
林鑫
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
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
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -04:00
Inez KEMENES
094704f0c5 Update hu.coffee 2014-04-13 17:29:29 +02:00
Ting-Kuan
573a4ae847 Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
 2014-04-13 10:37:35 -04:00
Ting-Kuan
4979344ee5 Remove schema loading code. 2014-04-13 10:36:09 -04: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
Aditya Raisinghani
ffd057899e Removed anon name collisions and reset anon user name if name is taken in interim. 2014-04-13 17:55:49 +05:30
Glen De Cauwsemaecker
0ce04b147d Merge pull request #824 from julycoolwind/patch-1 
Update zh-HANS.coffee
 2014-04-13 13:49:55 +02:00
JasperDhaene
3915ebc8b3 Updated some Bus schemas. 2014-04-13 12:31:12 +02:00