1214 commits

Author	SHA1	Message	Date
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
Ruben Vereecken	ea3d1fee74	Starting on achievement overview style	2014-07-07 15:03:28 +02: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
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	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	601c4e2731	Merged with master	2014-07-05 16:47:16 +02: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	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	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	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	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
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	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