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

12422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
2679bced07 Fix level editor not loading after recent hotfix 2016-06-20 17:10:55 -07:00
Scott Erickson
38d19a142a Add checks to keep User purchased.gems from becoming NaN 
Also sought to more thoroughly protect earned.gems.
 2016-06-20 16:44:07 -07:00
Scott Erickson
d829d15528 Fix(ish) race conditions in server tests 2016-06-20 15:00:29 -07:00
Scott Erickson
f51082485a Merge branch 'master' into production 2016-06-20 14:36:20 -07:00
Scott Erickson
99bae92fcb Fix GET /db/level/:handle/session for sessionless requests 2016-06-20 14:35:52 -07:00
Scott Erickson
b36752107e Hot fix for teachers playing level previews 2016-06-20 14:26:45 -07:00
Nick Winter
7476e86b38 Merge branch 'master' into production 2016-06-20 10:48:31 -07:00
Nick Winter
380977f766 Fix #3744: course levels work with no hero selected 2016-06-20 10:47:15 -07:00
Scott Erickson
503d1dd08a Merge pull request #3746 from dideler/cleanup-readme 
Show names of team members on hover
 2016-06-20 10:29:53 -07:00
Matt Lott
7b88ea59fa Merge branch 'master' into production 2016-06-20 09:30:46 -07:00
Matt Lott
e0170d0339 Add hero-practice level type and threshold to schema 
Filtering out hero-practice levels from classrooms until the Ux
supports them.
 2016-06-19 20:23:32 -07:00
Dennis Ideler
d52e217c26 Show names when hovering over avatars 
Add titles to avatar images.
 2016-06-19 16:20:14 +01:00
Dennis Ideler
d556e8c153 Split long lines for readability 
Try to adhere to 80 char limit per line where possible.

Note that internal links are now relative instead of absolute. Besides
being more terse, it has the added benefit that they will still work in
case of a project or organization rename.
 2016-06-19 16:09:20 +01:00
Matt Lott
cd30e4d083 Send sales auto mails from same user per lead 2016-06-18 23:21:09 -07:00
Imperadeiro98
b758b531d8 Uncomment an header from fr.coffee 2016-06-18 10:36:30 +01:00
zeinamakky
8a955d22f3 translated some of the phrases (#3741) 2016-06-18 10:35:47 +01:00
Sara J. Martinez
0f257373be Add several translations for Latin American Spanish (#3740) 2016-06-18 10:34:33 +01:00
Matt Lott
190c5407c8 ZenProspect to Close contact import script 2016-06-17 21:05:46 -07:00
Matt Lott
3cf602c5cf Merge branch 'master' into production 2016-06-17 15:42:38 -07:00
Matt Lott
4622337d82 Update licenses needed form 
Ensure the needed licenses are in the subject resulting email.
 2016-06-17 15:40:07 -07:00
Scott Erickson
514fce349a Include ladder levels in level stats in teacher views, clean client test logs 2016-06-17 15:15:13 -07:00
Scott Erickson
490ea8d1bc Add state to delighted data if state was populated by nces 2016-06-17 13:53:49 -07:00
Rob
b4baad82b0 Don't set up the analytics log model in proxy mode. 2016-06-17 11:41:43 -07:00
Scott Erickson
8657f97867 Switch travis client test progress to dots 2016-06-17 10:42:59 -07:00
Scott Erickson
0581ffde82 Clean server test logging 2016-06-17 10:35:22 -07:00
Scott Erickson
ca83ed05e4 Only require user sessions on /db requests that are not GET 2016-06-16 16:00:45 -07:00
Scott Erickson
972c632d85 Fix fr.coffee indentation 2016-06-16 14:32:52 -07:00
Nick Winter
2c33861c64 Merge branch 'master' into production 2016-06-16 12:57:59 -07:00
Catsync
6901b758e6 Update estimated course times (#3738) 
* Update time estimates for courses.

* Update coming soon text.
 2016-06-16 12:56:43 -07:00
Cat Sync
6f86617d9b Merge remote-tracking branch 'codecombat/master' 2016-06-16 11:48:17 -07:00
Scott Erickson
57def1fbeb Merge pull request #3727 from duybkict/refactor-MyMatchesTabView 
#3138 #3488 refactor MyMatchesTabView
 2016-06-16 10:41:17 -07:00
Scott Erickson
a4b5e92b06 Merge pull request #3726 from duybkict/refactor-SimulateTabView 
#3138 #3488 refactor SimulateTabView
 2016-06-16 10:34:53 -07:00
Matt Lott
40786dbdaa Merge branch 'master' into production 2016-06-16 10:22:11 -07:00
Matt Lott
6739353d8e 🐛Fix hint intro overview duplicates 2016-06-16 10:21:37 -07:00
Cat Sync
eec7f6d697 Merge remote-tracking branch 'codecombat/master' 2016-06-15 16:26:25 -07:00
Matt Lott
c605586117 Merge branch 'master' into production 2016-06-15 16:18:56 -07:00
Scott Erickson
86fc4a3846 Hints v1 
Add per-level tips and tricks, available during gameplay to help unstick players.

Closes #3736
 2016-06-15 16:12:41 -07:00
Scott Erickson
c8e7b79e5d Make demoEl run _.once 2016-06-15 16:09:24 -07:00
Scott Erickson
de138c2581 Disable ModuleLoader debug logs because they get in the way 2016-06-15 16:09:24 -07:00
phoenixeliot
b4f67a71e6 Merge branch 'master' into production 2016-06-15 15:08:55 -07:00
phoenixeliot
e841334c86 Fix join class modal (temporary hack) 2016-06-15 13:28:03 -07:00
phoenixeliot
9239d2a81b Fix text overflowing on teacher dashboard 2016-06-15 13:09:43 -07:00
Nick Winter
109de55185 Stop unprocessing flag events when serializing the flag history so that flag history is properly deterministic again 2016-06-14 18:02:08 -07:00
Matt Lott
409b170891 Update inbound lead assignment splits 2016-06-14 16:44:51 -07:00
phoenixeliot
53aa6652a0 Merge branch 'master' into production 2016-06-14 14:29:19 -07:00
phoenixeliot
749601c9d8 Don't cache classrooms (fetched by memberID) 2016-06-14 14:27:57 -07:00
phoenixeliot
b95a051d63 Merge branch 'master' into production 2016-06-14 13:03:52 -07:00
phoenixeliot
e73a31abe6 Fix loading hero thangs more 2016-06-14 13:03:42 -07:00
phoenixeliot
46abc1899d Merge branch 'master' into production 2016-06-14 12:01:28 -07:00
phoenixeliot
b3f8b79897 Register dependencies for course mode too 2016-06-14 12:01:12 -07:00