codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-13 09:11:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11794 commits 27 branches 0 tags 134 MiB
Commit graph

11794 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Lott
864e18d23b Merge branch 'master' into production 2016-05-27 11:24:22 -07:00
phoenixeliot
438e8e426c Fix potential undefined error in logging 2016-05-27 11:22:33 -07:00
Matt Lott
5fcc3669af 🐛Revert to css-brunch ^1.7.0 2016-05-27 11:19:50 -07:00
duybkict
ebab0dedec minor fixes 2016-05-27 10:42:21 -07:00
duybkict
877bea35e7 add new vagrant box "brunchv2", revert npm package upgrades in package.json 2016-05-27 10:41:02 -07:00
duybkict
e3c2947e2d upgrade brunch related packages to >=2.0.0 2016-05-27 10:40:54 -07:00
Matt Lott
9ce4ac51f0 Role-based hard feature blocks 2016-05-27 10:40:54 -07:00
Matt Lott
d0d3d838ed Better page titles 
Also ditching non-production constructor page titles
 2016-05-27 09:40:46 -07:00
Matt Lott
72b8674237 Add error message for closeIO.getSalesContactEmail 2016-05-26 17:02:58 -07:00
Matt Lott
4bb3ac1f0a Replace Anoner with Anonymous 
Closes #3686
 2016-05-26 16:54:24 -07:00
phoenixeliot
9bc35db7a6 Include teacher name in course invite email data 
In preparation for changing the sendwithus template.
 2016-05-26 16:24:13 -07:00
phoenixeliot
c9ece55d49 Fix console.log to log.debug 2016-05-26 16:15:09 -07:00
phoenixeliot
77ba873da9 Add tests for teacher password reset endpoint 2016-05-26 16:07:55 -07:00
Scott Erickson
6b3e94d60a Remove log 2016-05-26 15:12:10 -07:00
Scott Erickson
0c51748dcd Merge branch 'master' into production 2016-05-26 15:02:25 -07:00
Scott Erickson
7d1d1500d9 Fix course progress tab select 2016-05-26 15:01:23 -07:00
phoenixeliot
dfcbbb7c9c Log classroom forbidden errors for debugging 2016-05-26 14:54:11 -07:00
Scott Erickson
8f7e4e2278 Add hints to level schema, I18N editor 2016-05-26 14:51:28 -07:00
Scott Erickson
b255b02854 Add POST /db/level/:handle test 
It's erroring in my dev console, complaining of duplicate keys, and not sure why.
Adding a test to make sure creating a new level version doesn't break.
 2016-05-26 14:46:54 -07:00
Nick Winter
460a88b6b0 Merge branch 'master' into production 2016-05-26 13:47:36 -07:00
Nick Winter
feeca7a586 Sending HTML emails now so that Front will eat them 2016-05-26 13:34:36 -07:00
Scott Erickson
3ca32f93a1 Merge pull request #3680 from duybkict/vagrant-brunch-v2 
Add vagrant box for brunch v2
 2016-05-26 11:12:41 -07:00
Scott Erickson
886ddd381d Add getPrepaidsFor script for updating start/end dates 2016-05-26 10:50:48 -07:00
Nick Winter
36e6daed2e Merge branch 'master' into production 2016-05-26 10:16:27 -07:00
Matt Lott
770987715e Update under 13 account creation copy 2016-05-26 10:02:25 -07:00
Bryukhanov Valentin
7e958639b2 Add choice method in rand (#3682) 
As in python random module. It can be useful for levels instead "someArray[@world.rand.rand(someArray.length)]".
 2016-05-26 09:44:50 -07:00
duybkict
38ebd6111d minor fixes 2016-05-26 16:52:57 +07:00
duybkict
36fdd79b6a add new vagrant box "brunchv2", revert npm package upgrades in package.json 2016-05-26 15:44:35 +07:00
duybkict
6e36a4abc4 Merge branch 'master' into vagrant-brunch-v2 
# Conflicts:
#	package.json
 2016-05-26 10:50:40 +07:00
Matt Lott
de9761073d Temporarily disable /contact server test 2016-05-25 16:54:14 -07:00
Matt Lott
a14aae8c94 Merge branch 'master' into production 2016-05-25 16:25:18 -07:00
Matt Lott
6246ac0955 Send request licenses emails to Close.io sales contact 2016-05-25 16:03:08 -07:00
Scott Erickson
106057b99d Make jasmine server test timeout longer 
A production travis test failed because of a timeout:
https://travis-ci.org/codecombat/codecombat/builds/132905284

Timeout used to be two minutes for Stripe tests, was removed after those were nocked,
now turning back on somewhere to somewhere in between.
 2016-05-25 14:48:54 -07:00
Scott Erickson
673c608d5a Add deteacher script 2016-05-25 14:46:07 -07:00
Scott Erickson
0bddd45e97 Merge branch 'master' into production 2016-05-25 10:30:01 -07:00
Scott Erickson
b0ad8b2573 Fix GET /db/level/:handle/session 
When making a course session and user has a HoC course instance (no associated classroom)
 2016-05-25 10:26:12 -07:00
Matt Lott
5685c21b93 Merge branch 'master' into production 2016-05-25 09:34:11 -07:00
Matt Lott
e218af8418 Terminology change: enrollments/credits => licenses 
Closes #3676
 2016-05-25 09:27:47 -07:00
Nick Winter
9cdc3289db Rename pet name categories 2016-05-25 09:23:32 -07:00
Nick Winter
bfcf9605e5 Merge branch 'master' into production 2016-05-25 09:05:07 -07:00
Nick Winter
21c83fe55c Handle the missing classroom error properly I think 2016-05-25 09:04:35 -07:00
phoenixeliot
8efe61bafe Merge branch 'master' into production 2016-05-24 17:00:31 -07:00
phoenixeliot
7c8a2b3020 Fix My Classes progress dot again 2016-05-24 16:59:46 -07:00
Matt Lott
c7d3857d46 Send all imported NL/BE leads to NL contact 2016-05-24 16:54:38 -07:00
phoenixeliot
72804ffc3e Merge branch 'master' into production 2016-05-24 16:39:11 -07:00
phoenixeliot
2ce666df9c Remove revocation tests 2016-05-24 16:38:52 -07:00
Scott Erickson
bcf015e3a4 Update to final version of enrollment start/end dates migration script 2016-05-24 16:25:19 -07:00
Matt Lott
f733ce222a Update inbound lead importing 
Assigning lower priority EU leads to NL contact
Fix bug where we sent intl emails to US leads
Send Dutch emails to NL and BE low priority leads
 2016-05-24 16:10:33 -07:00
phoenixeliot
9555a12e5c Merge branch 'master' into production 2016-05-24 16:05:57 -07:00
phoenixeliot
a1a55a9b6d Remove revoke functionality 2016-05-24 16:05:40 -07:00