1197 commits

Author	SHA1	Message	Date
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
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	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	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	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
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	6a33ca0892	Removed autoscrolling	2014-07-03 16:40:00 -07:00
Michael Schmatz	615303395c	Various fixes for recruiting page	2014-07-03 16:30:27 -07:00
George Saines	4d12aff35e	removing the counselor from the contribute page and all other links	2014-07-03 15:42:24 -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	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	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	004a14ae3c	fixed autocomplete issue related to switching the programming language	2014-07-02 20:52:16 +02:00
Michael Schmatz	c6cc28b976	Various fixes to enable employers page to function correctly	2014-07-02 11:45:00 -07:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Nick Winter	802d43651e	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -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	8c6ee66684	Better handling of alternate spell palette documentation syntax for other code languages.	2014-06-25 20:19:11 -07: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	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	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	3862bd2376	Clearing backups of old models when saving new versions of versioned models.	2014-06-24 09:43:20 -07: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	8698589625	Applying Scott's fix for #1198.	2014-06-22 07:55:29 -07:00
Nick Winter	81f8334f37	Some fixes for CocoSprite alphas.	2014-06-21 22:31:10 -07:00
Nick Winter	1f29a923cf	Fixed playing multiplayer levels without an opponent, against the AI.	2014-06-21 12:24:14 -07:00
Nick Winter	a8f4baebbc	Restricted some more analytics.	2014-06-21 09:47:48 -07:00
Nick Winter	dde71485bf	A bit of cleanup.	2014-06-20 20:52:50 -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
Nick Winter	bb8b9b2e93	bid -> makeBid.	2014-06-19 17:27:41 -07:00