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

7297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
141e11f918 Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master 2015-02-16 17:13:24 -08:00
Nick Winter
d3707306cc Added a script to count spoken language usage. 2015-02-16 17:12:59 -08:00
Imperadeiro98
158560f42d Merge pull request #2331 from vampirelower/patch-1 
Update uk.coffee
 2015-02-16 23:20:02 +00:00
Imperadeiro98
3f9169a18f Uncommented an header 2015-02-16 23:18:23 +00:00
Imperadeiro98
73c810cd17 Merge pull request #2332 from ptsoumaki/patch-1 
Update el.coffee
 2015-02-16 23:17:24 +00:00
ptsoumaki
ef5363c1cb Update el.coffee 2015-02-17 00:21:38 +02:00
Ryan Marren
b2d881807a Merge branch 'master' of https://github.com/rmarren1/codecombat 2015-02-16 17:12:38 -05:00
Ryan Marren
1a60b004a7 added achievement editor for #2304 2015-02-16 17:12:05 -05:00
Edward Litvinchyck
8ffe11fd05 Update uk.coffee 2015-02-17 00:10:58 +02:00
Nick Winter
5e725906dc Merge pull request #2330 from divyanshu013/master 
Font size tweak for #2324
 2015-02-16 13:12:17 -08:00
divyanshu013
036b72ca19 Font size tweak for #2324 
Also reduced the size for tbody data to fit properly
 2015-02-17 00:44:08 +05:30
Nick Winter
de11743df9 Merge pull request #2326 from laituan245/master 
Add type (warrior/ranger/wizard)  to hero selector modal (Issue #2307)
 2015-02-16 10:29:26 -08:00
Nick Winter
5645f7779b Changed isMultiplayer check to fix #2325. 2015-02-16 10:24:00 -08:00
Imperadeiro98
a73ccbc037 Changed language specific style in home.sass 
So that it only affects pt-BR instead of pt-PT.
 2015-02-16 18:23:42 +00:00
Nick Winter
c40113182f Merge pull request #2321 from mogsie/install-using-https 
Replaced git for https in clone URL.
 2015-02-16 09:35:33 -08:00
Nick Winter
83c25efa40 Merge pull request #2317 from rmarren1/master 
added famous computer scientist names for #53
 2015-02-16 09:33:49 -08:00
Nick Winter
c0f738d736 Fixed bug with Campaign i18n not showing fullNames properly. 2015-02-16 09:21:59 -08:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Imperadeiro98
f0619e08f3 Merge pull request #2323 from ZeAntwan/patch-2 
FR Translations and corrections
 2015-02-16 13:49:41 +00:00
Imperadeiro98
d575bb2992 Small spacing fix 2015-02-16 13:33:44 +00:00
ZeAntwan
1d332f2afe FR Translations and corrections 
Categories Translated :
- contact
- classes

Corrections :
(Note aux français) : Il faut différencier les "Subscribe" des "Sign Up". Subscribe équivaut à l'abonnement payant !
- legal > page-title

ATTENTION :
- (417) parent_button : The translation is out of box, text size need to be reduced to around 21px to fit.
 2015-02-16 14:15:17 +01:00
Imperadeiro98
b29bb787d8 Merge pull request #2320 from laituan245/laituan245-patch-1 
Update vi.coffee
 2015-02-16 11:48:58 +00:00
Imperadeiro98
6ff6d11323 Merge pull request #2322 from ZeAntwan/patch-1 
Update fr.coffee
 2015-02-16 11:46:28 +00:00
Imperadeiro98
900357f545 Merge pull request #2316 from ArthurLu/master 
Update zh-HANT.coffee
 2015-02-16 11:37:01 +00:00
ZeAntwan
91313a0015 Update fr.coffee 
Translated following strings : 
share_progress_modal 
(309) tip_reticulating
(326) tip_superpower
(329) tip_code_never_lies
(335) : tip_move_forward
(337) : tip_adding_evil (Traduction approximative de "evil" vers "mechanceté")
subscribe (lots of things)

Correction 427 (ecriVant pas ecriSant)
 2015-02-16 03:47:57 +01:00
Tuan Manh Lai
6377484db5 Update vi.coffee 2015-02-16 01:38:58 +09:00
Erik Mogensen (@mogsie)
24b5ecb70b Replaced git for https in clone URL. 2015-02-15 12:24:38 +01:00
Tuan Manh Lai
f01b0d1b9a Update vi.coffee 2015-02-15 05:41:06 +09:00
Tuan Manh Lai
5421c4ec46 Update vi.coffee 2015-02-15 05:35:57 +09:00
Tuan Manh Lai
377d8a768d Update vi.coffee 2015-02-15 05:21:31 +09:00
Ryan Marren
0a961b03c5 added famous computer scientist names for #53 2015-02-14 11:07:24 -05:00
Barney
dd40a07fc0 Update zh-HANT.coffee 2015-02-14 21:22:02 +08:00
Barney
00242f5767 Merge remote-tracking branch 'upstream/master' 2015-02-14 16:03:22 +08:00
Nick Winter
7f2e5c4404 Achievements list now shows proper amount of gems and exp for repeatable achievements. 2015-02-13 18:55:23 -08:00
Nick Winter
578ec6d7d0 Was confused about achievement collections and categories. 2015-02-13 17:10:30 -08:00
Nick Winter
6cdd6fbc44 Improvements for recalculating earned achievements, recreating earned achievements that should exist, and updating proportionalTo achievements like simulatedBy that don't get updated with a post-save hook. 2015-02-13 16:33:13 -08:00
Scott Erickson
c628eff272 Fixing #1866. 2015-02-13 15:07:44 -08:00
Scott Erickson
5272f9d9ba Fixing #2269. 2015-02-13 15:04:51 -08:00
Matt Lott
7cd35ffc33 Update share progress mail to include sender email 2015-02-13 14:04:57 -08:00
Nick Winter
c29bb432e1 Merge pull request #2314 from laituan245/master 
A small fix to the PR #2313
 2015-02-13 13:46:45 -08:00
Matt Lott
81678e81d9 Merge pull request #2315 from amankr/autocomplete2 
Autocomplete bug fix #2233 - method 2

Thanks @amankr!
 2015-02-13 13:12:22 -08:00
Aman Kumar
85a024546b Autocomplete bug fix #2233 2015-02-14 02:21:54 +05:30
Aman Kumar
224213ccb0 Autocomplete bug fix #2233 2015-02-14 02:11:00 +05:30
Imperadeiro98
8b978c0047 Removed unused string 2015-02-13 20:39:03 +00:00
laituan245
93bbedd02d A small fix to the PR #2313 2015-02-14 05:27:58 +09:00
Aman Kumar
80fb124772 Autocomplete bug fix #2233 2015-02-14 01:56:05 +05:30
Barney
140ba5f9e0 Update zh-HANT.coffee 2015-02-14 03:57:09 +08:00
Barney
248d6dd1ef Merge remote-tracking branch 'upstream/master' 2015-02-14 03:53:47 +08:00
Barney
dde3546564 Update zh-HANT.coffee 2015-02-14 03:53:44 +08:00
Scott Erickson
52e5dc4719 Removed another instance of the old scope, for #2067. 2015-02-13 11:24:06 -08:00