codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-14 01:31:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6715 commits 27 branches 0 tags 134 MiB
Commit graph

6715 commits

This branch
This branch
All branches
Author SHA1 Message Date
Glen De Cauwsemaecker
ce51e1dcf3 Current State 2014-03-28 04:03:36 +01:00
Dom
15590252f1 Update fr.coffee 
fixed other typos and translated a definition
 2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99 Update ca.coffee 2014-03-28 00:29:54 +01:00
Dom
6f02748311 Update fr.coffee 
fixed typos
 2014-03-28 00:29:31 +01:00
Nick Winter
5763cdca87 Merge pull request #718 from Darredevil/patch-4 
Added funny tip
 2014-03-27 15:19:28 -07:00
Nick Winter
a7cb33c245 Merge pull request #717 from Darredevil/patch-5 
Added funny tip
 2014-03-27 15:19:13 -07:00
Darredevil
a91e067549 Added funny tip 2014-03-28 00:13:40 +02:00
Darredevil
f4a81f43a2 Added funny tip 2014-03-28 00:13:30 +02:00
Nick Winter
b0b37aa9d8 Made play/pause and scrubber look even more disabled when disabled. 2014-03-27 15:07:37 -07:00
Nick Winter
2677751dc5 Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog 2014-03-27 14:58:06 -07:00
Nick Winter
31119f402a Cleaned up readyToRank logic a bit. 2014-03-27 14:55:45 -07:00
Nick Winter
1cab83236c Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master 2014-03-27 14:22:44 -07:00
Nick Winter
7ab5adcdac Merge pull request #700 from pedrofgsrj/loginAutocomplete 
Fixed issue #597
 2014-03-27 14:20:58 -07:00
Nick Winter
e57a1655c6 Merge branch 'master' into production 2014-03-27 13:40:27 -07:00
Nick Winter
127c4a4e0f Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging. 2014-03-27 13:36:33 -07:00
Laura Lebbah
5d894ea053 Migrate .on, .once - ThangTypeEditView 2014-03-27 21:33:59 +01:00
Nick Winter
c076bb1da8 Tweaking some styles; perhaps fixed #6. 2014-03-27 13:15:22 -07:00
Ting-Kuan
6012a3ce9e Show error message when editor fails to initiate. 2014-03-27 14:35:20 -04:00
AKeeper
d21fbbfe4d Update ru.coffee 2014-03-27 16:48:30 +02:00
Aditya Raisinghani
deb3ddeece Longer modals are now scrollable. 2014-03-27 12:31:29 +05:30
Pedro Sobrinho
38bf27020a Fixed issue #597 2014-03-26 20:55:03 -04:00
Ting-Kuan
a811086918 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 20:40:16 -04:00
Glen De Cauwsemaecker
5952e0876a Removed brunch part as we don't need it for installation. 2014-03-27 00:10:50 +01:00
Nick Winter
3bdc4d99b3 Merge pull request #699 from M-r-A/patch-1 
Update ru.coffee
 2014-03-26 16:07:01 -07:00
Alexei Nikitin
780743a40d Update ru.coffee 2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5 Update ru.coffee 2014-03-26 15:42:03 -07:00
Glen De Cauwsemaecker
2df44701c8 Merged domenukks changes to the de file. 2014-03-26 23:30:03 +01:00
Jayant Jain
648df5eb41 Updated rank my game check, fixes #666 2014-03-27 03:36:27 +05:30
Glen De Cauwsemaecker
a02909903e Added local tags also the nl and en file for the npm part of the installation. 2014-03-26 23:06:25 +01:00
Glen De Cauwsemaecker
f7767d17a8 everything up to mongodb is added, not sure if it works though. 2014-03-26 23:03:48 +01:00
Scott Erickson
37beb1bc6b Made the ladder tab better able to handle unloaded gplus and facebook apis. 2014-03-26 14:53:09 -07:00
Scott Erickson
092810eba2 Fixed a small error in the migration. 2014-03-26 14:44:11 -07:00
Glen De Cauwsemaecker
ea682c48e1 First step of npm works. 2014-03-26 22:43:57 +01:00
Scott Erickson
8001e58848 Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:39:01 -07:00
Scott Erickson
fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:29:16 -07:00
Scott Erickson
462d365ce0 Sorted the friend sessions a bit. 2014-03-26 14:22:04 -07:00
Scott Erickson
781b33092c Added a google plus connect button. 2014-03-26 14:19:05 -07:00
Dominik Maier
adc1d123f5 + Added German translation to coco-dev-setup 2014-03-26 22:07:20 +01:00
Glen De Cauwsemaecker
6697929796 Added a german localisation file to the setup. 2014-03-26 21:58:00 +01:00
Glen De Cauwsemaecker
1fb1ea82c8 Added a small explenation at the end of the installation on how to start the coco-dev environment. 2014-03-26 21:51:46 +01:00
Scott Erickson
132b22f14a Got the gplus friends loading now. 2014-03-26 13:50:01 -07:00
Glen De Cauwsemaecker
d393c8cce4 Merge branch 'feature-win-setup' of https://github.com/glendc/codecombat into feature-win-setup 2014-03-26 21:34:01 +01:00
Glen De Cauwsemaecker
98580c8c3e Merge https://github.com/glendc/codecombat into feature-win-setup 2014-03-26 21:18:53 +01:00
Nick Winter
ff959c48b2 Merge branch 'master' into production 2014-03-26 12:34:54 -07:00
Nick Winter
544070e578 Fix for infinite loop fix. 2014-03-26 12:34:45 -07:00
Nick Winter
b890fc6cab Merge branch 'master' into production 2014-03-26 12:13:14 -07:00
Nick Winter
515b8723a3 Simulator handles more errors. 2014-03-26 12:12:43 -07:00
Nick Winter
ac222c27e8 "Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 12:12:18 -07:00
Scott Erickson
ad70a7f0c6 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master 2014-03-26 11:48:47 -07:00
Scott Erickson
3b8cba291d Removed some unnecessary callbacks. 2014-03-26 11:48:40 -07:00