Commit graph

3667 commits

Author SHA1 Message Date
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
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
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