3677 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	b951205681	intermediate	2014-07-04 19:27:38 +02:00
Ruben Vereecken	838012a2cf	Wrote and tested articleEdits recalculation	2014-07-04 19:27:38 +02:00
Ruben Vereecken	6ae505e8a1	stats.articleEdits are now tracked and tested	2014-07-04 19:27:37 +02:00
Ruben Vereecken	7a07e1feb0	Whoop whoop test for recalculation of gamesCompleted	2014-07-04 19:27:37 +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	faf02d8e4b	Finally managed a setup that makes the tests succeed	2014-07-04 19:27:37 +02:00
Ruben Vereecken	488d49e286	intermediate	2014-07-04 19:27:37 +02: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	9c52cf371e	Merge pull request #1252 from codecombat/employer-redesign ... Employer redesign	2014-07-03 16:40:46 -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
Michael Schmatz	a770d3dc49	Merge pull request #1249 from dkundel/master ... Autocomplete fix	2014-07-03 09:12:52 -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	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
Dominik Kundel	3f57644b0b	Merge remote-tracking branch 'upstream/master'	2014-07-01 19:58:01 +02:00
Michael Schmatz	2dd4ba6203	Increased max skills from 30 to 40	2014-06-30 16:43:31 -07:00