Commit graph

5898 commits

Author SHA1 Message Date
George Saines
9adb59f9ad fixing the buy gems background 2015-02-25 14:21:32 -08:00
Nick Winter
714ff0a249 Merge pull request #2408 from laituan245/master
Update hero-victory-modal.sass (Issue 1917)
2015-02-25 13:59:52 -08:00
laituan245
e73208f8e8 Update hero-victory-modal.sass 2015-02-26 06:03:17 +09:00
Nick Winter
15ca65f226 Further disabled employer portal for now. 2015-02-25 12:38:51 -08:00
Nick Winter
d58d151b8c Got rid of debugging code that was making Hour of Code stuff always show up. 2015-02-25 12:32:59 -08:00
Nick Winter
a66e1c5389 Retoring next level highlight arrow for players who are very new when they click off a selected level. 2015-02-25 11:58:03 -08:00
Nick Winter
9be8c55d6f Started some new Thang name categories for #53. 2015-02-25 11:50:43 -08:00
Nick Winter
13f9d71cca You can now use bitcoin to buy gems. 2015-02-25 11:33:51 -08:00
Nick Winter
1ab8274c43 Added a clear storage button to the campaign editor. 2015-02-25 11:09:15 -08:00
angryelven-jdd
6654cfb410 Update de-DE.coffee
translated subscription section
2015-02-25 16:05:06 +01:00
Nick Winter
1c14059d92 Better console logging for Vectors and shapes. 2015-02-24 18:21:33 -08:00
George Saines
88ebd5f46b adding subscribe option to buy gems modal 2015-02-24 17:40:50 -08:00
Imperadeiro98
289ddb0a4f Removed unneeded strong tag from last merge 2015-02-24 21:54:13 +00:00
Shady Kamal
431b9dca85 Update he.coffee 2015-02-24 23:42:47 +02:00
Nick Winter
be625cbfbe Merge pull request #2403 from divyanshu013/master
Bug fix for long hero button text in Russian for #1918
2015-02-24 12:56:55 -08:00
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
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
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
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