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

940 commits

Author SHA1 Message Date
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
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
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
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
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
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -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
8ab50205aa Fixed more buttons in treema. 2014-04-24 11:50:49 -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
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
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
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
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor 
Still checking for bugs
 2014-04-22 08:54:35 -07: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
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
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
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
Michael Schmatz
a7867e5e2d Added background linting 
Background hasChangedSignificantly is soon!
 2014-04-18 14:59:08 -07: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
71ee31ef49 styling the community page 2014-04-18 13:02:07 -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
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
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