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

3371 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bård Eik-Hvidsten
1d525bad37 Update no.coffee 
Translated the text into Norwegian (Bokmål)
 2014-01-09 19:35:11 +01:00
Michael Schmatz
fd3e678a95 Fixed temporary directory removal bug 2014-01-09 10:11:30 -05:00
Michael Schmatz
df3e80dd17 Merge pull request #119 from rhc2104/remove-esc-prompt 
If you have pressed esc, do not get prompted about it
 2014-01-09 06:09:21 -08:00
Ronald Cheng
278b4d8754 If you have pressed esc, do not get prompted about it 2014-01-08 23:09:58 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Nick Winter
03a5614a18 Fixed #96. 2014-01-08 19:18:23 -08:00
Nick Winter
5148e90fd2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-08 19:01:34 -08:00
Nick Winter
215d83c98a Fixed #97 by updating Fancy Select. 2014-01-08 19:01:26 -08:00
Michael Schmatz
24e36ba26d Added chown to bower_components directory 2014-01-08 18:43:08 -05:00
Scott Erickson
50beeb93bc Merge branch 'production' 2014-01-08 14:59:49 -08:00
Scott Erickson
4b8c8f22c1 Fixed logging out to update the header properly. 2014-01-08 14:57:59 -08:00
Scott Erickson
aab11ea5f7 Fixed logging in with facebook and google plus to not overwrite existing user settings. 2014-01-08 14:57:42 -08:00
Scott Erickson
787faf82a3 Merge pull request #114 from smoratinos/master 
code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->'
 2014-01-08 14:44:36 -08:00
Nick Winter
2fdb8c2dc2 Merge pull request #116 from rhc2104/press-esc 
Create notification that esc can skip dialogs
 2014-01-08 14:35:58 -08:00
Ronald Cheng
81eed31714 Create notification that esc can skip dialogs 
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
 2014-01-08 14:23:36 -08:00
Sébastien Moratinos
00cffa2570 undo a line wrapping, because this change the logic in common schema. 2014-01-08 22:48:19 +01:00
Michael Schmatz
95885a8de2 Added script to check for old version of node 
Deals with issue #98.
 2014-01-08 15:14:56 -05:00
Nick Winter
b181aff14e Firebase is now in Bower. 2014-01-08 11:49:42 -08:00
Nick Winter
5d18e92c31 Merge pull request #112 from rhc2104/more-names 
Add more peasant names, and soldiers cannot be both Will and William
 2014-01-08 11:49:06 -08:00
Ronald Cheng
a717ee80fb Add more peasant names, and soldiers cannot be both Will and William 2014-01-08 11:34:52 -08:00
Sébastien Moratinos
abb20a6b8a code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->' 2014-01-08 20:27:13 +01:00
Michael Schmatz
ee3841b32c Merge pull request #110 from rhc2104/google-plus 
Make G+ button same size as other buttons
 2014-01-08 05:56:31 -08:00
Michael Schmatz
119812e126 Merge pull request #109 from rhc2104/404 
Center text in 404 page
 2014-01-08 05:13:06 -08:00
Ronald Cheng
3658d5ca3a Make G+ button same size as other buttons 
The default G+ button size is slightly larger than the Facebook and Twitter buttons.  Use the "medium" size to make the size even.
 2014-01-08 02:15:52 -08:00
Ronald Cheng
a61756a816 Center text in 404 page 2014-01-08 01:28:38 -08:00
Nick Winter
688400e4a0 Merge pull request #107 from MDP66/patch-1 
Remove extra Parentesis
 2014-01-07 23:36:52 -08:00
Masoud
ab1fd28880 Remove extra Parentesis 
It's coffee no parentesis needed :}
 2014-01-08 11:04:43 +03:30
Nick Winter
02f301d314 Merge pull request #105 from engstrom/master 
added peasant names
 2014-01-07 23:20:34 -08:00
engstrom
21536794be added peasant names 2014-01-07 20:59:43 -07:00
Nick Winter
027dc07ae2 Merge pull request #104 from Tavio/patch-2 
Update names.coffee
 2014-01-07 18:30:08 -08:00
Tavio
07df7be1f4 Update names.coffee 
A few more names.
 2014-01-08 00:26:16 -02:00
Michael Schmatz
801dc5e32a Merge pull request #103 from Tavio/patch-1 
Update names.coffee
 2014-01-07 17:23:11 -08:00
Tavio
32eaf4a891 Update names.coffee 2014-01-07 23:02:55 -02:00
Michael Schmatz
6b10d3682f Merge pull request #102 from armaldio/patch-1 
Update fr.coffee
 2014-01-07 15:00:49 -08:00
armaldio
9f4188da09 Update fr.coffee 
Hi, I'm French and I like CodeCombat.
I enjoy translate things from English to French.
If you agree, I can translate many of levels dialogues :D
 2014-01-07 23:56:41 +01:00
Michael Schmatz
c129323c45 Merge pull request #100 from gabceb/coco-fix-97 
Language menu style improvements
 2014-01-07 11:22:44 -08:00
Gabriel Cebrian
74bcc4ec1b Increase element padding to avoid cutting words off 2014-01-07 14:05:39 -05:00
Gabriel Cebrian
ad12680ce9 Make language options menu right aligned instead of left aligned 
Remove horizontal scrollbar that is shown when vertical scrollbar is shown
Changed top property to improve look
 2014-01-07 13:27:46 -05:00
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
Scott Erickson
250b7322a9 Fixed #56 2014-01-06 21:25:18 -08:00
Scott Erickson
a4fa41020f Merge remote-tracking branch 'origin/master' 2014-01-06 20:17:54 -08:00
Scott Erickson
a988c91a63 Fixed blog links. 2014-01-06 20:17:27 -08:00
Nick Winter
2a49261a24 Fixed #92. 2014-01-06 20:17:03 -08:00
Scott Erickson
f0147e8f7c More tweaks to the thang editor. 2014-01-06 19:33:36 -08:00
Scott Erickson
7d638b596f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 19:10:57 -08:00
Scott Erickson
ddbf45b50c Made the thang editor a little more organized. 2014-01-06 19:09:43 -08:00
Nick Winter
845601ed96 No need for wallNameFor any more. 2014-01-06 19:07:13 -08:00
Scott Erickson
59ec63c041 Fixed #60. 2014-01-06 18:12:57 -08:00
Scott Erickson
aeaeb84fe5 Fixed general articles showing up in the guides. 2014-01-06 18:03:17 -08:00
Scott Erickson
5a4de61999 Bug fix. 2014-01-06 17:56:34 -08:00