codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3646 commits 27 branches 0 tags 134 MiB
Commit graph

3646 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dominik Kundel
33d68fab6e Merge remote-tracking branch 'upstream/master' 2014-06-18 21:50:55 +02:00
Nick Winter
416cd3b894 Merge branch 'master' into production 2014-06-18 12:06:16 -07:00
Nick Winter
ac6c7292c8 Fixed Gridmancer session linking on profile view. 2014-06-18 12:05:40 -07:00
Dominik Kundel
083a9f6d02 added zatanna to bower 2014-06-18 18:20:34 +02:00
Scott Erickson
50fea7e937 Added a method for returning all requests in mock-ajax. 2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524 Maybe fixing the toggleModal system once and for all. 2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
Nick Winter
59654da24b Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce. 2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc ModelModal now grants real ultimate power. 2014-06-17 15:17:25 -07:00
djsmith85
2fff271200 Update de-DE.coffee 
Updated a few translations in the German locale file.
 2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880 Update de.coffee 
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
 2014-06-17 23:52:54 +02:00
Michael Schmatz
fad270f2af Merge pull request #1172 from thgil/master 
Check for 64-bit arch in setup.py
 2014-06-17 14:45:49 -07:00
Michael Schmatz
461e5659b2 Merge pull request #1179 from thgil/bootstrap 
Bootstrap.sh check for git repository before cloning
 2014-06-17 14:43:32 -07:00
Nick Winter
52d08d7d05 Merge branch 'master' into production 2014-06-17 13:04:38 -07:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Fergus Leen
ecf24c2875 Commit on wrong branch - reverted 2014-06-17 19:56:13 +01:00
Fergus Leen
de1f6ab50a Check for git repository before cloning 2014-06-17 19:44:32 +01:00
Fergus Leen
42304d8fb4 Check for git repository before cloning 2014-06-17 19:30:32 +01:00
Michael Schmatz
18bb8d1e1f Merge pull request #1178 from codecombat/master 
Master into production
 2014-06-17 10:38:13 -07:00
Michael Schmatz
c4d741294b Created multicore.coffee 2014-06-17 10:31:16 -07:00
Nick Winter
64001a4976 Merge pull request #1174 from kumabotz/fix-typo 
Fix typo for receive
 2014-06-16 22:11:22 -07:00
Tery Lim
b6c8a170d1 Fix typo for receive 2014-06-17 10:50:56 +08:00
Fergus Leen
15d89789f2 Checks for false positive 64 bit 2014-06-16 21:48:27 +01:00
Scott Erickson
3e24b2f86e Fixed tests running in karma. 2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81 Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why. 2014-06-16 11:40:09 -07:00
Scott Erickson
a3af0d2ea5 Got the PatchView demo working. 2014-06-16 11:40:09 -07:00
Scott Erickson
ee791da34c Moved services into their own folder, and made no services run for both testing and demo pages. 2014-06-16 11:40:09 -07:00
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