Commit graph

11794 commits

Author SHA1 Message Date
Josh Callebaut
89fc6cc078 Removes stay logging, implements functionality improvements for artisan modals. 2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134 Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal. 2016-01-13 15:54:57 -08:00
Scott Erickson
3a9eaa4c83 Extend wait time for travis client testing 2016-01-13 14:02:51 -08:00
Nick Winter
be1091caf8 Merge pull request #3315 from ryang217/master
Cleaned up teacher testimonial area
2016-01-12 13:13:52 -08:00
Nick Winter
7aff24b3a6 Cleaned up a couple SubscribeModal things 2016-01-12 12:34:10 -08:00
Nick Winter
014d688b08 Merge branch 'master' into production 2016-01-12 12:29:04 -08:00
Nick Winter
63d643ac13 Merge branch 'brazil_coupon' 2016-01-12 12:26:36 -08:00
Nick Winter
67f7ce1e0d Add Brazil coupon test. Generalize prices in subscription test a bit more. Handle brazil_basic_subscription product in one more place. 2016-01-12 12:25:13 -08:00
Robin Yang
95a996af07 Cleaned up teacher testimonial area
Fixed quote per teacher (Tim M.)’s request, added Twitter link

Adjusted font sizing and positioning on quotes.

Added smart (curly) quotes instead of straight quotes.
2016-01-12 12:19:48 -08:00
Nick Winter
3615d213ac Merge branch 'master' into production 2016-01-12 09:57:33 -08:00
Nick Winter
59c6d15248 Fix serialization of levels in level editor 2016-01-12 09:42:41 -08:00
Nick Winter
02484fd172 Merge pull request #3314 from ryang217/master
Add Mongo 3.2 to list of allowed versions for running database
2016-01-12 08:42:24 -08:00
Nick Winter
01a3ae6020 Make sure #3303 works for multiplayer and future 'course' level hero selection 2016-01-12 08:41:18 -08:00
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
Rob
777505f75b Merge branch 'master' into production 2016-01-08 15:45:57 -08: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
045dbfce79 Merge branch 'master' into production 2016-01-06 12:37:00 -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