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

12187 commits

This branch
This branch
All branches
Author SHA1 Message Date
phoenixeliot
5259a86d3a Merge branch 'master' into production 2016-07-19 14:20:45 -07:00
phoenixeliot
6fdda491bd Fix for when database courses/campaigns don't match 2016-07-19 14:13:24 -07:00
Matt Lott
01a8312617 🐛Classroom last played string null level check 2016-07-19 10:10:48 -07:00
Matt Lott
f43012c7a6 Merge branch 'master' into production 2016-07-19 09:29:11 -07:00
Matt Lott
7bf3fc6a78 🐛Don't route level load error mails to sales 2016-07-19 06:36:11 -07:00
Matt Lott
1f1132ecf8 Prioritize displaying first/last names over username 2016-07-18 12:38:29 -07:00
phoenixeliot
2bc020ab4d Merge branch 'master' into production 2016-07-18 11:43:11 -07:00
phoenixeliot
4e449fea3b Fix gplus/fb signin and tests 2016-07-18 11:41:18 -07:00
phoenixeliot
d7209d784e Add option to print current spec name to jasmine 2016-07-18 10:56:25 -07:00
phoenixeliot
316e0d7144 Merge branch 'master' into production 2016-07-18 10:47:10 -07:00
phoenixeliot
1d616cd92a Fix indentation 2016-07-18 10:46:51 -07:00
phoenixeliot
96fa50afe4 Merge branch 'master' into production 2016-07-18 10:42:54 -07:00
phoenixeliot
bb6262483f Allow username-only signup for classroom users 
Address some code review feedback

Correct error code in test

Don't try to send emails to empty addresses

Add tests for subscriptions

Add tests for Next Steps email

Fix specs

Add reason for disabled test
 2016-07-18 10:41:17 -07:00
Bryukhanov Valentin
ff523c2431 Merge pull request #3802 from codecombat/Bryukh-ru-hints 
Update ru.coffee - hints ui
 2016-07-18 20:23:51 +03:00
Matt Lott
68ebfa0e39 Update license inquiry call task name 2016-07-18 10:08:23 -07:00
Bryukhanov Valentin
2852f5014c Update ru.coffee - hints ui 
Add "hints" translations in the editor UI
 2016-07-18 19:54:20 +03:00
Matt Lott
607c129c7f School active licenses admin page 2016-07-18 09:41:42 -07:00
Nick Winter
0922eec2cc Add stubs for game-dev-1, web-dev-1, and web-dev-2 to updateCourses script 2016-07-15 14:47:42 -07:00
Scott Erickson
0a8514b688 Merge branch 'master' of https://github.com/codecombat/codecombat 2016-07-15 13:44:19 -07:00
Scott Erickson
df028b32bb Add compiler requirements to fix npm update 2016-07-15 13:43:08 -07:00
Nick Winter
8a074b7777 Merge branch 'master' into production 2016-07-15 13:28:47 -07:00
Scott Erickson
486949d07c Admin only courses (#3797) 
* adminOnly course field

* Properly check not-admin-only when fetching courses
 2016-07-15 13:28:35 -07:00
Scott Erickson
6652b4920b Have travis run npm update after install 
This is to make sure it's running the latest possible npm modules, in case of
 bugs they introduce.
 2016-07-15 09:59:10 -07:00
Nick Winter
fee1a6f98b Merge branch 'master' into production 2016-07-15 08:15:57 -07:00
Nick Winter
3c8db7e055 Fix Mongoose at 4.5.3 while 4.5.4 has bug creating new clans and trial requests 2016-07-15 08:15:44 -07:00
phoenixeliot
091c062d67 Merge branch 'master' into production 2016-07-14 16:38:33 -07:00
phoenixeliot
c3ed217964 Fix i18n render bug on SimulateTabView 2016-07-14 16:20:15 -07:00
Scott Erickson
dd88f39761 Add shareable property to levels 2016-07-14 15:48:42 -07:00
phoenixeliot
5a98926d52 Merge branch 'master' into production 2016-07-14 11:28:02 -07:00
phoenixeliot
5e10e34825 Add spy buttons to admin page search results 2016-07-14 11:27:18 -07:00
Scott Erickson
2284a9f495 Remove semi-colons from AnalyticsView to satisfy linter 2016-07-14 10:10:22 -07:00
Scott Erickson
48502c40e6 Merge pull request #3788 from matt-sanders/master 
fixes #3393 by allowing the content to scroll
 2016-07-14 10:03:12 -07:00
Nick Winter
028b153004 Fix avatar link 2016-07-13 14:21:38 -07:00
themaka
b029d0b01b Added Dan TDM to our Avatar pool 2016-07-13 13:24:28 -04:00
Nick Winter
872e83e9b7 Don't use course hero in verifier / level editor for type: 'course' level 2016-07-13 10:04:43 -07:00
Scott Erickson
0b1e1ddcb4 Merge branch 'game-dev-levels' 2016-07-12 11:00:29 -07:00
Matt Lott
102139ce8f Update automatic sales lead importing 
Shifting distributions around a bit.
 2016-07-12 06:32:50 -07:00
Rob
b2bdae274f Lets just use replica strings for level session connections. 2016-07-11 18:03:09 -07:00
Nick Winter
cd47a9d4ea Fix inconsistent verifier results when run with multiple levels batched 2016-07-11 16:59:00 -07:00
Rob
88bd74a5a5 Add options for separate level session database and aux level session database. 2016-07-11 16:41:13 -07:00
Matt Lott
f8a67ace0e Remove items from course victory dialog 2016-07-11 16:01:34 -07:00
Matt Lott
16c9f10043 🐛Fix course victory dialog level progress counts 
Use classroom versioned levels instead of latest course levels.
Use current level session instead of stale one.
 2016-07-11 13:28:52 -07:00
phoenixeliot
b9883afb81 Merge branch 'master' into production 2016-07-11 11:51:25 -07:00
phoenixeliot
0cf04a9658 Fix birthday form layout in firefox 2016-07-11 11:51:12 -07:00
Nick Winter
dbc99ba52b Merge branch 'master' into production 2016-07-11 10:44:13 -07:00
Nick Winter
a5a955ca6b Always show indent guides 2016-07-11 08:35:44 -07:00
Nick Winter
15aeb7631f Rename default ogres-die goal 2016-07-11 08:35:44 -07:00
David Liu
2ebef96d28 Fix birthday form validation in signup (#3787) 2016-07-11 08:34:29 -07:00
Matt Sanders
ed498ace7e fixes #3393 by allowing the content to scroll 2016-07-11 17:01:33 +12:00
Matt Lott
9b68e91409 🐛Fix analytics dashboard coursePrepaid use 2016-07-10 17:55:07 -07:00