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

2320 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
544070e578 Fix for infinite loop fix. 2014-03-26 12:34:45 -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
Nick Winter
127eb3cef6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:32:49 -07:00
Nick Winter
aec4669780 Merge pull request #687 from kgy01/master 
Hide arrow's shadow if buried
 2014-03-26 11:27:11 -07:00
Nick Winter
cab343b0b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14 Added infinite loop handling to Simulator. 2014-03-26 11:25:05 -07:00
Jayant Jain
71294f14b2 Updates fb and g+ functions to be called on api load, fixes #695 2014-03-26 22:03:20 +05:30
Glen De Cauwsemaecker
050e0f92fd Added step-by-step guide wiki url in tips 2014-03-26 14:34:38 +01:00
Glen De Cauwsemaecker
4d09d6b472 Removed ssh option (less is more) and placed now the repository in a subdir so that the db can be placed in the env path as well. 2014-03-26 14:31:48 +01:00
Glen De Cauwsemaecker
71608bf2ef Added ssh clone option: 2014-03-26 14:27:39 +01:00
Glen De Cauwsemaecker
6fdcbde61a Git setup works. 2014-03-26 14:18:34 +01:00
Glen De Cauwsemaecker
5825b2676b Added myself to the signature. 2014-03-26 04:46:49 +01:00
Glen De Cauwsemaecker
a4f6b518ec At the end of the installation the user can now read a readme file with more information, if he wants to. 2014-03-26 04:33:05 +01:00
Glen De Cauwsemaecker
37d7358e78 git setup can now also be done manually 2014-03-26 04:19:01 +01:00
Glen De Cauwsemaecker
10d13775ee Installation of software can now be skipped 2014-03-26 03:43:34 +01:00
Glen De Cauwsemaecker
a9f88a275a Added the missing headers and the main setup file is now as good as complete. 2014-03-26 03:28:24 +01:00
Glen De Cauwsemaecker
f702f58bdf Added github header and made a script root for it. 2014-03-26 03:15:52 +01:00
Glen De Cauwsemaecker
892907adf0 installation system finished 2014-03-26 03:05:50 +01:00
Glen De Cauwsemaecker
366a3676d8 Download app cleaned up 2014-03-26 02:45:49 +01:00
Glen De Cauwsemaecker
ffa8094a1d Installation almost over. 2014-03-26 01:46:07 +01:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/de.coffee
	bower.json
 2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603 Merge pull request #688 from 1c7/master 
Translate some word from English -> Chinese.  (zh-HANS.coffee)
 2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc Translate some word from English -> Chinese. (zh-HANS.coffee) 2014-03-25 23:15:17 +08:00
kgy01
29aad01697 hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition 2014-03-25 08:48:26 -04:00
kgy01
a420064bc1 hide spear's shadow if buried 2014-03-25 08:31:38 -04:00
Glen De Cauwsemaecker
305e2f6d68 Merge pull request #685 from JasperDhaene/master 
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
 2014-03-25 13:27:13 +01:00
kgy01
3cc422a281 Merge remote-tracking branch 'upstream/master' 2014-03-25 08:10:30 -04:00
kgy01
c48863fae6 Hide arrow's shadow if buried 2014-03-25 08:06:37 -04:00
Aditya Raisinghani
6208e8e324 Additional fixes for double scrollbars of modals. 2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9 Fixed issue with two scroll bars appearing. 2014-03-25 16:36:24 +05:30
JasperDhaene
748081b4a7 Added myself to the diplomate list, fixed typos and made corrections to Dutch locale 2014-03-25 09:25:20 +01:00
Shrihari
aee18523b0 Fix for #506 2014-03-25 13:28:22 +05:30
Glen De Cauwsemaecker
0050bef8f1 Added additional software and added the github url's of codecombat to the config file. 2014-03-25 03:48:16 +01:00
Glen De Cauwsemaecker
de7a717b16 buggy version of installation works. 2014-03-25 03:37:05 +01:00
Glen De Cauwsemaecker
0e7530e96d Merge pull request #682 from Darredevil/patch-3 
Update ro.coffee
 2014-03-25 03:02:23 +01:00
Darredevil
4bb1ee5c74 Update ro.coffee 2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat 2014-03-25 01:13:30 +01:00