Commit graph

7860 commits

Author SHA1 Message Date
Imperadeiro98
c174cc35fa Merge pull request #2401 from popey456963/master
Update teacher.jade
2015-02-24 20:49:13 +00:00
Popey456963
e5c71d0c6a Changed aimed to recommended 2015-02-24 20:46:49 +00:00
Popey456963
f79d90b81f Changed requirement to recommended 2015-02-24 20:40:44 +00:00
divyanshu013
f2459f1b39 Bug fix for long hero button text in Russian for #1918 2015-02-25 02:08:08 +05:30
Popey456963
9419ec1d33 Update EN.coffee
For new Teacher.jade
2015-02-24 20:17:04 +00:00
Nick Winter
9dd07b024e Fixed item shop not loading items with later letters of the alphabet, since there are now so many items. 2015-02-24 12:15:35 -08:00
Popey456963
dabf5ce57d Added minimum age 2015-02-24 20:13:13 +00:00
Nick Winter
1c691283c4 Merge pull request #2400 from laituan245/iss2388
Add Profile to account page (Issue #2388)
2015-02-24 11:57:19 -08:00
laituan245
23a9aa5e33 Changed the URL style 2015-02-25 04:53:20 +09:00
Imperadeiro98
49b6f4ff82 Merge pull request #2397 from divyanshu013/patch-1
Update hi.coffee
2015-02-24 19:52:09 +00:00
Nick Winter
592fd52699 Fixed ko.coffee inventory header. 2015-02-24 11:48:44 -08:00
Nick Winter
8fd2b99336 Merge branch 'Melondonut-patch-5' 2015-02-24 11:47:39 -08:00
Nick Winter
1e448abde2 Merged ko.coffee. 2015-02-24 11:47:33 -08:00
Divyanshu Maithani
17bdabcc7a Update hi.coffee 2015-02-25 01:16:47 +05:30
Nick Winter
e48d996a60 Fixed #2286. 2015-02-24 11:45:50 -08:00
Popey456963
ff8e18146e Edited Teacher.Jade
Removed HoC references, Added Arrays and Expanded Acronym
2015-02-24 19:31:22 +00:00
Imperadeiro98
9f9e9cc639 Update pt-PT.coffee 2015-02-24 19:24:12 +00:00
Imperadeiro98
088d194755 Merge pull request #2396 from ITz7/patch-6
Update zh-HANT.coffee
2015-02-24 19:08:06 +00:00
Imperadeiro98
f42a2af8d7 Merge pull request #2395 from ITz7/patch-5
Update zh-HANS.coffee
2015-02-24 19:07:21 +00:00
laituan245
a78f864607 Add Profile to account page (Issue #2388) 2015-02-25 04:03:46 +09:00
Nick Winter
4cbbcdad6d Merge pull request #2359 from laituan245/master
Added ability to delete account
2015-02-24 09:30:22 -08:00
laituan245
a588a3b2c8 Some updates to the PR #2359 2015-02-25 02:12:39 +09:00
Nick Winter
df6de2b18b Merge pull request #2398 from amankr/bugfix
Issue #2387: Accounts setting toggle all fix
2015-02-24 07:39:44 -08:00
laituan245
eb53381083 Don't delete the User object, just remove all the properties except for _id 2015-02-24 22:36:12 +09:00
Aman Kumar
0df2dea469 Issue #2387: Accounts setting toggle all fix 2015-02-24 17:25:18 +05:30
Divyanshu Maithani
335e1d96e8 Update hi.coffee 2015-02-24 02:48:20 -08:00
ITz7
5d6b2a890c Update zh-HANT.coffee
wondered why Herotype isnt translated o.o
2015-02-24 14:41:18 +08:00
ITz7
a326361e42 Update zh-HANS.coffee
Many Minor Updates + FInalization :D
2015-02-24 14:36:46 +08:00
Nick Winter
c43ddda235 Reduced number of events being sent by cutting out simulator results. 2015-02-23 16:56:16 -08:00
Nick Winter
34a92838a5 Propagated i18n. 2015-02-23 16:01:06 -08:00
Nick Winter
69959caba5 Using common.play instead of home.play for a more-common use of it. 2015-02-23 15:59:42 -08:00
Nick Winter
88c55fa7fd Fix for making ja start game text break lines in the right places. #2386 2015-02-23 15:57:43 -08:00
Nick Winter
b40af42b60 Merge branch 'divyanshu013-master' 2015-02-23 15:06:11 -08:00
Nick Winter
4d35c2cefc Merged. 2015-02-23 15:05:54 -08:00
Nick Winter
0f6404fea1 Being a tiny bit more idiomatic about CoffeeScript ranges. 2015-02-23 15:03:48 -08:00
Nick Winter
6d9e7a76ce Merge pull request #2389 from amankr/bug/duplicates
Issue #2267: Removed duplicates from TreemaData
2015-02-23 15:02:20 -08:00
Nick Winter
fb10de5023 Merge pull request #2376 from amankr/login
Issue #2082: Campaign editor login fixed
2015-02-23 14:54:15 -08:00
Nick Winter
1513e20486 Merge pull request #2370 from amankr/newfeature
Issue #1785: Empty level editor folders removed
2015-02-23 14:53:08 -08:00
Nick Winter
1314695382 Merge pull request #2385 from nixel2007/master
Update diplomat.jade
2015-02-23 14:50:04 -08:00
Nick Winter
61831e83c2 Merge pull request #2368 from rmarren1/master
Slight cleanup to level indicator code
2015-02-23 14:49:13 -08:00
Nick Winter
fc2f623fd0 Merge pull request #2365 from popey456963/master
Mismatched Tags and Header Syntax
2015-02-23 14:48:23 -08:00
Aman Kumar
d8a4803268 Issue #2267: Removed duplicates from TreemaData 2015-02-24 03:18:35 +05:30
Imperadeiro98
8da626f03b Merge pull request #2386 from Coderaulic/patch-1
Update ja.coffee
2015-02-23 20:27:27 +00:00
Coderaulic
21ddb9ca59 Update ja.coffee
Some minor fixes added based on last changes.
Can you tell me how to add a line break?
Is it " text \ text " for:
text
text
as output? Or "ABC '\' DEF" for:
ABC
DEF
Not familiar with line breaks in coffee script.
2015-02-23 12:24:00 -08:00
Imperadeiro98
6afad49d8f Some fixes to last merge 2015-02-23 20:21:10 +00:00
Imperadeiro98
c375a8ed12 Merge pull request #2384 from etem/master
Update bg.coffee
2015-02-23 20:16:08 +00:00
Imperadeiro98
aad40bbe33 Merge pull request #2383 from musicogeek/patch-1
Update es-419.coffee
2015-02-23 20:12:01 +00:00
Imperadeiro98
7ea804458c Merge pull request #2382 from ITz7/patch-3
Update zh-HANT.coffee
2015-02-23 19:59:01 +00:00
Imperadeiro98
0d0dc5597d Merge pull request #2380 from ITz7/patch-2
Update zh-HANS.coffee
2015-02-23 19:57:54 +00:00
Imperadeiro98
9acea40089 Uncommented an header for last commit 2015-02-23 19:52:22 +00:00