Commit graph

12479 commits

Author SHA1 Message Date
Nick Winter
345036f68f Merge pull request #3303 from taptapdan/fix-issue-3299
Fix thangTypes filtering in serialize
2016-01-12 08:39:58 -08:00
Imperadeiro98
49c57bbf6b Update pt-PT.coffee 2016-01-11 21:17:53 +00:00
Nick Winter
a91f33df4b Propagate i18n 2016-01-11 12:59:28 -08:00
Imperadeiro98
cfa4617e16 Add indicator to changed string 2016-01-11 20:57:42 +00:00
Imperadeiro98
f60f17ce47 Merge pull request #3313 from durianboy/patch-3
Patch 3
2016-01-11 20:27:07 +00:00
Robin Yang
f49a239367 Add Mongo 3.2 to list of allowed versions for running database 2016-01-11 11:18:14 -08:00
Nick Winter
7adfc23f2a Look at subscriptionID instead of planID for checking active subscribers 2016-01-11 10:32:23 -08:00
Maka
e786073f5b Updated teacher page to remove 'unlimited enrollment' reference. 2016-01-11 12:59:49 -05:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Nick Winter
c0fd58401f Fix analytics query finding limited number of recent sessions 2016-01-11 09:51:23 -08:00
Nick Winter
01b181ee43 Add script to find active subscribers by country 2016-01-11 09:50:44 -08:00
durianboy
ae368894e1 Update zh-HANT.coffee 2016-01-11 17:45:41 +08:00
durianboy
62e1a0b876 Update zh-HANT.coffee 2016-01-11 17:24:39 +08:00
Imperadeiro98
150e517c73 Merge pull request #3309 from xavismeh/master
Enhanced french translation
2016-01-10 19:43:56 +00:00
Imperadeiro98
5d439834ba Merge pull request #3305 from darulis1/patch-1
Update lt.coffee
2016-01-10 19:36:19 +00:00
Xavier Coureau
3f9a0c2973 Enhanced french translation
Typo

Typo
2016-01-09 23:45:49 +01:00
Matt Lott
213f3edd0d Update /about team section 2016-01-08 10:25:21 -08:00
darulis1
838c0f20cb Update lt.coffee 2016-01-08 16:59:58 +02:00
Imperadeiro98
39697ebc86 Merge pull request #3304 from durianboy/patch-2
Update zh-HANT.coffee
2016-01-08 12:56:05 +00:00
Matt Lott
d74b61fd96 Update approved trial request server test 2016-01-07 16:14:33 -08:00
Matt Lott
017dea696f Remove HoC extra 2 months trial enrollments 2016-01-07 15:45:46 -08:00
durianboy
070324e9c5 Update zh-HANT.coffee 2016-01-08 05:34:47 +08:00
durianboy
2f4079084b Update zh-HANT.coffee
我需要有人告訴我我這樣算是上傳pull請求嗎?
I need someone to tell me have I PULL by propose file change?
2016-01-08 05:04:30 +08:00
Daniel Fiore
ed17d967d2 Fix thangTypes filtering in serialize 2016-01-07 12:26:40 -08:00
Scott Erickson
a10aec256f Set upper limit to max seats you can purchase at once 2016-01-07 09:54:02 -08:00
Scott Erickson
13b9d81e4c Fix some demo views 2016-01-07 09:40:35 -08:00
Scott Erickson
5941c4b27f Add autocomplete and slider to design elements view, limit showing javascript widgets automagically 2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00
Scott Erickson
fde11d8f0d Add fill defaults button to solutions treema node in level editor 2016-01-06 13:50:06 -08:00
Rob
86d9b081c1 Merge branch 'cashew' 2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a Add code highlighting to solution treema nodes in level editor 2016-01-06 09:58:04 -08:00
Imperadeiro98
9b2cfeafb1 Merge pull request #3300 from xavismeh/master
Enhanced french translation
2016-01-06 14:30:48 +00:00
Imperadeiro98
a8d4d68da8 Remove duplicate key from LevelSystem.coffee 2016-01-06 14:24:22 +00:00
Xavier Coureau
f309f5dad3 Merge remote-tracking branch 'upstream/master' 2016-01-06 00:45:44 +01:00
Nick Winter
7864d3708b Change traditional Chinese label to be in traditional Chinese 2016-01-05 15:20:22 -08:00
Nick Winter
568f04ac39 Merge pull request #3296 from taptapdan/fix-issue-3264
Fix isSilhouettedItem
2016-01-05 14:20:23 -08:00
Nick Winter
c15b67f654 Merge pull request #3297 from taptapdan/fix-issue-3294
Fix Earned Achievements Check
2016-01-05 14:16:42 -08:00
ryang217
c29db142a1 Add locale keys for Robin About Page entry
Adding onto 57ed2fa.
2016-01-05 14:02:08 -08:00
ryang217
57ed2fae67 Added Robin to About page 2016-01-05 13:04:02 -08:00
Imperadeiro98
34cc8c07dd Merge pull request #3298 from Goby-Wan/master
Updates FR locale file
2016-01-05 17:06:39 +00:00
GOBY Alexandre
86af16cead Merge pull request #1 from Goby-Wan/Goby-Wan-patch-1
Update fr.coffee
2016-01-05 17:40:52 +01:00
GOBY Alexandre
061509dfb3 Update fr.coffee 2016-01-05 17:35:57 +01:00
Xavier Coureau
87741c6e93 Enhanced french translation 2016-01-05 16:19:54 +01:00
Daniel Fiore
a215c2e01c Fix Earned Achievements Check 2016-01-04 19:23:14 -08:00
Rob
3b4433e312 Use hero instead of this. Also use published aether package. 2016-01-04 17:23:58 -08:00
Rob
3baea9683c Additional java support. 2016-01-04 16:41:24 -08:00
Scott Erickson
220c124780 Remove enum from user gender string
Fixes a bug where when logging in with G+ with profile gender 'other', login doesn't fail silently.
2016-01-04 16:34:50 -08:00
CodeCombat
41a532cb50 WIP - cashew integration 2016-01-04 16:27:27 -08:00
Daniel Fiore
9ccb0dd3cb Fix isSilhouettedItem
This fixes #3264. Checks were failing in cases where no gold amount was
set and tier was 0. Checks are now using existential operator to ensure
null/undefined.
2016-01-02 16:10:03 -08:00
Imperadeiro98
20c9d3fca2 Merge pull request #3293 from Ikuyadeu/patch-1
Update ja.coffee
2016-01-01 22:37:14 +00:00