Commit graph

4213 commits

Author SHA1 Message Date
Ruben Vereecken
1c671a3c25 Refactored vendor loading 2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674 Extracting third party scripts out of main 2014-06-16 11:40:08 -07:00
Scott Erickson
4932317982 Finally got the demo view working (mostly). Need to turn off third party ajax requests. 2014-06-16 11:40:08 -07:00
Scott Erickson
1013f52c14 The demo folder is now being compiled correctly, but still having brunch issues. vendor.js isn't happening. 2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d Initial work on a demo view. But brunch won't build demo-app.js for some reason. 2014-06-16 11:40:08 -07:00
Nick Winter
021ce5660c Merge pull request #1162 from thgil/master
Added str to sys.maxsize
2014-06-16 10:55:37 -07:00
Nick Winter
9a64ca5973 A few misc fixes. 2014-06-16 10:49:20 -07:00
Nick Winter
3d2bee3256 Merge pull request #1168 from kinez/patch-9
Update hu.coffee
2014-06-16 08:22:21 -07:00
Nick Winter
7198a8fc42 Merge pull request #1166 from ChrisLightman/patch-6
Upsate /// Translate
2014-06-16 08:21:56 -07:00
Nick Winter
4f1857694b Merge pull request #1159 from ArnoldM904/patch-2
Changed final_score to match coding style.
2014-06-16 08:14:13 -07:00
Nick Winter
cf3234d9c2 Merge branch 'barbuddha-patch-1' 2014-06-16 08:13:03 -07:00
Nick Winter
0418d80c6d Merged. 2014-06-16 08:12:52 -07:00
Inez KEMENES
c611cafa25 Update hu.coffee 2014-06-16 16:39:02 +02:00
Dominik Kundel
9a3ba70ea2 Merge remote-tracking branch 'upstream/master' 2014-06-16 14:30:22 +01:00
Dominik Kundel
25a0447d77 autocomplete 2014-06-16 14:29:01 +01:00
Clement
931f3ea330 Upsate /// Translate
Enjoy
2014-06-16 11:38:25 +02:00
barbuddha
ff5f46e5fb Update ru.coffee 2014-06-16 08:43:27 +04:00
Fergus Leen
479c2a0cc1 Added str around sys.maxsize 2014-06-15 08:32:06 +01:00
Nick Winter
66e2805a9a Added StackLead integration. Employerified profile backgrounds. 2014-06-14 20:59:28 -07:00
Nick Winter
babfa04a9e Fixed a tiny typo. 2014-06-14 18:02:22 -07:00
Nick Winter
4ba03f4de5 Merge pull request #1157 from djsmith85/patch-1
Update de-DE.coffee
2014-06-14 18:01:16 -07:00
Michael Arnold
140541925e Changed final_score to match coding style.
Extremely insignificant change, I just noticed that final_score was set as:

final_score = final_score / fuzzies;

compared to: "final_score /= fuzzies;" which is how the rest of your syntax is written. 
(Ex: "+=" and "-=")
2014-06-14 15:43:59 -04:00
djsmith85
a22a098fdc Update de-DE.coffee 2014-06-14 14:02:42 +02:00
Nick Winter
ff0d842871 Better employer contact message. 2014-06-13 16:04:11 -07:00
Michael Schmatz
84601d2927 Added more info email field to employer signup 2014-06-13 15:38:47 -07:00
Nick Winter
21e7487132 Showing more skills in employer table for better searching. Hid employer selling copy after sold. 2014-06-13 14:52:50 -07:00
Scott Erickson
a1dd9a714e Fixed #1153. 2014-06-13 13:35:57 -07:00
Scott Erickson
8f4e1b4bf0 Making the ModelModal look better. 2014-06-13 10:11:01 -07:00
Scott Erickson
6c87d5792d One last fix to the search url. 2014-06-13 09:52:34 -07:00
Nick Winter
79cbc4bb25 Propagated i18n. 2014-06-13 08:50:52 -07:00
Nick Winter
4c57ff7501 Fixed LevelComponent search collection in level editor. 2014-06-13 08:48:29 -07:00
Nick Winter
1502cdc64b Merge branch 'jayant1992-master' 2014-06-13 08:17:12 -07:00
Dominik Kundel
e756c83d9e preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
Nick Winter
27f2b9acb1 Merge pull request #1151 from kumabotz/remove-unicode
Remove unicode from url regex pattern
2014-06-13 08:11:59 -07:00
Nick Winter
2bda60796a Copy / i18n tweaks for tournament ending and employers blurb. 2014-06-13 08:08:13 -07:00
Tery Lim
c3b72e025a Remove unicode from url regex pattern 2014-06-13 10:30:29 +08:00
Nick Winter
1b2c4e078c Fixed candidates viewing their own code and resetting it. 2014-06-12 17:52:08 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
George Saines
03aa0783b1 a few copy edits 2014-06-12 16:13:48 -07:00
George Saines
3415b62663 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-12 16:01:39 -07:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Michael Schmatz
32a041a5a7 Made max size of canvas much bigger for spectate view 2014-06-12 15:48:11 -07:00
Scott Erickson
152b860a23 Hotfix for the profile view. 2014-06-12 14:44:55 -07:00
Scott Erickson
cdea4befd9 Giving the test server more time to spin up. 2014-06-12 13:35:39 -07:00
Scott Erickson
994e4773ca Reverting the objectId schema. 2014-06-12 13:19:06 -07:00
Scott Erickson
8ab69cf833 Merge pull request #1138 from rubenvereecken/search-endpoint
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Scott Erickson
c855327cef Merge pull request #1150 from rubenvereecken/achievements
Achievements - Update with some tests and admin endpoint
2014-06-12 11:28:25 -07:00
Ruben Vereecken
dcdcca751f Fiddled with creating xp functions 2014-06-12 19:44:56 +02:00
Ruben Vereecken
fddca03417 Worked on achievement tests 2014-06-12 19:44:55 +02:00