3706 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	0a139fdbb3	Treema version bump.	2014-07-04 18:27:41 -07:00
Scott Erickson	dc49499679	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-04 18:12:10 -07:00
Scott Erickson	0c3d5c9882	Merge branch 'kumabotz-coffeescript-convention'	2014-07-04 18:11:56 -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	3ed4479f2e	Merge branch 'kumabotz-cleanup-mixed-quotes'	2014-07-04 18:01:56 -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	ebc584076b	Merge branch 'thgil-fb'	2014-07-04 17:36:18 -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
Scott Erickson	f61541d4ba	Merge pull request #1254 from rubenvereecken/teeny_weeny_search_fix ... proofed the SearchView's runSearch	2014-07-04 10:37:37 -07:00
Ruben Vereecken	44c84b3689	proofed the SearchView's runSearch	2014-07-04 19:36:55 +02:00
Ruben Vereecken	e904a0a8f7	Achievement recalculation is now covered with tests	2014-07-04 19:27:41 +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	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	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	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