Commit graph

3715 commits

Author SHA1 Message Date
Michael Schmatz
4a4438937f Merge pull request #1243 from codecombat/master
Increased max skills from 30 to 40
2014-06-30 16:46:10 -07:00
Michael Schmatz
2dd4ba6203 Increased max skills from 30 to 40 2014-06-30 16:43:31 -07:00
Nick Winter
4232f91c83 Merge branch 'master' into production 2014-06-27 10:21:54 -07: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
0956c7cea1 Merge branch 'master' into production 2014-06-27 00:36:32 -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
6184761ea5 Merge pull request #1236 from codecombat/master
Fixed employer view for manually created candidates
2014-06-26 17:19:21 -07:00
Michael Schmatz
28bb28cf85 Fixed employer view for manually created candidates 2014-06-26 17:07:17 -07:00
Michael Schmatz
475bb74001 Merge pull request #1235 from codecombat/master
Master into production
2014-06-26 10:42:00 -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
Nick Winter
4cebf1f434 Merge pull request #1232 from Darredevil/patch-11
Added new tip tag
2014-06-25 21:23:41 -07:00
Nick Winter
abe69c2286 Merge pull request #1231 from Darredevil/patch-10
Added a joke tip
2014-06-25 21:23:36 -07:00
Darredevil
c6f19f7d3a Added new tip tag 2014-06-26 06:23:36 +03:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b Added a joke tip 2014-06-26 02:11:15 +03:00
Nick Winter
56f800b2be Merge branch 'master' into production 2014-06-25 11:59:35 -07:00
Nick Winter
6f4a0fbb51 Merge pull request #1228 from kinez/patch-11
Update hu.coffee
2014-06-25 08:31:53 -07:00
Inez KEMENES
96f74183a5 Update hu.coffee 2014-06-25 17:28:13 +02: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
6f59f4cec7 Merge branch 'master' into production 2014-06-24 19:09:58 -07:00
Nick Winter
3f7f4438b2 Don't track .zedstate. 2014-06-24 19:08:27 -07:00
Nick Winter
2fc3d591b2 Merge pull request #1218 from domenukk/feature/upscript
Feature/upscript
2014-06-24 19:01:55 -07:00
Nick Winter
512e287b6a Merge pull request #1184 from greyhusky/patch-1
Update de-CH.coffee
2014-06-24 17:41:32 -07:00
George Saines
b5ec38f811 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Nick Winter
c2ca99ff47 Merge branch 'master' into production 2014-06-24 16:32:54 -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
cf70db2b48 Merge pull request #1224 from codecombat/master
Master into production
2014-06-24 14:37:28 -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
2cdd7c4115 Updated the patches script to handle some invalid patches. 2014-06-24 17:24:37 -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
c5ff37eb9a Turning off source maps for now because they're wrong. 2014-06-24 16:41:24 -04:00
Michael Schmatz
9772894884 Merge pull request #1222 from codecombat/master
Fixed gplus login.
2014-06-24 11:46:13 -07:00
Scott Erickson
327d273cbe Fixed gplus login. 2014-06-24 14:44:37 -04:00
Michael Schmatz
22b7e52f98 Merge pull request #1221 from codecombat/master
Master into production
2014-06-24 11:30:28 -07:00
Michael Schmatz
988ad6ffda Attempting to fix G+ 2014-06-24 11:29:43 -07: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
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2 A bit of error logging for #1220. 2014-06-24 09:43:20 -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
Scott Erickson
573b566580 Fixed the cloudflare config to be in the environmental variables. 2014-06-24 12:29:47 -04:00
Scott Erickson
9a571a6fe7 Fixed the file not 'changing' when overwritten. It was a caching issue. 2014-06-24 11:55:04 -04:00
Dominik Maier
d5fc578f73 + Added md5 library
+ Removed unused file
2014-06-23 22:59:33 +02:00