codecombat

mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00

Author	SHA1	Message	Date
Nick Winter	071f006acf	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-18 14:09:02 -07:00
Nick Winter	8ca9374de0	Zoom-aware, ratio-based edge avoidance (polish for #1448 ).	2014-08-18 14:08:54 -07:00
Scott Erickson	3f78b5f979	Merge pull request #1452 from rubenvereecken/new_achievement New achievement modal fills in level.original query bit	2014-08-18 13:56:45 -07:00
Scott Erickson	86ba46b64c	Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand.	2014-08-18 13:43:17 -07:00
Scott Erickson	69ab177702	Trying to get rid of debug logs in karma. Tried to do it with the conf, didn't seem to work, did a hack instead.	2014-08-18 13:43:17 -07:00
Nick Winter	9697af6b05	Merge pull request #1448 from TheSecretSquad/issue#1213CoordinateDisplayEdgeDetection Issue#1213 coordinate display edge detection	2014-08-18 13:42:37 -07:00
Szymon Gabrek	664853f5e9	Update pl.coffee	2014-08-18 19:47:00 +02:00
Darredevil	1f51eabe48	Added new 'Minimax Tic-Tac-Toe' level	2014-08-18 18:39:16 +03:00
Ruben Vereecken	48a79ad48c	New achievement modal fills in level.original query bit	2014-08-18 14:35:57 +02:00
Pete DiSalvo	a011f118e3	Added CoordinateDisplay edge detection. Doesn't account for camera zoom.	2014-08-16 18:51:47 -04:00
Pete DiSalvo	eed68c0a1c	Working orientation. Doesn't account for camera zoom	2014-08-16 18:30:41 -04:00
Pete DiSalvo	31e609c0c8	Added edge detection to camera, and worked on orientations	2014-08-16 18:30:41 -04:00
Pete DiSalvo	dc7529344c	Working on orientation	2014-08-16 18:30:41 -04:00
Pete DiSalvo	8f6d162542	Beginning work on edge detection	2014-08-16 18:30:41 -04:00
Imperadeiro98	89e8d523c5	Update pt-PT.coffee	2014-08-16 09:35:34 +01:00
Nick Winter	3b083e15f5	Don't require any Component default properties in hero levels, for maximum defaultability.	2014-08-15 12:27:56 -07:00
Nick Winter	5f20e6f05e	Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet.	2014-08-15 12:09:56 -07:00
Nick Winter	ba1e7005ca	Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108 . Actually, same one, but the fix eralier got undone.	2014-08-15 10:50:05 -07:00
Scott Erickson	8233df514e	Added an acceptor field to patches.	2014-08-15 10:36:21 -07:00
Nick Winter	f1a9848366	Fixed a couple errors.	2014-08-15 10:27:36 -07:00
Nick Winter	4a133f6998	Added popovers to community social link logos.	2014-08-15 09:43:55 -07:00
Nick Winter	32c74db282	Merge pull request #1442 from dkundel/master Fixing most of the issues described in #18	2014-08-15 09:02:15 -07:00
Nick Winter	419e86b50f	Merge pull request #1443 from Imperadeiro98/master Update pt-PT.coffee	2014-08-15 08:18:23 -07:00
Ruben Vereecken	40818fd7bc	GitHub Login implemented	2014-08-15 16:20:45 +02:00
Imperadeiro98	2cbbb1c0dc	Update pt-PT.coffee	2014-08-15 11:32:30 +01:00
Dominik Kundel	68828b67bb	removed console.log	2014-08-15 02:04:46 +02:00
Dominik Kundel	755a86e3d3	moving some styling	2014-08-15 01:56:01 +02:00
Nick Winter	69c22db434	Moved Hero Placeholder replacement logic to Level's denormalizeThang.	2014-08-14 16:35:03 -07:00
Matt Lott	98bed57751	Merge pull request #1441 from differentmatt/master Instrument user code problems	2014-08-14 16:17:47 -07:00
Matt Lott	9752c4b18a	Updating user_code_problem schema types	2014-08-14 15:47:02 -07:00
Nick Winter	0f983bdcf1	Crude steps towards using your hero equipment in items levels.	2014-08-14 15:12:15 -07:00
Scott Erickson	827f6ee8b8	Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way.	2014-08-14 14:04:03 -07:00
Matt Lott	9b79e2ca27	Instrument user code problems	2014-08-14 13:32:00 -07:00
Dominik Kundel	702656ad02	Merge remote-tracking branch 'upstream/master'	2014-08-14 22:30:19 +02:00
Dominik Kundel	b1252a4426	moving the popover for palette entries into the body to fix layering with popover of autocomplete	2014-08-14 22:29:57 +02:00
Nick Winter	719e64e85f	Added a quick visualization of language localization completion to the Diplomat page.	2014-08-14 11:43:40 -07:00
Scott Erickson	5a700c14df	Stab at fixing the client tests on travis.	2014-08-14 11:00:42 -07:00
Nick Winter	18b0208aac	Updated i18n.	2014-08-14 10:57:57 -07:00
Scott Erickson	c31a509472	Working on the inventory view. Added a way to get the current equipment config from the inventory view.	2014-08-14 10:44:04 -07:00
Nick Winter	7286d069a0	Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.	2014-08-14 10:28:50 -07:00
Nick Winter	652d47fb81	Merge pull request #1432 from jayant1992/undo-redo Undo redo descriptions	2014-08-14 09:58:28 -07:00
Nick Winter	2f29e4ef89	Merge pull request #1438 from Imperadeiro98/patch-2 Fixed typo	2014-08-14 09:58:11 -07:00
Nick Winter	99d29bd206	Merge pull request #1437 from Imperadeiro98/patch-1 Update diplomat.jade	2014-08-14 09:57:23 -07:00
Ruben Vereecken	dbff3e04d5	Job profile view works once again	2014-08-14 17:25:41 +02:00
Imperadeiro98	553b124de8	Update uk.coffee	2014-08-14 09:05:56 +01:00
Imperadeiro98	8e4f9189a0	Update locale.coffee	2014-08-14 09:05:47 +01:00
Imperadeiro98	d7270335ca	Update diplomat.jade Added all the languages and myself.	2014-08-14 09:04:29 +01:00
Nick Winter	0084b64d67	Made some updates to the community page.	2014-08-13 20:45:33 -07:00
Nick Winter	7844a2b987	Some fixes for new user views breaking on bad data or certain configurations.	2014-08-13 19:17:26 -07:00
Nick Winter	4f3af4d64f	Fixed #1433 .	2014-08-13 14:57:07 -07:00
Nick Winter	bdb3e14189	Added missing ForkModal.	2014-08-13 14:26:56 -07:00
Scott Erickson	31e3e7f98e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-13 14:06:03 -07:00
Scott Erickson	f9e8bfad9f	Made some minor changes.	2014-08-13 13:45:24 -07:00
Nick Winter	b7d5428d5f	Made Forking more abstract to apply to ThangTypes, too.	2014-08-13 11:36:00 -07:00
Scott Erickson	e3088ad813	Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements	2014-08-13 10:49:10 -07:00
Ruben Vereecken	3fd396974d	Merge branch 'master' into achievements Conflicts: app/views/DemoView.coffee app/views/docs/ComponentDocumentationView.coffee app/views/editor/level/LevelEditView.coffee server/users/User.coffee	2014-08-13 10:43:42 +02:00
Jayant Jain	f4b8b76f46	Adds subclass for component config nodes	2014-08-13 12:39:21 +05:30
Jayant Jain	76c784b1de	Adds default scripts whenever a new level is created	2014-08-13 12:11:37 +05:30
Jayant Jain	1e52f237b7	Reworks undo-redo and undo-redo descriptions	2014-08-13 06:56:03 +05:30
Jayant Jain	094f26fc63	Removes undo-redo description methods from treema subclasses	2014-08-13 05:28:23 +05:30
Nick Winter	d3fb168636	Merge pull request #1431 from Imperadeiro98/master Updated files	2014-08-12 15:52:53 -07:00
Jayant Jain	67ed28e034	Undo redo descriptions for settings tab view	2014-08-13 02:55:36 +05:30
Jayant Jain	d713c35db7	Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView	2014-08-13 02:55:36 +05:30
Jayant Jain	9c235fa797	Minor refactoring and bug fixes for undo and undo descriptions	2014-08-13 02:55:36 +05:30
Jayant Jain	c6caef6219	Undo redo descriptions for ThangsTabView	2014-08-13 02:55:36 +05:30
Imperadeiro98	eccf148793	Big update to pt-PT.coffee	2014-08-12 22:11:14 +01:00
Imperadeiro98	2ec8a69de0	Update locale.coffee Updated pt-PT description and added Catalan.	2014-08-12 22:09:46 +01:00
Darredevil	1b1174d460	Added 'Classic Algorithms' level section	2014-08-12 23:23:43 +03:00
Nick Winter	291b44f0a6	Fix typo introduced in last commit. Like a boss.	2014-08-12 12:56:55 -07:00
Nick Winter	2ab83328f3	Added item editor level preview window.	2014-08-12 12:50:41 -07:00
Nick Winter	6d04b583f9	Added volume slider to game options.	2014-08-12 10:10:54 -07:00
Ruben Vereecken	8ae116200f	Achievements are now i18n'able	2014-08-12 18:18:16 +02:00
Nick Winter	9fd31c70e7	Hid parts of game menu that aren't ready yet.	2014-08-12 09:13:23 -07:00
Scott Erickson	8fafd46b7f	Reined in an overzealous css rule.	2014-08-12 09:04:36 -07:00
Nick Winter	a4663bf5e4	Merge pull request #1426 from jayant1992/temp Terrain generator	2014-08-12 08:42:15 -07:00
Nick Winter	cfc0ddbd68	Merge pull request #1425 from Imperadeiro98/master Update pt-PT	2014-08-12 08:39:44 -07:00
Jayant Jain	eece235337	Adds preset images	2014-08-12 20:42:42 +05:30
Imperadeiro98	612056eaf6	Started Contribute I started translating Contribute and I will uncomment when it is translated integrally.	2014-08-12 14:05:39 +01:00
Ruben Vereecken	d6f5b7512d	i18n for all new pages	2014-08-12 14:05:01 +02:00
Imperadeiro98	8a3d9d6af2	Update pt-PT.coffee In line 451, does it refer to "Game" or "Games".	2014-08-12 12:40:41 +01:00
Ruben Vereecken	857d3ca02c	Added some simple animations to achievement popups	2014-08-12 12:04:08 +02:00
Imperadeiro98	ab3b6f29f3	Update pt-PT.coffee	2014-08-12 09:49:23 +01:00
Imperadeiro98	73e18a66e7	Update pt-PT.coffee	2014-08-12 09:45:54 +01:00
Jayant Jain	b6e53d87c7	More decorations! (for dungeon preset)	2014-08-12 10:35:09 +05:30
Jayant Jain	5d8264e887	Takes care of overlapping walls for rooms	2014-08-12 10:35:09 +05:30
Jayant Jain	9d001524c6	Adds initial indoor preset for terrain generator	2014-08-12 10:35:09 +05:30
Scott Erickson	88252806c7	Fixed #1413 .	2014-08-11 18:47:41 -07:00
Nick Winter	4cc79e985e	A few fixes for adding items to inventories in ThangTypes.	2014-08-11 17:09:44 -07:00
Nick Winter	00aa211a7d	Merge pull request #1421 from Imperadeiro98/master New strings translated	2014-08-11 16:18:25 -07:00
Nick Winter	910e064bb0	Merge pull request #1423 from jayant1992/temp-bugfix Fixes bug with enter press on thangs tab	2014-08-11 16:16:22 -07:00
Nick Winter	9a5cd22069	Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels.	2014-08-11 16:15:46 -07:00
Jayant Jain	4beb85a3e7	Fixes bug with enter press on thangs tab	2014-08-12 04:16:17 +05:30
Scott Erickson	b3572dfad9	Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.	2014-08-11 15:41:08 -07:00
Nick Winter	023fd40767	Renamed inventory to collectedThangIDs for Collects. #59	2014-08-11 12:52:40 -07:00
Nick Winter	2bc92f1a6e	Merge pull request #1422 from dkundel/master Fixed issue #1420 and pasting snippets on click	2014-08-11 12:47:36 -07:00
Imperadeiro98	bd0f75a414	Update pt-PT.coffee	2014-08-11 20:35:41 +01:00
Dominik Kundel	c2e53be58f	Merge remote-tracking branch 'upstream/master'	2014-08-11 21:34:24 +02:00
Dominik Kundel	d2c63f4b98	fixed undo manager to not remove all code	2014-08-11 21:34:02 +02:00
Imperadeiro98	6c2a0ef77c	Update pt-PT.coffee	2014-08-11 20:04:23 +01:00
Imperadeiro98	18380f4dd5	Update pt-PT.coffee In line 432, is the string right?	2014-08-11 20:03:29 +01:00
Imperadeiro98	010afc7e95	Update pt-PT.coffee	2014-08-11 19:29:54 +01:00
Nick Winter	31d7e641e6	Fixes for equipping items and adding them to the World.	2014-08-11 11:04:38 -07:00
Nick Winter	cf7e2042c9	Got bitten by another case of #1108 .	2014-08-11 10:02:39 -07:00
Dominik Kundel	14f96a7eac	Merge remote-tracking branch 'upstream/master'	2014-08-11 15:30:05 +02:00
Ruben Vereecken	672b0f54f6	Worked away our NotifyJS dependency - horrible lib	2014-08-11 14:11:26 +02:00
Nick Winter	706ab7a251	Trying to get item ThangType nodes and inventory loading working.	2014-08-10 22:09:13 -07:00
Nick Winter	d1e26b40c2	I retook the Nick name.	2014-08-10 17:47:18 -07:00
Nick Winter	0074a04cfe	Moved Restart into Game Menu.	2014-08-10 17:41:18 -07:00
Nick Winter	45c762fddc	Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n.	2014-08-10 17:26:30 -07:00
Nick Winter	fb95f48f73	Implemented GameMenu OptionsView.	2014-08-10 16:27:33 -07:00
Nick Winter	4dcc5bd8ee	Adding some options to the game menu options tab.	2014-08-10 15:56:45 -07:00
Scott Erickson	65658dec78	Small styling fix.	2014-08-10 13:07:06 -07:00
Scott Erickson	6cac2371c1	Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do.	2014-08-10 13:03:53 -07:00
Nick Winter	6b2c079ff5	More work on game menu skeleton.	2014-08-08 15:57:20 -07:00
Nick Winter	da74a5ae77	Merge pull request #1410 from kisik21/patch-1 Update ru.coffee	2014-08-08 15:05:38 -07:00
kisik21	dfd5fad258	Update ru.coffee Oh nooooo...	2014-08-09 01:34:41 +04:00
kisik21	450831548e	Update ru.coffee Slag, why I am so stupid? I am making more and more commits, to fix MY errors, when I can do not make them...	2014-08-09 01:28:06 +04:00
kisik21	8bfb8a5049	Update ru.coffee Fixed some errors in formatting, seems like I broke that...	2014-08-09 01:13:28 +04:00
kisik21	e882abcb79	Update ru.coffee Кое что подправил, по совету Alexei Nikitin (Прошу прощения, если неправильно написал ник) Fixed some strings with Alexei Nikitin (Sorry if I wrote your nickname incorrectly)	2014-08-09 00:54:03 +04:00
Nick Winter	dc59aff9d0	Starting skeleton for GameMenuModal and its subviews.	2014-08-08 11:36:41 -07:00
Ruben Vereecken	e6569539dc	User page now uses the supermodel for user loading	2014-08-08 19:26:24 +02:00
Nick Winter	cc0ea25262	Merge pull request #1412 from rubenvereecken/meh Table headers are now unhoverable	2014-08-08 08:38:05 -07:00
Ruben Vereecken	47f00f9b5e	Added achievement deleting and automatic achievement filling	2014-08-08 17:20:07 +02:00
Jayant Jain	593c31f33c	Shows dragged component over other layers	2014-08-08 18:16:12 +05:30
Jayant Jain	93fd301300	Increases add treema line height, components are selected after being added	2014-08-08 18:02:20 +05:30
Jayant Jain	164e049202	Hides randomize button overlay, resolves #1409	2014-08-08 18:02:20 +05:30
Ruben Vereecken	3bfd341363	Goal states are now tracked in level sessions (state.goalStates)	2014-08-08 13:10:31 +02:00
Ruben Vereecken	9f0add22a5	Worked in a lot of changes Scott proposed	2014-08-08 11:54:53 +02:00
Scott Erickson	9403d39b61	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-07 18:48:41 -07:00
Scott Erickson	94ca62f4c5	Fixed a bug I added in some minor final changes.	2014-08-07 18:48:30 -07:00
Nick Winter	9363665610	Merge pull request #1416 from Darredevil/patch-13 Added new level 'QuickSort the Spiral'	2014-08-07 18:31:53 -07:00
Scott Erickson	cc025942f8	Extended the LevelLoader to load thang types and components dynamically for hero levels.	2014-08-07 18:27:47 -07:00
Darredevil	bea6e12a3a	Minor name fix	2014-08-08 03:26:13 +03:00
Darredevil	3dfe7987ea	Added new level 'QuickSort the Spiral'	2014-08-08 02:04:02 +03:00
Scott Erickson	0c5364eebb	Removed editorMode.	2014-08-07 14:22:43 -07:00
Ruben Vereecken	e082d363be	Table headers are now unhoverable	2014-08-07 13:12:30 +02:00
George Saines	0549273d14	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-06 17:42:33 -07:00
George Saines	b8ea89b4a8	community page redesign	2014-08-06 17:42:19 -07:00
Scott Erickson	29770bd220	Added a function for denormalizing levels, extending level thang components and configs with ones from thang types.	2014-08-06 15:18:22 -07:00
Nick Winter	4d4e321265	Fixed #1062 . Added Item kind to level editor Thang filters.	2014-08-06 08:24:50 -07:00
Nick Winter	852dabc17a	Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance.	2014-08-06 07:43:56 -07:00
Nick Winter	74283bafed	Made sure items equip themselves within the SpriteBoss, too.	2014-08-05 21:47:51 -07:00
kisik21	46c6051102	Update ru.coffee	2014-08-06 02:42:30 +04:00
Scott Erickson	eceac0bbc9	Hiding the randomize button overlay until #1409 is handled.	2014-08-05 15:06:11 -07:00
Scott Erickson	d5a8d8dc72	Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108 .	2014-08-05 14:56:11 -07:00
Scott Erickson	c5d496c063	Removed a bit for debugging.	2014-08-05 13:40:36 -07:00
Scott Erickson	30998ecbec	Fixed components w/out changes sometimes showing up in the save level modal.	2014-08-05 13:21:45 -07:00
Ruben Vereecken	d42922871e	Added related achievements tab to level editor	2014-08-05 15:15:53 +02:00
Ruben Vereecken	7d7d5300c0	Refactored New Model Modal (from SearchView originally)	2014-08-05 14:33:33 +02:00
Ruben Vereecken	5d66560673	Merge remote-tracking branch 'upstream/master' into achievements_progress Conflicts: app/views/editor/level/LevelEditView.coffee server/levels/sessions/LevelSession.coffee	2014-08-05 11:55:46 +02:00
Dominik Kundel	84c0fbd01f	use shortName as fallback for some entries if no snippet	2014-08-05 11:19:15 +02:00
Nick Winter	3bbdee583d	Better problem alert layout for alerts that include hints.	2014-08-04 20:16:12 -07:00
Nick Winter	a0b75ddb8e	Put Sky Span up for testing.	2014-08-04 19:46:00 -07:00
Dominik Kundel	f09b3c4792	Merge remote-tracking branch 'upstream/master'	2014-08-04 23:03:28 +02:00
Dominik Kundel	50517431db	added support for inserting snippets by shift+click	2014-08-04 23:02:54 +02:00
Dominik Kundel	86eea93e2f	merged changes	2014-08-04 22:37:15 +02:00
Ruben Vereecken	3266e3b46b	intermediate	2014-08-04 22:21:43 +02:00
Nick Winter	85011d1ed4	No need to explicitly track subviews for determining what the current view is.	2014-08-04 13:21:42 -07:00
Darredevil	a11649b12b	Typo fix	2014-08-04 23:15:01 +03:00
Nick Winter	0bcaf70d56	Merge pull request #1406 from rubenvereecken/forms_fix Fixed missing errors bug	2014-08-04 12:49:22 -07:00
Nick Winter	8a86e86012	Merge pull request #1390 from Imperadeiro98/master Update pt-PT.coffee	2014-08-04 12:45:13 -07:00
Ruben Vereecken	c165d46e17	Fixed missing errors bug	2014-08-04 20:02:26 +02:00
Ruben Vereecken	fb3848359e	Merge branch 'master' into achievements	2014-08-04 17:55:44 +02:00
Ruben Vereecken	6267352c6e	Drastically changed the way achievements get grayscaled	2014-08-04 15:29:46 +02:00
Jayant Jain	549f2657ea	Styles add button for addComponentsTreema	2014-08-04 07:53:24 +05:30
Jayant Jain	06875ce2b8	Resolves bug with mouseenter and mouseleave callbacks for add components treema	2014-08-04 07:21:02 +05:30
Jayant Jain	9e1513eb56	Add button on hover for addComponentsTreema	2014-08-04 07:05:22 +05:30
Jayant Jain	98f43b679f	Adds component upon double click, newly added components are automatically selected	2014-08-04 06:04:35 +05:30
Jayant Jain	03d696c3df	Components can now be added to thangs by dragging and dropping	2014-08-04 05:51:12 +05:30
Ruben Vereecken	26085f9f3e	Added a bunch of achievements to the script. Restyled big parts.	2014-08-03 23:58:51 +02:00
Imperadeiro98	0663dbc414	Update pt-PT.coffee	2014-08-01 10:39:30 +01:00
Imperadeiro98	4b932593be	Update pt-PT.coffee	2014-07-31 18:39:13 +01:00
Imperadeiro98	96fb84362a	Update pt-PT.coffee	2014-07-31 18:21:23 +01:00
Imperadeiro98	c7212226ae	Update pt-PT.coffee	2014-07-31 18:01:09 +01:00
Imperadeiro98	68e3110e74	Update pt-PT.coffee	2014-07-31 17:38:14 +01:00
Michael Schmatz	ca7b8ca10a	Merge pull request #1401 from rubenvereecken/test_fix Repaired TestView by only loading js files once	2014-07-31 08:14:59 -07:00
Michael Schmatz	e7de8e3282	Merge pull request #1396 from rubenvereecken/refactoring [Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)	2014-07-31 08:12:18 -07:00
Michael Schmatz	2ebc7f5aa6	Merge pull request #1398 from jayant1992/master Updates for script tab in level editor	2014-07-31 08:12:04 -07:00
Michael Schmatz	52b8dd8db3	Merge pull request #1400 from rubenvereecken/moment_update Added Moment i18n support	2014-07-31 08:11:01 -07:00
Michael Schmatz	0b9df5150d	Merge pull request #1393 from Melondonut/patch-3 Korean translation - patch3	2014-07-31 08:10:22 -07:00
Ruben Vereecken	0e5accb707	Repaired TestView by only loading js files once	2014-07-31 13:15:57 +02:00
Imperadeiro98	3d71d155b6	Update pt-PT.coffee	2014-07-31 10:50:01 +01:00
Ruben Vereecken	41729f9700	Added Moment i18n support	2014-07-30 23:19:21 +02:00
Ruben Vereecken	871149b2bc	Rechecked and added cool stuff for achievements	2014-07-30 22:23:43 +02:00
Imperadeiro98	1f8ce2eaf2	Update pt-PT.coffee	2014-07-30 20:47:03 +01:00
Jayant Jain	2690ef9a59	Reorders script ids upon deletion	2014-07-30 01:05:04 +05:30
Jayant Jain	f0940308ea	Newly inserted scripts are automatically assigned id	2014-07-30 00:52:59 +05:30
Jayant Jain	632d9a666e	Shows all autocomplete values on click instead of having to type initially	2014-07-30 00:52:59 +05:30
Jayant Jain	0555c2ec14	Initial autocomplete for event checks in scripts tab	2014-07-30 00:52:59 +05:30
Ruben Vereecken	d4043ac3db	Implemented singleplayer and multiplayer games played on profile	2014-07-29 20:11:45 +02:00
Ruben Vereecken	39c01c0bcb	Finished refactoring of LevelGuideModal (renamed from docs_modal)	2014-07-29 19:50:50 +02:00
Ruben Vereecken	30a6cf1cca	Merged in name changes from master	2014-07-29 17:28:13 +02:00
Ruben Vereecken	026e6e6378	Added some support to fetch level sessions for the user profile page	2014-07-29 16:50:07 +02:00
Ruben Vereecken	7987e1d05b	Did a bunch related to achievements and user profile page	2014-07-28 20:04:44 +02:00
Ruben Vereecken	194463c113	Greatly redid achievement styling for various scenarios	2014-07-28 17:40:20 +02:00
Ruben Vereecken	a8df3df095	Default image for achievements. Redid border logic	2014-07-28 15:14:11 +02:00
Ruben Vereecken	15c1939657	Started on achievement setup script	2014-07-28 14:17:25 +02:00
Melondonut	9b830fff26	Update ko.coffee	2014-07-28 18:58:48 +09:00
Melondonut	9d93d871e1	Update ko.coffee	2014-07-28 13:35:05 +09:00
Melondonut	5307515553	Update ko.coffee	2014-07-28 13:07:18 +09:00
Melondonut	53dd446db1	Update ko.coffee	2014-07-28 12:44:20 +09:00
Imperadeiro98	3ffeda8bbc	Update pt-PT.coffee	2014-07-27 19:31:56 +01:00
Michael Schmatz	d7cb76d10c	Merge branch 'pr/1387' Conflicts: app/views/editor/level/LevelEditView.coffee	2014-07-25 19:17:16 -07:00
Jayant Jain	69713f5603	Adds randomize button in case of level with no thangs	2014-07-26 01:55:28 +05:30
Jayant Jain	df554360fe	Updates glyphicons for undo-redo, adds placeholder text for add thangs search	2014-07-26 01:55:15 +05:30
Darredevil	3b704330d6	Documentation tab for Level Editor	2014-07-25 23:06:04 +03:00
Darredevil	b77b796cef	Merge branch 'codecombat-master' Conflicts: app/views/docs/ComponentDocumentationView.coffee app/views/editor/level/LevelEditView.coffee	2014-07-25 22:48:13 +03:00
Darredevil	e3a0ea400c	Docs tab v2	2014-07-25 22:33:55 +03:00
Jayant Jain	3e9dbe0d0b	Fixes bug in undo/redo on SystemsTabView	2014-07-25 18:07:09 +05:30
Jayant Jain	d3962c19bd	Ensures randomised thang clusters do not overlap each other	2014-07-25 18:07:01 +05:30
Jayant Jain	f700ddea0c	Adds temporary hack for infinite loops in randomise	2014-07-25 18:06:54 +05:30
Jayant Jain	1790215fea	Adds rooms and doors to dungeon preset	2014-07-25 18:06:44 +05:30
Jayant Jain	dc66218c00	Adds undo and redo buttons in editor topbar	2014-07-25 18:06:34 +05:30
Jayant Jain	9a24341fa5	Prevents overlapping of randomly generated thangs	2014-07-25 18:06:25 +05:30
Jayant Jain	3df2de8bec	Number of decorations scales appropriately with preset size	2014-07-25 18:06:13 +05:30
Jayant Jain	dce6254d4a	Fix for flickering thangs due to exact same coordinates	2014-07-25 18:06:03 +05:30
Jayant Jain	598e727500	Adds an initial dungeon preset, refactors border code to properly create dungeon walls	2014-07-25 18:05:49 +05:30
Jayant Jain	80da704d19	Background image paths automated, adds preset image files	2014-07-25 17:54:10 +05:30
Jayant Jain	c33491b04d	Presets in terrain_generate_modal shown from a list instead of hardcoded Conflicts: app/templates/editor/level/modal/terrain_randomize.jade	2014-07-25 17:51:48 +05:30
Jayant Jain	af23c09799	Refactors some code for presets in terrain generator	2014-07-25 17:50:21 +05:30
Jayant Jain	86cf344f28	Adds preset images to preview the generated terrain	2014-07-25 17:50:02 +05:30
Darredevil	f78c48c893	Docs tab v2	2014-07-25 01:26:34 +03:00
Imperadeiro98	19f257f1d0	Update pt-PT.coffee	2014-07-24 22:43:39 +01:00
Michael Schmatz	d773c301fb	Add message if no player code in profile	2014-07-24 10:47:27 -07:00
Michael Schmatz	2120657e5b	Add login link to profile login prompt	2014-07-24 10:16:43 -07:00
Melondonut	26ab77b1ae	Update ko.coffee	2014-07-24 15:43:23 +09:00
Melondonut	f082aa6e9b	Update ko.coffee	2014-07-24 15:30:54 +09:00
Michael Schmatz	e0d7392c1f	Merge pull request #1386 from codecombat/pr/1376 Pr/1376	2014-07-23 15:27:13 -07:00
Michael Schmatz	be28f3e6a0	Uncommented some commented translated lines	2014-07-23 15:23:53 -07:00
Michael Schmatz	7910c5d9cc	Implement #1370	2014-07-23 15:10:51 -07:00
Michael Schmatz	c4e3044a81	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 14:44:17 -07:00
Michael Schmatz	07cc01332d	Merge branch 'pr/1383' Conflicts: app/views/play/level/tome/SpellListTabEntryView.coffee	2014-07-23 14:44:15 -07:00
Ruben Vereecken	cde87e4fe5	Covered general patches with tests	2014-07-23 20:00:28 +02:00
Nick Winter	26ac94367e	Fixed #1372 . Minor fixes.	2014-07-23 08:59:42 -07:00
Dominik Kundel	5279b01483	fixed showing pinned popover	2014-07-23 17:39:16 +02:00
Scott Erickson	beef508e76	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 07:09:12 -07:00
Scott Erickson	65375aa5fc	Renamed problem and spell to their new, capitalized names.	2014-07-23 07:09:05 -07:00
Scott Erickson	1c3404d03e	Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.	2014-07-23 07:02:45 -07:00
Dominik Kundel	4f6ca5335f	fixed spell palette sliding behind HUD	2014-07-23 15:50:47 +02:00
Dominik Kundel	72c1bb28b3	fixed artefact	2014-07-23 15:26:22 +02:00
Dominik Kundel	9cb704a843	last fix for dimming the editor	2014-07-23 15:09:15 +02:00
Dominik Kundel	be50927fb6	disabled editor works again	2014-07-23 14:38:12 +02:00
Melondonut	cb3f547b9e	Update ko.coffee	2014-07-23 14:32:11 +09:00
Melondonut	dbb3d92b81	Update ko.coffee	2014-07-23 13:56:18 +09:00
Ruben Vereecken	8969311d82	Butons on profile page now nicer	2014-07-22 21:52:52 +02:00
Dominik Kundel	5db634d6a8	fullscreen on keyboard shortcut	2014-07-22 21:47:36 +02:00
George Saines	8982c7ea5b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-22 09:11:30 -07:00
George Saines	574252df32	subbing in Pavel's better tiny programming language icons	2014-07-22 09:11:25 -07:00
greyhusky	a313c3ab27	More translations Translated the "about" page and parts of "legal" page as well as some other stuff	2014-07-22 15:01:47 +02:00
Ruben Vereecken	411bb87985	Added contributor categories to user profile page	2014-07-22 12:50:56 +02:00
Melondonut	8476aa33f9	Update ko.coffee	2014-07-22 18:21:00 +09:00
Melondonut	e266f403ff	Update ko.coffee	2014-07-22 10:13:24 +09:00
Michael Schmatz	283108da1e	Added login message for anonymous users on job profile	2014-07-21 16:59:42 -07:00
Michael Schmatz	f100c4ebbe	Add filter alerts to employer page	2014-07-21 16:10:02 -07:00
Michael Schmatz	e8ffb8980f	Removed filterActive from filter alerts	2014-07-21 14:47:44 -07:00
Ruben Vereecken	ebdbc0f891	Basis for user view is finished	2014-07-21 22:02:08 +02:00
Ruben Vereecken	972d231ff5	Refactored router and views to anticipate the renameViews feature	2014-07-21 19:49:16 +02:00
Ruben Vereecken	0d87209fa8	Recently played is now shown on account page	2014-07-21 19:06:22 +02:00
Michael Schmatz	735a7082ee	Correction to filter schema	2014-07-21 10:01:49 -07:00
Michael Schmatz	6bc436aec2	Added saved employer filter alerts to schema	2014-07-21 09:44:40 -07:00
Ruben Vereecken	1c6da9711b	Added the Recently Played collection and endpoint	2014-07-21 14:36:10 +02:00
Ruben Vereecken	023a7adc81	Half the account page is there	2014-07-21 13:40:11 +02:00
Nick Winter	ac7e663418	Merge pull request #1359 from Melondonut/patch-2 translation Update ko.coffee	2014-07-20 22:44:05 -07:00
Melondonut	fed5f3bce0	uncommented line 485	2014-07-21 14:11:17 +09:00
Darredevil	61ebc4d15b	Docs tab	2014-07-21 03:52:34 +03:00
Nick Winter	20df6b4ebe	Merge pull request #1360 from Darredevil/master Docs page enhancement	2014-07-20 17:00:37 -07:00
Darredevil	e43afcc0a9	Docs page enhancement	2014-07-21 02:23:01 +03:00
Nick Winter	99e1a8b30a	Merge pull request #1357 from TheSecretSquad/issue#1213crosshair Changed point marker to crosshair, made it bigger, and changed color to white	2014-07-20 16:04:29 -07:00
Nick Winter	a7905db316	Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.	2014-07-20 15:51:48 -07:00
Melondonut	f5ac5423f8	Update ko.coffee I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.	2014-07-21 06:03:53 +09:00
Darredevil	f8cc64dc4c	fix for no user logged	2014-07-20 22:14:33 +03:00
Melondonut	9724c4f218	Update ko.coffee Hi there. I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate." thank you, Melondonut. 안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.	2014-07-20 23:19:41 +09:00
Nick Winter	1537754a16	A few bugfixes, plus gigantic child window convenience for me editing levels.	2014-07-19 20:26:13 -07:00
Pete DiSalvo	9ca3563eed	Changed point marker to crosshair, and changed color to white	2014-07-19 20:12:56 -04:00
Nick Winter	d45c2d31de	New language icons.	2014-07-18 20:14:41 -07:00
Scott Erickson	e7a70bbd0b	Merge conflict handling.	2014-07-18 17:09:41 -07:00
Scott Erickson	97964f7853	More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.	2014-07-18 17:06:20 -07:00
Scott Erickson	574e9e7804	Removed the deprecated ErrorView.	2014-07-18 16:56:08 -07:00
Scott Erickson	00c11fd70e	Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data.	2014-07-18 16:46:28 -07:00
Scott Erickson	9ad166048d	Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.	2014-07-18 16:12:28 -07:00
Scott Erickson	74425103d1	Fixed some DemoView issues, mainly clicking links from one demo to another.	2014-07-18 16:12:27 -07:00
Scott Erickson	90a4a1b635	Added setProjection so CocoModels can more easily get subsets of data.	2014-07-18 16:12:27 -07:00
George Saines	18631ec5b1	upgrading our level icons	2014-07-18 15:42:53 -07:00
Michael Schmatz	321bce121c	Edited task schema	2014-07-18 14:50:31 -07:00
Imperadeiro98	3ac1d6c77c	Update pt-PT.coffee	2014-07-18 15:48:36 +01:00
Imperadeiro98	051fd9ecbc	Update pt-PT.coffee	2014-07-18 13:40:05 +01:00
Nick Winter	207f0adf11	Propagated i18n tags for code language blurbs.	2014-07-17 20:13:30 -07:00
Nick Winter	2d7b6eb145	Updated code language logos. Added code language blurb i18n tags.	2014-07-17 20:12:59 -07:00
Scott Erickson	708f67ebd5	Merge branch 'master' into renameViews	2014-07-17 17:24:09 -07:00
Scott Erickson	cdf65d4f42	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-17 17:23:56 -07:00
Scott Erickson	59b723b890	Refactoring View to ModalView.	2014-07-17 17:22:26 -07:00
Scott Erickson	e18b4de583	Refactoring View to CocoView.	2014-07-17 17:20:11 -07:00
Scott Erickson	0e042ee61c	Refactoring View to RootView. Refactoring some RootViews to be routed manually.	2014-07-17 17:16:32 -07:00
Nick Winter	079d336881	Stopped .nano from overriding Bootstrap's column width for component docs page.	2014-07-17 16:36:59 -07:00
Scott Erickson	2b4b91733c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-17 16:31:03 -07:00
Scott Erickson	45a8278e7e	Work on the job profile view, initial work on the code modal.	2014-07-17 16:30:56 -07:00
Nick Winter	a1aa71084d	Merge pull request #1344 from Darredevil/master fix for no user logged	2014-07-17 16:30:51 -07:00
Scott Erickson	51e63ddbc3	Fixed some DemoView issues, mainly clicking links from one demo to another.	2014-07-17 16:29:26 -07:00
Scott Erickson	4818a81854	Added setProjection so CocoModels can more easily get subsets of data.	2014-07-17 16:22:06 -07:00
Nick Winter	e412a7b73f	Merge pull request #1341 from Imperadeiro98/master Update pt-PT.coffee	2014-07-17 16:00:54 -07:00
Nick Winter	769c26229e	Merge pull request #1340 from sunzenshen/master Fixed typo: Chose -> Choose	2014-07-17 15:59:08 -07:00
Nick Winter	8813a7f545	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-17 15:50:38 -07:00
Nick Winter	6b028513fd	Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.	2014-07-17 15:50:29 -07:00
Michael Schmatz	a9d664b8ec	Restored legacy candidates view	2014-07-17 13:16:17 -07:00
Scott Erickson	590626d5f8	Centered social link icons.	2014-07-17 09:30:27 -07:00
Scott Erickson	6f09e95d68	Removed background from job profile view.	2014-07-17 09:22:52 -07:00
Darredevil	b6469ff45b	fix for no user logged	2014-07-17 19:12:26 +03:00
Darredevil	80b420ebbf	fix for no user logged	2014-07-17 19:11:23 +03:00
Michael Schmatz	ccb2ad67ac	Merge pull request #1342 from codecombat/feature/mail-system Feature/mail system	2014-07-17 07:18:39 -07:00
Imperadeiro98	17a4a689e4	Update pt-PT.coffee	2014-07-17 14:18:29 +01:00
Imperadeiro98	991ef61d62	Update pt-PT.coffee	2014-07-17 13:44:14 +01:00
Imperadeiro98	1b6fc95d77	Update pt-PT.coffee	2014-07-17 13:25:25 +01:00
Alan Shen	c56be02222	Fixed typo: Chose -> Choose It may be late to describe incoming targets with past tense.	2014-07-17 01:16:08 -06:00
Darredevil	83177c5f00	language sensitive docs added	2014-07-17 03:19:09 +03:00
Darredevil	8da06f6c6b	language sensitive docs added	2014-07-17 03:18:06 +03:00
Michael Schmatz	ae23679a26	Hard code mail tasks and add unsubscribe	2014-07-16 16:37:06 -07:00
Nick Winter	781e1da93e	Fixed typo: massword -> password.	2014-07-16 16:14:48 -07:00
Nick Winter	42af807e5c	Merged in geometry work from #51 .	2014-07-16 16:01:37 -07:00
Nick Winter	855461a67e	Don't let test view interfere with normal body styles.	2014-07-16 16:01:37 -07:00
Michael Schmatz	b74bdfbf51	Added metadata to mail sent schema	2014-07-16 12:12:11 -07:00
Michael Schmatz	bb3c583300	Add approved date to job profile	2014-07-16 10:51:45 -07:00
nemoyatpeace	f17112ecf8	Minor adjustment to the aoe script	2014-07-17 00:53:52 +08:00
Nick Winter	5ce0cff538	Propagated i18n. Added password repeat to base en.coffee.	2014-07-16 08:03:25 -07:00
Nick Winter	1fd28c0181	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-16 07:54:23 -07:00
Nick Winter	bf0e1ead92	Merge pull request #1335 from rubenvereecken/settings_patch Did UX changes, added an error and fixed a job profile editing bug	2014-07-16 07:52:04 -07:00
Nick Winter	085951fa4a	Removed more counselor stuff.	2014-07-16 07:47:41 -07:00
Nick Winter	5b693d02cf	Merge pull request #1330 from Imperadeiro98/master Update pt-PT.coffee	2014-07-16 07:47:08 -07:00
Ruben Vereecken	bfc4ef58b0	Did UX changes, added an error and fixed a job profile editing bug	2014-07-16 14:47:55 +02:00
Imperadeiro98	4dbb49aa72	Update en.coffee	2014-07-16 13:24:16 +01:00
Nick Winter	6e9091fdf0	More fixes to documentation popovers.	2014-07-15 19:25:53 -07:00
Nick Winter	906ab3ac2b	Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette.	2014-07-15 18:54:55 -07:00
Nick Winter	03cc2d1af0	Fixed Grass01-Grass05 scaling issues.	2014-07-15 18:08:00 -07:00
George Saines	8c9c41f477	copy tweak on the employer homepage	2014-07-15 17:27:26 -07:00
Jayant Jain	fa595fcb32	Better positioned level border trees	2014-07-16 05:03:18 +05:30
Jayant Jain	741956b251	Borders and floors are placed inside positive axes	2014-07-16 05:03:18 +05:30
Imperadeiro98	7d476470c7	Corrected a mistake	2014-07-15 20:17:50 +01:00
Imperadeiro98	32d4408f67	Update pt-PT.coffee Delete lines 747-753 and 775-776.	2014-07-15 20:02:23 +01:00
Scott Erickson	3325332626	Fixes #1328 .	2014-07-15 11:23:55 -07:00
Scott Erickson	fb83028d87	Added watchers to list of properties to skip in deltas/patches.	2014-07-15 11:23:35 -07:00
Nick Winter	e06f9132d1	Fixed #469 .	2014-07-15 10:24:18 -07:00
Nick Winter	da73975f20	Fixed #1095 .	2014-07-15 09:47:13 -07:00
Nick Winter	3318d4a171	Fixed #1010 .	2014-07-15 09:35:14 -07:00
Nick Winter	39bea855d1	Propagated new i18n tags with the script.	2014-07-15 08:22:02 -07:00
Ruben Vereecken	0288786098	Merge branch 'master' into achievements	2014-07-15 16:16:46 +02:00
Ruben Vereecken	c423fe989b	Merge branch 'navbar' into achievements	2014-07-15 16:16:01 +02:00
Ruben Vereecken	40ba28f49b	Basics for account and user home pages	2014-07-15 16:15:21 +02:00
Nick Winter	b3e8eb8504	Working on something for #1327 .	2014-07-14 19:32:35 -07:00
Nick Winter	7b39bd06f3	Fixed #1321 .	2014-07-14 17:54:32 -07:00
Scott Erickson	d8d40ab0f6	Fixes #1116	2014-07-14 17:46:12 -07:00
Scott Erickson	b113e126a3	Fixes #1316 and #1318	2014-07-14 17:18:48 -07:00
Scott Erickson	888ee6c0bb	Fixed deltas in the version history modal.	2014-07-14 16:37:10 -07:00
Scott Erickson	9d22a35194	Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat	2014-07-14 15:13:52 -07:00
Nick Winter	f2f3817e10	Fixed Thang Editor scaling.	2014-07-14 14:10:46 -07:00
Nick Winter	cfeb6c34a4	Merge pull request #1324 from Darredevil/master docs page minor update	2014-07-14 13:23:52 -07:00
Ruben Vereecken	1f1ff25a5a	merge	2014-07-14 20:27:47 +02:00
Nick Winter	23dc8d2947	Removed a bad log.	2014-07-14 11:21:03 -07:00
Darredevil	c579742955	docs page update	2014-07-14 21:18:17 +03:00
Ruben Vereecken	e748417007	GET /auth/name/<name> now serves possible free names anonymous users are now warned if their new name is already chosen User Settings is now without auto-save Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all. Refactored conflicted name checking so it can be used in more places Signup form now has an optional name field Covered extra case where the debounced check happened too late. Support for submitting on enter. Worked in scott's comments and got tests working again	2014-07-14 20:07:58 +02:00
Nick Winter	d7586025d9	Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.	2014-07-14 11:05:59 -07:00
Ruben Vereecken	a60451368e	Merged in master	2014-07-14 18:58:25 +02:00
Ruben Vereecken	ae4a5eb460	Deduplicated bootstrap include	2014-07-14 18:52:23 +02:00
Ruben Vereecken	5aa6db7696	Made the sass more snappy	2014-07-14 18:40:23 +02:00
Nick Winter	7446c9ee08	Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.	2014-07-14 09:38:55 -07:00
Nick Winter	f1c8983de2	Don't ask for team again if we already have a child window.	2014-07-14 08:40:36 -07:00
Nick Winter	364ff4fc00	Merge branch 'jayant1992-master'	2014-07-14 07:33:59 -07:00
Nick Winter	42cf0b5cce	Added missing starting quote.	2014-07-14 07:30:18 -07:00
Nick Winter	d27dbdddbb	Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13	2014-07-14 07:29:47 -07:00
Ruben Vereecken	7a52c195eb	More user navbar styling! Also need to investigate browser reflow	2014-07-14 15:32:02 +02:00
Ruben Vereecken	1aa566e4f7	Layout of navbar user dropdown about finished	2014-07-14 14:56:44 +02:00
Ruben Vereecken	5f2c7665ea	Navbar refactored, starting to look good already.	2014-07-14 14:20:13 +02:00
Ruben Vereecken	d261f888d7	Refactored profile view to be a userView. Would still like to test remarks though	2014-07-14 12:18:28 +02:00
Tery Lim	0f4a7df982	Use spl instead of trailing space for spacing	2014-07-14 13:56:27 +08:00
Inez KEMENES	ca3a2b620b	Update hu.coffee I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.	2014-07-14 07:22:19 +02:00
Nick Winter	1a016394fe	Starting to show opponent code languages.	2014-07-13 20:19:51 -07:00
Jayant Jain	c13c7db4ed	Less geometric random borders for the terrain generator	2014-07-14 08:11:33 +05:30
Nick Winter	bd47b3bc83	Fixed #1210 based on #1313 .	2014-07-13 18:53:01 -07:00
Nick Winter	1d9afbabd2	Fixes for duplicate Thang IDs and reverting randomized Thangs.	2014-07-13 18:38:24 -07:00
Nick Winter	f9822b65e4	Merge branch 'master' of git://github.com/jayant1992/codecombat	2014-07-13 18:21:27 -07:00
Nick Winter	b1b9f87ebe	Fixed root test view URL to not need the trailing slash.	2014-07-13 17:34:51 -07:00
Jayant Jain	493ebd07e6	Changes randomise to randomize	2014-07-14 06:01:09 +05:30
Nick Winter	f92b29a4a3	Added rotate to Vector APIs.	2014-07-13 17:25:24 -07:00
Michael Schmatz	2a5a366c12	Made language selection in opponent modal	2014-07-13 17:22:06 -07:00
Nick Winter	daff7a2640	Merge pull request #1314 from TheSecretSquad/issue#1213 Added point marker shape, and split updateSize method into helpers.	2014-07-13 17:08:11 -07:00
Nick Winter	a076822a08	Merge pull request #1306 from kerradus/master update ru.coffee	2014-07-13 17:07:45 -07:00
Nick Winter	01fdc5b520	Merge pull request #1311 from rubenvereecken/pretty_wizard_modal Bootstrappified Wizard Settings modal	2014-07-13 17:07:07 -07:00
Nick Winter	6eea28dc19	Error handling for syntax errors in component code.	2014-07-13 16:40:03 -07:00
Pete DiSalvo	ffb8f9575e	Added point marker shape, and split updateSize method into helpers.	2014-07-13 19:31:34 -04:00
Nick Winter	6dc2a48b75	Tracking time spent reading initial guides.	2014-07-13 16:07:15 -07:00
Ruben Vereecken	bd7c2d0d36	Bootstrappified Wizard Settings modal	2014-07-14 00:25:24 +02:00
Ruben Vereecken	9db84befa6	Set up a 301 Redirect for account/profile instead of a backbone redirect	2014-07-13 22:34:32 +02:00
Scott Erickson	ebfb329da7	Fixed a bug where pressing escape would not properly end scripts in the session state.	2014-07-13 13:11:45 -07:00
Jayant Jain	deecd7d2ff	Deletes previously randomised thangs when generating again	2014-07-14 01:34:32 +05:30
Jayant Jain	b934d22cbd	Batches insertion of thangs to treema to speed up terrain generation	2014-07-14 01:34:32 +05:30
Jayant Jain	1e5edb5efd	Moves randomise modal template and view to editor/level/modal	2014-07-14 01:34:32 +05:30
Jayant Jain	be223197df	Updates i18n tags and en.coffee	2014-07-14 01:33:45 +05:30
Scott Erickson	667ea14442	Merge branch 'mediator-schema' of https://github.com/jthemphill/codecombat into jthemphill-mediator-schema	2014-07-13 12:20:11 -07:00
Scott Erickson	3b6d17286b	Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.	2014-07-13 12:19:51 -07:00
Ruben Vereecken	9c0353a2f0	Merged in master	2014-07-13 21:18:32 +02:00
Dmitry	e60832bcfa	Update ru.coffee some fixes	2014-07-13 23:13:42 +04:00
Nick Winter	202a562c51	Merge pull request #1303 from maryannv/patch-1 Add space before "Contribute"	2014-07-13 12:08:27 -07:00
Scott Erickson	843ed97643	Another fix for mongoose i18n locale object hack.	2014-07-13 10:05:58 -07:00
Nick Winter	868a6ed43b	Fixed a couple i18n issues. Fixed #1302 .	2014-07-13 09:31:56 -07:00
Nick Winter	49e6ed13ba	Fixed LatestVersionReferenceNode's collection initialization.	2014-07-13 09:11:06 -07:00
Nick Winter	373c1688ed	Merge pull request #1287 from rubenvereecken/user_patch Noty errors don't show up on user save fails anymore	2014-07-13 08:54:20 -07:00
Nick Winter	8a7e7e82a0	Let's try a heads-up whenever there's a JS error.	2014-07-13 08:37:39 -07:00
Nick Winter	83248f039c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-13 07:52:35 -07:00
Nick Winter	39f6874682	Merge pull request #1304 from Imperadeiro98/master Update pt-PT.coffee	2014-07-13 07:48:42 -07:00
Dmitry	b1aa0a1973	update ru.coffee	2014-07-13 15:33:50 +04:00
Maryann Vellanikaran	f9c92d2731	Add space before "Contribute" Before: http://cl.ly/image/0p1f1P1D0P2d After: http://cl.ly/image/3a0x12070C28	2014-07-12 15:45:53 -07:00
Nick Winter	d48f5256a7	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-12 10:19:19 -07:00
Scott Erickson	f4b22fedc9	Tweaking the visuals for the i18n treema node to mostly ignore the property required to get around mongoose not handling empty objects.	2014-07-12 09:58:28 -07:00
Scott Erickson	8cb7cd770c	Fixed i18n population because mongoose has problems with empty objects.	2014-07-12 09:58:28 -07:00
Jeff Hemphill	a8d369ed1a	Add schemas for tome subscriptions	2014-07-12 01:55:35 -07:00
Imperadeiro98	178e147565	Update pt-PT.coffee	2014-07-12 08:54:16 +01:00
Nick Winter	89dc724d31	Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay Centered CoordinateDisplay background and label	2014-07-11 20:48:53 -07:00
Pete DiSalvo	e3183650c5	Centered CoordinateDisplay background and label	2014-07-11 22:10:13 -04:00
Nick Winter	c62f5f3fa0	Skipping docs for language-inappropriate entries in spell palette.	2014-07-11 18:42:55 -07:00
Nick Winter	f13f0ddfef	Merge pull request #1296 from dreamist/patch-1 Update th.coffee	2014-07-11 18:11:57 -07:00
Nick Winter	17ba4bc8a7	Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.	2014-07-11 18:07:00 -07:00
Nick Winter	788562f2ea	Merge pull request #1295 from Imperadeiro98/master Updated some strings	2014-07-11 14:28:29 -07:00
Michael Schmatz	fede037e89	Fixed time NaN	2014-07-11 13:55:31 -07:00
dreamist	ca78638a21	Update th.coffee One fix and a few more translations	2014-07-12 03:07:58 +07:00
Imperadeiro98	bad11f0eea	Update pt-PT.coffee	2014-07-11 19:08:14 +01:00
Imperadeiro98	d4c21e0349	Update pt-PT.coffee	2014-07-11 18:34:22 +01:00
Imperadeiro98	ef9ea0c489	Fixed a issue with headers There was a issue with the headers that is now corrected.	2014-07-11 18:12:12 +01:00
Imperadeiro98	6f94b0ce6f	Update pt-PT.coffee	2014-07-11 15:18:26 +01:00
Imperadeiro98	a979c32567	Update pt-PT.coffee	2014-07-11 15:17:16 +01:00
Nick Winter	65e39ad4e3	Propagated i18n updates.	2014-07-10 19:24:44 -07:00
Nick Winter	45545796a0	Fixes, tweaks, and i18n for the employers page.	2014-07-10 19:17:51 -07:00
Nick Winter	3d5cd29519	Removed some logging.	2014-07-10 17:35:59 -07:00
Michael Schmatz	80e7b7664e	Changed employer artisanal message font	2014-07-10 15:42:45 -07:00
Nick Winter	f17e24013b	Fixed #1217 (scaleFactor, debug shapes).	2014-07-10 14:22:15 -07:00
Jayant Jain	d6928eb1c4	Removes okay button, hides modal upon generation	2014-07-11 01:43:51 +05:30
Jayant Jain	a76a79bb9d	Fixes bug with placing addThang after randomise	2014-07-11 01:07:24 +05:30
Jayant Jain	5fb4f161d0	Removes console logs	2014-07-11 00:01:19 +05:30
Jayant Jain	da0b0d9830	Big terrain generator commit - 1.Adds method for randomising decorations/doodads 2.Creates presets 3.Adds thang clusters which can be used to create presets easily	2014-07-11 00:01:19 +05:30
Jayant Jain	dbe464df16	Removes console logs	2014-07-11 00:01:19 +05:30
Jayant Jain	b401b04893	Adds randomiseFloor and randomiseBorder functions	2014-07-11 00:01:19 +05:30
Jayant Jain	38bed0ee93	Random thangs are now created and positioned in the thangs view	2014-07-11 00:01:19 +05:30
Jayant Jain	74205b31d2	Adds code for passing randomised thangs to thang view	2014-07-11 00:01:18 +05:30
Jayant Jain	1436a4dac7	Cleans up some css for terrain generator modal	2014-07-11 00:01:18 +05:30
Jayant Jain	813ecaa59c	Adds randomise option to dropdown on editor page	2014-07-11 00:01:18 +05:30
Jayant Jain	c40da260f0	Adds initial modal and view for terrain generator	2014-07-11 00:01:18 +05:30
Jayant Jain	efa2bee08c	Adds shortcuts for undo/redo for thangs tab view	2014-07-11 00:01:18 +05:30
Scott Erickson	a3c524424c	Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users	2014-07-10 11:13:28 -07:00
Nick Winter	9ee373428f	Fixed some schema issues related to snippets and code languages.	2014-07-10 08:31:40 -07:00
Ruben Vereecken	750d94c478	Noty errors don't show up on user save fails anymore	2014-07-10 10:30:23 +02:00
nemoyatpeace	8700da6570	Update play_view.coffee Added my level to the page.	2014-07-10 09:19:59 +08:00
Michael Schmatz	013ace65f6	Basic email structure plus distributed locking system	2014-07-09 16:24:14 -07:00
Nick Winter	a48fe4f18f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-09 15:34:22 -07:00
Nick Winter	bcf3c19f81	Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.	2014-07-09 15:32:57 -07:00
Nick Winter	833d59fb1f	Merge pull request #1282 from Alphir/patch-1 Update fr.coffee	2014-07-09 14:17:51 -07:00
Nick Winter	4b16e2fc57	Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master	2014-07-09 13:53:58 -07:00
Nick Winter	ca847329b1	Merge branch 'dkundel-feature/fullscreen-editor'	2014-07-09 13:41:57 -07:00
Nick Winter	0ed8d2b371	Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.	2014-07-09 13:41:42 -07:00
Alphir	0ee0b2d5e3	Update fr.coffee	2014-07-09 22:13:05 +02:00
Darredevil	4309bfbe67	new Documentation page	2014-07-09 23:01:53 +03:00
Scott Erickson	d74a778f67	Made creating components open to everyone!	2014-07-09 12:21:32 -07:00
Nick Winter	44e5c2826c	Proper Treema node behavior for different code languages in default code, property documentation, and snippets.	2014-07-09 11:59:27 -07:00
Ruben Vereecken	ac95d775e6	Users can now be gotten by slug	2014-07-09 20:23:05 +02:00
Scott Erickson	3fbce8334d	Fixed #1276	2014-07-09 10:47:02 -07:00
Ruben Vereecken	5dc54c784d	Added case and demo for user not found. Should be made prettier as soon as users can be queried by name	2014-07-09 18:13:22 +02:00
Ruben Vereecken	b065a524c1	Got down the basic layout for achievement overview Achievement style is now compatible between overview and popup	2014-07-09 15:06:47 +02:00
gosnat	4d50a6d76a	Update play_view.coffee Added "Guide Everyone Home" level	2014-07-09 08:02:58 -05:00
Nick Winter	928e4362ba	Made some style tweaks to the employers page to move the filters into a sidebar when authorized.	2014-07-08 20:47:22 -07:00
Nick Winter	c19a31a58c	Fixed some wizard positioning issues in multiplayer.	2014-07-08 18:51:10 -07:00
Nick Winter	31be904b03	Working on flippable tile highlight bounds marks.	2014-07-08 16:43:36 -07:00
Michael Schmatz	21d056ff01	Instant application of filters	2014-07-08 11:19:14 -07:00
Michael Schmatz	bbc793b003	Fixed modal popping up when logging out sometimes	2014-07-08 10:42:36 -07:00
Michael Schmatz	aa40257034	Table styling/ copy edit	2014-07-07 23:23:36 -07:00
Michael Schmatz	e71ca28f02	Implement candidate filter counts next to filters	2014-07-07 21:43:30 -07:00
Michael Schmatz	e294f344c4	Move featured candidates to top of sort	2014-07-07 21:29:48 -07:00
Michael Schmatz	08b9a8fdaa	Various changes to education filter	2014-07-07 21:04:12 -07:00
Michael Schmatz	30745a25ca	Consolidated iOS and Android into Mobile	2014-07-07 20:24:29 -07:00
Nick Winter	9381a4dec6	Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups.	2014-07-07 20:16:00 -07:00
Nick Winter	d414ed64ec	Merge pull request #1264 from kinez/patch-12 Update hu.coffee	2014-07-07 20:13:36 -07:00
Michael Schmatz	285c7ff049	Added school changes to schema	2014-07-07 20:05:28 -07:00
Michael Schmatz	cef8fe074a	Add mobile developer to the schema	2014-07-07 20:03:02 -07:00
Michael Schmatz	9313541f9f	Fixed targeting on employers CSS	2014-07-07 20:02:01 -07:00
Michael Schmatz	30671d82f6	Removed PM and Management from filters	2014-07-07 19:52:31 -07:00
Michael Schmatz	05560662dd	Various fixes to employer page/profile view	2014-07-07 19:34:36 -07:00
Scott Erickson	fd564fa2d4	Merge pull request #1261 from Imperadeiro98/master Translated some more strings	2014-07-07 18:50:20 -07:00
Scott Erickson	c1f77e3f07	Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch	2014-07-07 18:48:26 -07:00
Scott Erickson	5d00aedac7	Widened the click area on the wizard settings view for color config.	2014-07-07 18:13:19 -07:00
Scott Erickson	1263d4724a	Fixed the title in the gold view to handle when goldEarned isn't available.	2014-07-07 16:56:47 -07:00
Scott Erickson	49c8360d5b	Fixed me emitting 'me:synced' and anything listening for that.	2014-07-07 16:53:34 -07:00
Scott Erickson	908772d8fe	Fixed an instance where a level loading callback was erroring if called before the surface was built.	2014-07-07 16:44:18 -07:00
Scott Erickson	61e6c8dfc3	Fixed the gold view not showing numbers until the first change.	2014-07-07 16:05:23 -07:00
Scott Erickson	2a309c149c	Enabled submitting patches for thangs and articles.	2014-07-07 15:19:22 -07:00
Michael Schmatz	0305374580	Add featured field to curation	2014-07-07 10:42:16 -07:00
Michael Schmatz	b76239b4e9	Replaced candidate avatars on employer page	2014-07-07 10:29:35 -07:00
Scott Erickson	12543cf4dd	Added the foundation of a component docs view.	2014-07-07 10:11:02 -07:00
Scott Erickson	86a3fbacd1	Made the CocoCollection more strict about setting the model property.	2014-07-07 10:11:02 -07:00
Michael Schmatz	3151db6fc5	Hide briefcase when no work history	2014-07-07 09:49:13 -07:00
Ruben Vereecken	ea3d1fee74	Starting on achievement overview style	2014-07-07 15:03:28 +02:00
Imperadeiro98	d9d1d25c3c	Update pt-PT.coffee	2014-07-07 13:31:03 +01:00
Ruben Vereecken	9055612b24	Fixtures set up, demo start	2014-07-07 12:47:32 +02:00
Ruben Vereecken	b5702bc314	Added simple demo page	2014-07-07 12:11:43 +02:00
Ruben Vereecken	75b738f126	User loading now have async callbacks	2014-07-07 12:03:48 +02:00
Scott Erickson	aea1d0e8f2	Changed the angel logigng to use info instead of log, to more easily differentiate.	2014-07-06 15:01:39 -07:00
Scott Erickson	850712442d	Added underscore.string to the worker.	2014-07-06 15:01:20 -07:00
Scott Erickson	a2740279bc	Added styling for tables in the guide.	2014-07-06 15:00:51 -07:00
Ruben Vereecken	ec78f95da1	Prepared things for Scott	2014-07-06 23:16:00 +02:00
Ruben Vereecken	1b9c8b0066	Got users and achievements to load in a neat way	2014-07-06 22:48:33 +02:00
Ruben Vereecken	128008daa1	Hid the progress bar on load failed	2014-07-06 21:48:31 +02:00
Ruben Vereecken	10735867a4	Got some basic hierarchy set up for user view and template inheritance	2014-07-06 21:10:28 +02:00
Ruben Vereecken	e33bb44ffc	Start of new user routing and views are there	2014-07-06 20:45:27 +02:00
Ruben Vereecken	51bc8e5a7c	Merged master	2014-07-06 20:07:47 +02:00
Ruben Vereecken	1f02b99942	Refactored showNotFound into notFoundView	2014-07-06 20:01:47 +02:00
Scott Erickson	d640dac33a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-06 09:36:12 -07:00
Scott Erickson	37a28cf826	Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor.	2014-07-06 09:35:28 -07:00
Inez KEMENES	cc0e818824	Update hu.coffee	2014-07-06 16:26:51 +02:00
Imperadeiro98	21c180e206	Update pt-PT.coffee	2014-07-06 11:11:44 +01:00
Imperadeiro98	e3bb93c4f5	Update pt-PT.coffee	2014-07-06 10:01:55 +01:00
Imperadeiro98	183b744d07	Update pt-PT.coffee	2014-07-05 22:10:21 +01:00
Scott Erickson	94a6e3961b	Added a button in the level editor to choose which team to play when editing a ladder level.	2014-07-05 13:54:41 -07:00
Imperadeiro98	cc8fec9283	Update pt-PT.coffee	2014-07-05 19:11:58 +01:00
Imperadeiro98	b5ef1742f4	Update pt-PT.coffee	2014-07-05 19:11:06 +01:00
Ruben Vereecken	601c4e2731	Merged with master	2014-07-05 16:47:16 +02:00
Tery Lim	a5476f90ed	Minor cleanup for convention and readability	2014-07-05 18:48:08 +08:00
Scott Erickson	b635c4cf16	Fixes #1220 . Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.	2014-07-04 20:45:42 -07:00
Scott Erickson	dc49499679	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-04 18:12:10 -07:00
Scott Erickson	41a8d21bfe	Merged conflicts.	2014-07-04 18:11:50 -07:00
Scott Erickson	c76032b0af	Merged conflicts.	2014-07-04 18:11:26 -07:00
Scott Erickson	92948e64b5	Merge pull request #1245 from greyhusky/patch-2 new translations	2014-07-04 18:09:02 -07:00
Scott Erickson	be3a428b50	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-04 18:02:12 -07:00
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	81121faebf	Merge pull request #1242 from differentmatt/master Fix Placement Agreement typo	2014-07-04 17:39:38 -07:00
Scott Erickson	4e284d81b7	Handled conflicts, throwing out changes to ladder_tab.coffee.	2014-07-04 17:36:10 -07:00
Scott Erickson	1ce55e356c	Making the ladder tab reload when social network friends load. See #1196 .	2014-07-04 17:32:16 -07:00
Scott Erickson	ca8394621d	Fixes #1223	2014-07-04 11:46:33 -07:00
Scott Erickson	f553a1c493	Merge pull request #1256 from rubenvereecken/patch_fix Patch fix: applyDelta now always called	2014-07-04 11:45:22 -07:00
Ruben Vereecken	08030dc785	Cleaned up patch rendering logic	2014-07-04 20:18:26 +02:00
Ruben Vereecken	44c84b3689	proofed the SearchView's runSearch	2014-07-04 19:36:55 +02:00
Ruben Vereecken	a367082cc4	Corrected statistic logic, wrote test case	2014-07-04 19:27:41 +02:00
Ruben Vereecken	bb1c07570d	added isTranslationPatch method to patches	2014-07-04 19:27:41 +02:00
Ruben Vereecken	fce9f0031b	All edits are now tracked intermediate intermediate	2014-07-04 19:27:38 +02:00
Ruben Vereecken	7a4c6daec8	stats.gamesCompleted is now tracked in users	2014-07-04 19:27:37 +02:00
Ruben Vereecken	39fb2cb1b4	Added achievement preview, exp test, stuff	2014-07-04 19:27:37 +02:00
Ruben Vereecken	45798aab02	added images for achievements! Demo is now operational	2014-07-04 19:27:37 +02:00
Ruben Vereecken	a933f9737d	Creating achievement demo intermediate	2014-07-04 19:27:37 +02:00
Ruben Vereecken	fe5b675d18	Achievement polling now successfully tested Intermediate	2014-07-04 19:27:37 +02:00
Ruben Vereecken	1fe2c67ffe	Added tests for repeatable achievements, including complicated xp Intermediate	2014-07-04 19:27:37 +02:00
Ruben Vereecken	6e4170012f	Made sure applyDelta is called in all cases	2014-07-04 18:38:15 +02:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Tery Lim	329f0e7e22	Clean up for coffeescript convention	2014-07-04 22:23:47 +08:00
Ruben Vereecken	63401025f6	proofed the SearchView's runSearch	2014-07-04 15:13:06 +02:00
Scott Erickson	2855d2a402	Made the deltas lib conflict identifying library able to handle many-to-many conflicts. Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.	2014-07-03 17:41:58 -07:00
Michael Schmatz	cc917162a7	Fixed doober alignment	2014-07-03 17:01:09 -07:00
Michael Schmatz	6a33ca0892	Removed autoscrolling	2014-07-03 16:40:00 -07:00
Michael Schmatz	d3cc9ae179	10 pixel margin on photos	2014-07-03 16:33:10 -07:00
Michael Schmatz	45e3da0945	Hover on logout button	2014-07-03 16:32:20 -07:00
Michael Schmatz	615303395c	Various fixes for recruiting page	2014-07-03 16:30:27 -07:00
Michael Schmatz	6c31f08853	Unchecked all by default	2014-07-03 15:48:50 -07:00
George Saines	4d12aff35e	removing the counselor from the contribute page and all other links	2014-07-03 15:42:24 -07:00
George Saines	6d438319ab	Merge branch 'employer-redesign' of https://github.com/codecombat/codecombat into employer-redesign	2014-07-03 15:17:41 -07:00
George Saines	88b0a0a97b	making changes to the employer page icon dimensions	2014-07-03 15:17:38 -07:00
Michael Schmatz	52ddb8db62	Add login link and rounded corners for pics	2014-07-03 15:10:09 -07:00
Michael Schmatz	3f1547488c	Added login button and fixed bg color	2014-07-03 14:40:39 -07:00
Michael Schmatz	538344094b	Fixed filter behavior	2014-07-03 13:59:10 -07:00
Michael Schmatz	ae63461ef3	Filter functional	2014-07-03 11:39:44 -07:00
Michael Schmatz	b58f2c49eb	Fix description	2014-07-03 10:22:50 -07:00
Michael Schmatz	49e4dd71ae	Merge branch 'master' into employer-redesign Conflicts: app/schemas/models/user.coffee	2014-07-03 10:15:31 -07:00
Michael Schmatz	ed30d3292a	Filter button	2014-07-03 10:14:32 -07:00
Michael Schmatz	e54b190918	Added shortDescription	2014-07-03 10:02:42 -07:00
Imperadeiro98	dbdd8c672c	Update pt-PT.coffee	2014-07-03 14:11:30 +01:00
Imperadeiro98	3b04343034	Update pt-PT.coffee	2014-07-03 14:06:40 +01:00
Imperadeiro98	08a9b4f05b	Update pt-PT.coffee	2014-07-03 13:55:50 +01:00
Michael Schmatz	397140d9b0	Basic filtering Only visas work	2014-07-02 16:47:02 -07:00
Michael Schmatz	fe328a766b	Basic filtering functionality Still has a few bugs	2014-07-02 15:48:26 -07:00
Dominik Kundel	484749400e	Merge remote-tracking branch 'upstream/master'	2014-07-02 20:54:46 +02:00
Dominik Kundel	004a14ae3c	fixed autocomplete issue related to switching the programming language	2014-07-02 20:52:16 +02:00
Michael Schmatz	1adefbb3b6	Update user schema (to avoid cherry picking)	2014-07-02 11:50:44 -07:00
Michael Schmatz	c6cc28b976	Various fixes to enable employers page to function correctly	2014-07-02 11:45:00 -07:00
Michael Schmatz	7eeb964d3e	Restyled employers page	2014-07-02 11:44:45 -07:00
Michael Schmatz	8e6807ab60	Redesigned layout of employers page	2014-07-02 11:44:33 -07:00
Michael Schmatz	fe08fdb2b0	Made new recruitment base styles	2014-07-02 11:43:39 -07:00
Michael Schmatz	5da1db8f6e	Made new recruitment base layout	2014-07-02 11:43:26 -07:00
Michael Schmatz	ebc79668ef	Added image assets for recruitment page	2014-07-02 11:42:02 -07:00
Michael Schmatz	f756a16aa4	Added curated section to user schema	2014-07-02 11:41:14 -07:00
greyhusky	467b9adf74	new translations i translated some parts, will translate more later	2014-07-02 11:33:19 +02:00
Dominik Kundel	3f57644b0b	Merge remote-tracking branch 'upstream/master'	2014-07-01 19:58:01 +02:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Michael Schmatz	2dd4ba6203	Increased max skills from 30 to 40	2014-06-30 16:43:31 -07:00
Matt Lott	ffdd73a503	Fix Placement Agreement typo	2014-06-30 16:01:00 -07:00
Dominik Kundel	568e334f13	Merge remote-tracking branch 'upstream/master'	2014-06-28 12:53:20 +02:00
Dominik Kundel	6ea2f1c76d	added title for tab trigger	2014-06-28 12:53:09 +02:00
Nick Winter	66da53f8f9	Launching the language selector on the front page.	2014-06-27 10:21:38 -07:00
Nick Winter	58bf85d234	Simulator handles when there are no Greed matches to randomly simulate.	2014-06-27 08:50:04 -07:00
Nick Winter	802d43651e	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -07:00
Philippe Rigovanov	dd6209cd99	Update ru.coffee With @M-r-A fixes	2014-06-27 04:33:05 +04:00
Philippe Rigovanov	e138d2eed6	Update ru.coffee With fixes from [M-r-A](https://github.com/M-r-A)	2014-06-27 04:11:46 +04:00
Michael Schmatz	28bb28cf85	Fixed employer view for manually created candidates	2014-06-26 17:07:17 -07:00
George Saines	a94053fd1d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-26 10:38:18 -07:00
George Saines	e294133bcf	adding the files I forgot	2014-06-26 10:38:13 -07:00
Nick Winter	d360ecac94	Merged in the language-war branch.	2014-06-25 23:00:03 -07:00
Nick Winter	aee95ac5c0	Improved per-language spell palette and tab documentation.	2014-06-25 22:56:39 -07:00
Nick Winter	4cebf1f434	Merge pull request #1232 from Darredevil/patch-11 Added new tip tag	2014-06-25 21:23:41 -07:00
Darredevil	c6f19f7d3a	Added new tip tag	2014-06-26 06:23:36 +03:00
Nick Winter	8c6ee66684	Better handling of alternate spell palette documentation syntax for other code languages.	2014-06-25 20:19:11 -07:00
Darredevil	a127cb7a5b	Added a joke tip	2014-06-26 02:11:15 +03:00
Philippe Rigovanov	f2898e3bc0	Update diplomat.jade added myself to diplomats	2014-06-26 00:56:41 +04:00
Inez KEMENES	96f74183a5	Update hu.coffee	2014-06-25 17:28:13 +02:00
Nick Winter	04976a7b14	Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225 .	2014-06-24 21:08:01 -07:00
Nick Winter	512e287b6a	Merge pull request #1184 from greyhusky/patch-1 Update de-CH.coffee	2014-06-24 17:41:32 -07:00
George Saines	b5ec38f811	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-24 16:43:32 -07:00
George Saines	68d7b3997a	modifying the employer page to be more explanatory	2014-06-24 16:43:27 -07:00
Nick Winter	dd9b8a0018	Migrating from tileGroupNumber to tileGroupLetter.	2014-06-24 16:32:44 -07:00
Nick Winter	580d002a98	Messing with marks.	2014-06-24 15:45:33 -07:00
Michael Schmatz	e3a87156a2	Send BCC email to employer when contacting candidates	2014-06-24 14:35:30 -07:00
Scott Erickson	9b873cfab4	Patch modal handles invalid patches.	2014-06-24 17:25:01 -04:00
Scott Erickson	ee0b14eb61	Changed the versions history modal to show name and date.	2014-06-24 16:41:55 -04:00
Scott Erickson	327d273cbe	Fixed gplus login.	2014-06-24 14:44:37 -04:00
Michael Schmatz	988ad6ffda	Attempting to fix G+	2014-06-24 11:29:43 -07:00
Scott Erickson	0363166736	Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.	2014-06-24 13:23:31 -04:00
Nick Winter	6a31e0bcd3	Fixed bug showing spell palette for languages missing any code snippets.	2014-06-24 10:17:38 -07:00
Nick Winter	8719b80663	Showing expired profiles to admins.	2014-06-24 10:15:38 -07:00
Nick Winter	abcc75a6f2	A bit of error logging for #1220 .	2014-06-24 09:43:20 -07:00
Nick Winter	3862bd2376	Clearing backups of old models when saving new versions of versioned models.	2014-06-24 09:43:20 -07:00
Scott Erickson	dde43d5df3	Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups.	2014-06-23 16:57:54 -04:00
Nick Winter	815ef88e78	Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.	2014-06-23 10:36:42 -07:00
Michael Schmatz	27774cdf0f	Fix #1207	2014-06-23 09:46:39 -07:00
Darredevil	4ca1d2bfeb	Added new level "K-means++ Cluster Wars" Added new level "K-means++ Cluster Wars"	2014-06-23 03:43:54 +03:00
Nick Winter	a267933f0b	Merge pull request #1200 from Airunedz/patch-1 Improve Spanish (Spain) translations	2014-06-22 15:39:43 -07:00
Philippe Rigovanov	f7ec30a586	Update ru.coffee	2014-06-23 01:55:45 +04:00
Nick Winter	105d22c802	Merge pull request #1202 from kumabotz/minor-cleanup Minor cleanup	2014-06-22 07:56:15 -07:00
Nick Winter	8698589625	Applying Scott's fix for #1198 .	2014-06-22 07:55:29 -07:00
Tery Lim	f03f8da50a	Remove extra spaces	2014-06-22 16:42:06 +08:00
Tery Lim	32868b565d	Fix typo	2014-06-22 16:39:51 +08:00
Tery Lim	88c84911b7	Remove trailing comma	2014-06-22 16:39:07 +08:00
Nick Winter	81f8334f37	Some fixes for CocoSprite alphas.	2014-06-21 22:31:10 -07:00
Airunedz	dfff43d66a	Improve Spanish (Spain) translations Changes: Add some translations to Spanish (I'm from Spanin)	2014-06-22 01:07:05 +02:00
Nick Winter	1f29a923cf	Fixed playing multiplayer levels without an opponent, against the AI.	2014-06-21 12:24:14 -07:00
Nick Winter	6813279871	Fixed an infinite loop timeout issue.	2014-06-21 10:56:55 -07:00
Nick Winter	a8f4baebbc	Restricted some more analytics.	2014-06-21 09:47:48 -07:00
Nick Winter	564c463431	Stop tracking Simulator events to Mixpanel.	2014-06-21 09:17:56 -07:00
Nick Winter	52b2e756ef	Merge pull request #1195 from thanosme/patch-1 Update el.coffee	2014-06-21 08:44:43 -07:00
Thanasis Manousos	5e2dececb5	Update el.coffee	2014-06-21 18:31:26 +03:00
Nick Winter	dde71485bf	A bit of cleanup.	2014-06-20 20:52:50 -07:00
Nick Winter	17366af245	Merge pull request #1188 from a1ip/master Update ru.coffee	2014-06-20 20:49:19 -07:00
Nick Winter	d8e1fa880c	Merge pull request #1181 from djsmith85/patch-1 Update de.coffee	2014-06-20 20:45:27 -07:00
Nick Winter	d3d9908ef2	Merge pull request #1180 from djsmith85/patch-2 Update de-DE.coffee	2014-06-20 20:45:02 -07:00
Nick Winter	ac0f6e74aa	Merged.	2014-06-20 20:41:34 -07:00
Nick Winter	60ca6e46d3	Ooops, that's a function.	2014-06-20 18:45:57 -07:00
Nick Winter	c9dcc290cb	Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.	2014-06-20 17:19:18 -07:00
Fergus Leen	88aa8d234c	Facebook friends patch	2014-06-20 02:18:40 +01:00
Nick Winter	bb8b9b2e93	bid -> makeBid.	2014-06-19 17:27:41 -07:00
Michael Schmatz	34f5377754	Increased infinite loop timeout	2014-06-19 17:16:08 -07:00
Michael Schmatz	40fd1674ad	Temporary fix for bid function in hover debugger	2014-06-19 17:09:45 -07:00
Nick Winter	7b59c42f5d	Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.	2014-06-19 15:41:35 -07:00
thanosme	625750614a	Update el.coffee Added some tranlations with minor corrections	2014-06-20 01:14:30 +03:00
Nick Winter	1e9b403ce5	More zazz for home page code language selection.	2014-06-19 14:55:16 -07:00
Nick Winter	cf57411b5c	Added another logging message for more easily seeing when transpiled code might be misfiring.	2014-06-19 13:42:38 -07:00
Nick Winter	666c020389	Switching code language based on selection now.	2014-06-19 13:42:25 -07:00
Scott Erickson	20589db6be	Fixed a bug with logging missing documentation.	2014-06-19 16:15:38 -04:00
Nick Winter	a58f3e0fb6	More styling work on code language selector.	2014-06-19 12:31:56 -07:00
Michael Schmatz	51923459e0	Changed autocomplete to on by default	2014-06-19 10:44:44 -07:00
Michael Schmatz	2559a73244	Merge pull request #1186 from dkundel/master Initial Autocomplete Version	2014-06-19 10:10:26 -07:00
Michael Schmatz	a1b7025730	Emergency linkedin hot fix	2014-06-19 08:36:22 -07:00
Nick Winter	2e850dba78	Working on home language selection.	2014-06-19 08:06:34 -07:00
Philippe Rigovanov	ebaeac7e80	Some translations	2014-06-19 05:42:15 +04:00
Dominik Kundel	7e8845332e	updated Ace minified	2014-06-18 23:27:05 +02:00
Dominik Kundel	69959b6b05	updated Ace	2014-06-18 23:18:58 +02:00
Michael Schmatz	548eaefae1	Add debug variable inspection progress bar	2014-06-18 13:43:04 -07:00
Dominik Kundel	33d68fab6e	Merge remote-tracking branch 'upstream/master'	2014-06-18 21:50:55 +02:00
Nick Winter	ac6c7292c8	Fixed Gridmancer session linking on profile view.	2014-06-18 12:05:40 -07:00
Scott Erickson	50fea7e937	Added a method for returning all requests in mock-ajax.	2014-06-18 12:04:39 -04:00
Scott Erickson	d651885524	Maybe fixing the toggleModal system once and for all.	2014-06-18 12:04:38 -04:00
Dominik Kundel	d3e0299465	merge conflict solved	2014-06-18 17:59:26 +02:00
Dominik Kundel	f6355b034b	integrated autocomplete	2014-06-18 17:57:42 +02:00
greyhusky	6fe9623244	Update de-CH.coffee Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)	2014-06-18 11:09:10 +02:00
Nick Winter	59654da24b	Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.	2014-06-17 22:17:44 -07:00
Nick Winter	4bd02ba6dc	ModelModal now grants real ultimate power.	2014-06-17 15:17:25 -07:00
djsmith85	2fff271200	Update de-DE.coffee Updated a few translations in the German locale file.	2014-06-17 23:52:57 +02:00
djsmith85	5a90a7c880	Update de.coffee Updated a few translations in the German locale file and merged the translations from de-DE.coffee	2014-06-17 23:52:54 +02:00
Nick Winter	0b8a0c8f6f	Added UserRemarks.	2014-06-17 13:03:13 -07:00
Scott Erickson	3e24b2f86e	Fixed tests running in karma.	2014-06-16 11:40:09 -07:00
Scott Erickson	d6bb7ffe81	Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.	2014-06-16 11:40:09 -07:00
Scott Erickson	ee791da34c	Moved services into their own folder, and made no services run for both testing and demo pages.	2014-06-16 11:40:09 -07:00
Ruben Vereecken	1c671a3c25	Refactored vendor loading	2014-06-16 11:40:09 -07:00
Ruben Vereecken	2e40a53674	Extracting third party scripts out of main	2014-06-16 11:40:08 -07:00
Scott Erickson	4932317982	Finally got the demo view working (mostly). Need to turn off third party ajax requests.	2014-06-16 11:40:08 -07:00
Scott Erickson	1786eab09d	Initial work on a demo view. But brunch won't build demo-app.js for some reason.	2014-06-16 11:40:08 -07:00
Nick Winter	9a64ca5973	A few misc fixes.	2014-06-16 10:49:20 -07:00
Nick Winter	3d2bee3256	Merge pull request #1168 from kinez/patch-9 Update hu.coffee	2014-06-16 08:22:21 -07:00
Nick Winter	7198a8fc42	Merge pull request #1166 from ChrisLightman/patch-6 Upsate /// Translate	2014-06-16 08:21:56 -07:00
Nick Winter	0418d80c6d	Merged.	2014-06-16 08:12:52 -07:00
Inez KEMENES	c611cafa25	Update hu.coffee	2014-06-16 16:39:02 +02:00
Dominik Kundel	9a3ba70ea2	Merge remote-tracking branch 'upstream/master'	2014-06-16 14:30:22 +01:00
Dominik Kundel	25a0447d77	autocomplete	2014-06-16 14:29:01 +01:00
Clement	931f3ea330	Upsate /// Translate Enjoy	2014-06-16 11:38:25 +02:00
barbuddha	ff5f46e5fb	Update ru.coffee	2014-06-16 08:43:27 +04:00
Nick Winter	66e2805a9a	Added StackLead integration. Employerified profile backgrounds.	2014-06-14 20:59:28 -07:00
Nick Winter	babfa04a9e	Fixed a tiny typo.	2014-06-14 18:02:22 -07:00
djsmith85	a22a098fdc	Update de-DE.coffee	2014-06-14 14:02:42 +02:00
Nick Winter	ff0d842871	Better employer contact message.	2014-06-13 16:04:11 -07:00
Michael Schmatz	84601d2927	Added more info email field to employer signup	2014-06-13 15:38:47 -07:00
Nick Winter	21e7487132	Showing more skills in employer table for better searching. Hid employer selling copy after sold.	2014-06-13 14:52:50 -07:00
Scott Erickson	a1dd9a714e	Fixed #1153 .	2014-06-13 13:35:57 -07:00
Scott Erickson	8f4e1b4bf0	Making the ModelModal look better.	2014-06-13 10:11:01 -07:00
Scott Erickson	6c87d5792d	One last fix to the search url.	2014-06-13 09:52:34 -07:00
Nick Winter	79cbc4bb25	Propagated i18n.	2014-06-13 08:50:52 -07:00
Nick Winter	4c57ff7501	Fixed LevelComponent search collection in level editor.	2014-06-13 08:48:29 -07:00
Nick Winter	1502cdc64b	Merge branch 'jayant1992-master'	2014-06-13 08:17:12 -07:00
Dominik Kundel	e756c83d9e	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:14:31 +01:00
Dominik Kundel	603766b8c5	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:12:55 +01:00
Nick Winter	27f2b9acb1	Merge pull request #1151 from kumabotz/remove-unicode Remove unicode from url regex pattern	2014-06-13 08:11:59 -07:00
Nick Winter	2bda60796a	Copy / i18n tweaks for tournament ending and employers blurb.	2014-06-13 08:08:13 -07:00
Tery Lim	c3b72e025a	Remove unicode from url regex pattern	2014-06-13 10:30:29 +08:00
Nick Winter	1b2c4e078c	Fixed candidates viewing their own code and resetting it.	2014-06-12 17:52:08 -07:00
Nick Winter	28264d5ace	Added tournament results and a way to email them out.	2014-06-12 17:52:08 -07:00
George Saines	03aa0783b1	a few copy edits	2014-06-12 16:13:48 -07:00
George Saines	3415b62663	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-12 16:01:39 -07:00
George Saines	fb7b3f8580	adding a top info arena on top of the employers page	2014-06-12 16:01:34 -07:00
Michael Schmatz	32a041a5a7	Made max size of canvas much bigger for spectate view	2014-06-12 15:48:11 -07:00
Scott Erickson	152b860a23	Hotfix for the profile view.	2014-06-12 14:44:55 -07:00
Scott Erickson	994e4773ca	Reverting the objectId schema.	2014-06-12 13:19:06 -07:00
Scott Erickson	8ab69cf833	Merge pull request #1138 from rubenvereecken/search-endpoint Search endpoint is now without the /search prefix	2014-06-12 11:33:28 -07:00
Scott Erickson	c855327cef	Merge pull request #1150 from rubenvereecken/achievements Achievements - Update with some tests and admin endpoint	2014-06-12 11:28:25 -07:00
Ruben Vereecken	dcdcca751f	Fiddled with creating xp functions	2014-06-12 19:44:56 +02:00
Ruben Vereecken	aecf937722	Cleaned up achievement testing environment Made sure server sided tests work completely	2014-06-12 19:41:07 +02:00
Ruben Vereecken	2a5c2020ca	Added recalculation button to the achievement editor	2014-06-12 19:41:07 +02:00
Ruben Vereecken	509be067c3	Added support for the operator in LocalMongo	2014-06-12 19:41:00 +02:00
Ruben Vereecken	bd2b289943	Recalculate script mainly finished	2014-06-12 19:40:59 +02:00
Ruben Vereecken	a61d0e5569	Added support for diminished exp for repeatables. Needs tweaking though.	2014-06-12 19:40:59 +02:00
Ruben Vereecken	7096a07ce8	Improved logging (winston) and admin-only'd the achievement editor	2014-06-12 19:40:59 +02:00
Ruben Vereecken	5aa211cabd	Got repeatables working flawlessly and improved the achievement popup by a great deal	2014-06-12 19:40:59 +02:00
Ruben Vereecken	2c04025a5a	Created a test environment for repeatables	2014-06-12 19:40:59 +02:00
Ruben Vereecken	b0666ace0d	Refactorings performed necessary to have searchable for more uses	2014-06-12 19:40:59 +02:00
Ruben Vereecken	0751581113	Search endpoint is now without the /search prefix Intermediate commit for search refactoring	2014-06-12 19:19:30 +02:00
Lucas Castro	ebf0cba45d	Update pt-BR.coffee	2014-06-12 10:11:49 -03:00
oaugereau	f7ee40a3a2	Update fr.coffee	2014-06-12 14:39:41 +02:00
oaugereau	0d5e213daa	Update fr.coffee	2014-06-12 14:17:36 +02:00
oaugereau	028feaafc6	Update fr.coffee	2014-06-12 09:42:57 +02:00
Nick Winter	77920b5416	Improvements to profile views. Added links to players' code.	2014-06-11 19:38:47 -07:00
Scott Erickson	8a728cbb64	More switching of user objects from save to patch.	2014-06-11 14:17:31 -07:00
Scott Erickson	4ecbc73c1c	Fixed client side testing on karma/travis with the new FacebookHandler tests.	2014-06-11 13:43:07 -07:00
Jayant Jain	ed95206868	Enables moving around the map while an addThang is selected	2014-06-12 01:50:24 +05:30
Scott Erickson	6d15b5e631	Working on User patching.	2014-06-11 13:16:17 -07:00
Scott Erickson	e6dc896bab	Reworking some code to use the new CocoModel.patch method.	2014-06-11 11:34:52 -07:00
Lucas Castro	60a0a6ee80	Update pt-BR.coffee	2014-06-11 14:04:19 -03:00
Lucas Castro	fe9e584767	Update pt-BR.coffee	2014-06-11 14:00:52 -03:00
Nick Winter	cb378c13e2	Fixed employer list template typo.	2014-06-11 09:15:41 -07:00
Nick Winter	a9356fdc93	Merge pull request #1142 from Xercoy/patch-1 Added more names for #53	2014-06-11 07:24:55 -07:00
Jayant Jain	d5d20377a2	Removes panning upon right click in editor	2014-06-11 15:05:59 +05:30
barbuddha	d361ab5809	Update ru.coffee	2014-06-11 09:56:15 +04:00
Scott Erickson	389d530eaa	Built a new 'patch' method for CocoModel, which saves only changed values to the server.	2014-06-10 20:59:37 -07:00
Nick Winter	69fc378930	Final tournament update blurb.	2014-06-10 16:51:36 -07:00
Nick Winter	f3d18efa90	Added employer_list and activity tracking.	2014-06-10 16:30:13 -07:00
Scott Erickson	f0ff8c242e	Migrating language to codeLanguage on systems and components because they conflict with the search system.	2014-06-10 13:20:14 -07:00
Corey Prak	8448061f7b	Added more names for #53	2014-06-10 12:52:06 -04:00
Nick Winter	86223167af	Re-added significant trailing whitespace.	2014-06-10 07:46:43 -07:00
Lucas Castro	132a7b62f1	Update pt-BR.coffee	2014-06-10 11:04:02 -03:00
Nick Winter	22ca9507d0	Upgrades to employer's candidate indexing.	2014-06-09 22:17:53 -07:00
Nick Winter	dd2c7fab60	Updated Danger Minefield icon.	2014-06-09 21:11:59 -07:00
Darredevil	82f33a35de	Fixed id	2014-06-09 22:37:34 +03:00
Darredevil	da1d0e5361	Added new level Added a new prime-sieve level	2014-06-09 22:29:02 +03:00
Michael Schmatz	693da57f13	Merge branch 'feature/linkedin-profile-import' Conflicts: app/templates/account/profile.jade app/views/account/profile_view.coffee	2014-06-08 18:37:33 -07:00
Michael Schmatz	ad80fcf229	Removed linkedIn callback, disabled autosave	2014-06-08 18:21:56 -07:00
Michael Schmatz	f29a41f108	Add linkedIn link, field of study support to LinkedIn import	2014-06-08 18:15:18 -07:00
Nick Winter	bb5d23e6ba	Wrapped LinkedIn button in a .btn.	2014-06-08 18:51:45 -06:00
Michael Schmatz	7ec3910e36	Make LinkedIn import more robust	2014-06-08 17:38:02 -07:00
Nick Winter	6597b687eb	Only start profiles in edit mode if they are yours.	2014-06-08 11:52:16 -06:00
Scott Erickson	1b166028c6	Turned off Backbone.Mediator validation for tests.	2014-06-07 19:08:38 -07:00
Nick Winter	cefeb1df14	Fixed backwards Approved button and candidate time sort.	2014-06-07 19:58:33 -06:00
Scott Erickson	01c20f4065	Fixed karma tests.	2014-06-07 18:15:57 -07:00
Scott Erickson	5104f0a1e7	Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842	2014-06-07 16:41:19 -07:00
Scott Erickson	2cbc33d66d	Fixed jasmine-ajax setup/reset.	2014-06-07 16:41:19 -07:00
Nick Winter	63a3aa9074	Fixes for browsing profiles by username.	2014-06-07 17:33:14 -06:00
Michael Schmatz	4072c1b969	Basic functionality done, needs validation error handling As well as formatting	2014-06-07 11:45:49 -07:00
Nick Winter	67b10474e8	Suggested improvements to profile pages.	2014-06-07 00:33:18 -06:00
Scott Erickson	f0cdf6b2e2	Fixed #1111 .	2014-06-06 16:47:48 -07:00
Nick Winter	d00c4c2af3	Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee.	2014-06-06 15:39:03 -06:00
Michael Schmatz	0c0084dd4b	Make single game simulate another task if error	2014-06-06 13:26:15 -07:00
Michael Schmatz	31bb9c8807	Fixed error handling for results with no taskID	2014-06-06 12:47:10 -07:00
Michael Schmatz	1486f31c37	Stop headless simulator from exiting if error	2014-06-06 12:26:28 -07:00
Michael Schmatz	24452026d1	Minor fix for simulator logic	2014-06-06 12:18:02 -07:00
Nick Winter	51f7aa1743	Merge pull request #1130 from Nichiatu/patch-1 Updates to norwegian translation	2014-06-06 10:17:19 -06:00
Scott Erickson	49c9c6bfc9	Built the client test view (rebased from feature/testclient).	2014-06-05 16:56:29 -07:00
Nichlas Torgersen	657182c8c0	Updates to norwegian translation I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it. Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.	2014-06-06 01:44:05 +02:00
Nick Winter	47b99adddf	Uncommented some fr.coffee section headers to go with the new translations.	2014-06-05 10:28:40 -06:00
Clement	9895432dd2	Syntax Update and Traduction Update	2014-06-05 18:03:33 +02:00
Clement	a7d0b540cd	Big Update /// Syntax Correction and Traduction	2014-06-05 13:35:03 +02:00
Nick Winter	0b2d5c251d	A bit more Worker hardening.	2014-06-04 15:47:09 -06:00
Nick Winter	f493f407c2	Fixed some bugs on job profile initialization.	2014-06-04 15:38:57 -06:00
Scott Erickson	8f6187125d	Fixed saving new settings for a level.	2014-06-03 12:27:53 -07:00
Nick Winter	143597dc0f	Merge pull request #1124 from ChrisLightman/patch-2 Update Line 723-734 : Full Traduction	2014-06-03 08:26:54 -07:00
Nick Winter	bebb200090	Merge pull request #1122 from ChrisLightman/patch-1 Update fr.coffee	2014-06-03 08:26:44 -07:00
Ruben Vereecken	ed44ab5f7d	Improved logging (winston) and admin-only'd the achievement editor	2014-06-02 21:07:23 +02:00
ChrisLightman	12da959550	Update Line 723-734 : Full Traduction	2014-06-02 20:52:49 +02:00
Ruben Vereecken	8d2c62ba84	Got repeatables working flawlessly and improved the achievement popup by a great deal	2014-06-02 20:34:05 +02:00
Ruben Vereecken	bb57756cd9	Processed Scott's feedback. Db endpoint slightly safer, some refactorings.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	8607162cd7	Finished designing achievement notify, for now.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d8bb802468	Designing the Notify to show level progress	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d766a24e11	Achievements now popup when polled for by the client	2014-06-02 20:33:01 +02:00
Ruben Vereecken	aa3fedeb02	Achievements can have icons. Users now have their scores denormalized	2014-06-02 20:32:00 +02:00
Ruben Vereecken	287019242f	Achievement queries are now strings server sided but remain objects for the client	2014-06-02 20:32:00 +02:00
Ruben Vereecken	c26f96f33e	Added achievement model and some missing pieces	2014-06-02 20:32:00 +02:00
Ruben Vereecken	1b2a251c58	Achievement editor in place and looking mighty fine	2014-06-02 20:31:09 +02:00
Ruben Vereecken	c2d2f2a2b8	Refactorings performed necessary to have searchable for more uses	2014-06-02 20:31:09 +02:00
Ruben Vereecken	a3ca382dcd	Used the feedback from Scott to improve endpoints	2014-06-02 20:29:12 +02:00
Ruben Vereecken	df60402d00	Added test	2014-06-02 20:29:12 +02:00
Ruben Vereecken	37b47d35de	Got work done on detecting achievements	2014-06-02 20:29:12 +02:00
Ruben Vereecken	699aa506f2	Added Local Mongo support for nested documents. Totally forgot those	2014-06-02 20:29:11 +02:00
Ruben Vereecken	e177912a5a	Added '$or' and '$and' to Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	b3bddbd785	Finished regular query selectors of Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	20af7b090a	Worked on getting the tests to work	2014-06-02 20:29:11 +02:00
Ruben Vereecken	f2f4fef1e0	Wrote tests for the local mongo querier	2014-06-02 20:29:11 +02:00
Ruben Vereecken	99927d1345	Started on the local mongo querier	2014-06-02 20:29:11 +02:00
Ruben Vereecken	2f5090df8f	Added schema objectIds and bettered the repeatable achievements	2014-06-02 20:29:11 +02:00
Ruben Vereecken	f5389fef99	Got the basic achievement schemas up. Still need proper references	2014-06-02 20:29:11 +02:00
Nick Winter	51891887e5	Fixed merge conflict	2014-06-02 10:43:31 -07:00
Nick Winter	257fe4cec3	Fixed merge conflict	2014-06-02 10:42:34 -07:00
Gutierri Barboza	8a8b80bcf5	More translations pt-br	2014-06-02 14:34:30 -03:00
ChrisLightman	cfcaece743	Update fr.coffee Modification mineures de syntaxe ( Majuscules )	2014-06-02 11:36:05 +02:00
Nick Winter	f3d5b724de	Merge branch 'inline-profile'	2014-06-01 16:45:49 -07:00
Nick Winter	10754e6825	Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton.	2014-06-01 16:45:19 -07:00
Nick Winter	d19b6760da	More flourishes for inline profile editor.	2014-06-01 11:45:01 -07:00
Nick Winter	400fddc294	Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry.	2014-05-31 22:09:41 -07:00
Inez KEMENES	a97d243100	Update hu.coffee	2014-05-31 16:16:28 +02:00
Nick Winter	852053022a	Started the horrifying migration to an inline jobs profile editor.	2014-05-30 22:12:44 -07:00
Scott Erickson	29011fab2a	Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.	2014-05-30 17:26:49 -07:00
Scott Erickson	22c4ddc064	Fixed the settings view putting undefineds in the level documents and causing validation errors.	2014-05-30 17:24:13 -07:00
Scott Erickson	f82ca5c1b6	Fixed #1099	2014-05-30 16:43:55 -07:00
Scott Erickson	47f28d26d1	Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called.	2014-05-30 16:20:20 -07:00
Scott Erickson	bba0e4939d	Fixed #1039	2014-05-30 15:06:33 -07:00
Scott Erickson	3602f67c24	Tweaked how editPath is passed to the server so it doesn't foul up validation.	2014-05-30 14:41:41 -07:00
Scott Erickson	7a9928b0c5	Fixed #1102	2014-05-30 13:57:21 -07:00
Scott Erickson	254c6ff7ba	Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.	2014-05-30 13:40:38 -07:00
Ruben Vereecken	84e6b8cd6d	Script event triggers are now fetched from the mediator, resolving issue #1061	2014-05-30 12:38:43 +02:00
Nick Winter	1f32c1c8a1	Merge pull request #1113 from rubenvereecken/issue1110 One line fix for issue #1110. Thang search bar works again.	2014-05-29 15:31:28 -07:00
Ruben Vereecken	ba57899f9f	One line fix for issue #1110 . Thang search bar works again.	2014-05-30 00:16:11 +02:00
Nick Winter	df13bbfaa6	Made right-click duplicate Thang menu actually clone modified Thang.	2014-05-29 12:33:21 -07:00
Nick Winter	f3adc216ed	Protecting our replacement of Math.random via Aether.	2014-05-29 12:26:08 -07:00
Scott Erickson	afc14e593d	Fixed models thinking they've got changes when they don't.	2014-05-29 10:48:48 -07:00
Nick Winter	90c97008ae	Merge pull request #1098 from rubenvereecken/view-refactoring Refactored getRenderData from SearchView to children	2014-05-28 18:59:02 -07:00
dpen2000	bd444fa547	Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes	2014-05-29 02:16:07 +01:00
Ruben Vereecken	5909f15678	Refactored getRenderData from SearchView to children	2014-05-28 17:32:18 +02:00
Scott Erickson	93f7d8c0a4	Made sure sprites are idle and properly positioned when they load.	2014-05-27 16:41:56 -07:00
Scott Erickson	3b87c9c360	Fixed some remaining jqxhr objects hanging around.	2014-05-27 16:33:57 -07:00
Nick Winter	a481af08d3	Fixed a couple typos with failed resource loading handling.	2014-05-26 20:51:05 -07:00
Nick Winter	c01bd69625	Better recoverability for non-UserCodeProblem errors during world generation.	2014-05-26 18:45:00 -07:00
Nick Winter	ec0027043b	Added experimental Io language from Aether.	2014-05-26 08:59:48 -07:00
Nick Winter	ed36dba3f5	Merge pull request #1041 from Shpionus/patch-1 Update ru.coffee	2014-05-25 12:17:12 -07:00
Nick Winter	3dd362c01e	Added support for blaming infinite loops.	2014-05-25 12:15:32 -07:00
Nick Winter	6b554e03ef	Merge pull request #1084 from domenukk/feature/step-single-frame Added shortcut for frame single-stepping	2014-05-25 09:37:13 -07:00
Nick Winter	16e1ef760a	Merge branch 'master' of git://github.com/jayant1992/codecombat	2014-05-25 08:51:13 -07:00
Nick Winter	1a6fd75103	Trying to fix some Simulator loading errors.	2014-05-25 08:29:33 -07:00
Nick Winter	33408020f1	Merge pull request #1054 from dpen2000/patch-2 Update simulate_tab.coffee	2014-05-25 08:27:54 -07:00

... 15 16 17 18 19 ...

4088 commits