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
12465 commits 27 branches 0 tags 134 MiB
Commit graph

12465 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
de567c6570 Add script for unsettings a user's student role 2016-06-27 09:39:29 -07:00
Scott Erickson
fa1143e599 Merge pull request #3762 from UltCombo/gh-3729 
Create account modal: don't open Facebook popup when pressing Enter in an input field, fixes #3729
 2016-06-27 09:10:47 -07:00
Bryukhanov Valentin
0878d76332 Merge pull request #3751 from Bryukh/patch-2 
Fix ru translation for "press"
 2016-06-27 18:16:05 +03:00
Catsync
caa2eaf6d9 Merge pull request #3757 from Catsync/no-big-levels 
Don't make the current level's dot bigger than other levels.
 2016-06-27 11:08:05 -04:00
Matt Lott
15fb9ae0a9 Add more intercom data to Close.io leads 
intercom_lastSeen
intercom_sessionCount
 2016-06-26 20:46:03 -07:00
Matt Lott
85c1c16818 Add 2 month close date to license request opps 2016-06-26 19:53:35 -07:00
Matt Lott
08886460c2 Remove default licenses needed from request form 2016-06-26 14:49:09 -07:00
Matt Lott
126d5d182a Merge branch 'master' into production 2016-06-25 08:39:26 -07:00
Matt Lott
425115ad37 Remove level type 'hero-practice', use level.practice 2016-06-25 08:38:59 -07:00
Fabrício Matté
26b0ad7fd1 Create account modal: don't open Facebook popup when pressing Enter in an input field, fixes #3729 
Ref: #3729

`<button>`s are `type="submit"` by default.
 2016-06-25 03:23:02 -03:00
Nick Winter
9283561ff6 Merge branch 'master' into production 2016-06-24 15:55:35 -07:00
Nick Winter
a9b94f55dd Preparing for master-wizard 2016-06-24 15:02:57 -07:00
Nick Winter
69eb1dc07a Preparing for master-wizard 2016-06-24 15:01:49 -07:00
Nick Winter
a4654f613d Add two starting new heroes. Fix #2753 again for now. 2016-06-24 14:57:21 -07:00
Nick Winter
1a31692775 Automatically translate false->False, null->None, etc. in docs for Python 2016-06-24 09:36:18 -07:00
Nick Winter
7c876401bc Do show bonus goals in course mode if you actually achieve them 2016-06-24 08:50:38 -07:00
Catsync
f1d17ebcba Don't show optional goals if playing level as type 'course' (#3758) 2016-06-24 08:32:50 -07:00
shuwn
c6fcf588f7 Update DiplomatView.coffee (#3750) 2016-06-24 15:40:50 +01:00
Diego Toala
691228c9e7 Update es-419.coffee (#3753) 
I´ve translated to spanish more content. I´m sure it is ok on Latam context.
 2016-06-24 13:32:43 +01:00
Cat Sync
c6b0519eca Don't make the current level's dot bigger than other dots. 2016-06-23 18:26:01 -04:00
Cat Sync
70fe21f645 Merge remote-tracking branch 'codecombat/master' 2016-06-23 15:01:44 -04:00
Rob
cf961b8ba6 Merge branch 'master' into production 2016-06-23 10:07:39 -07:00
Rob
bbb70fd486 Tighten modernness requirements (mostly to exclude Edge 13) 2016-06-23 09:34:37 -07:00
Matt Lott
c1f6e16f71 Merge branch 'master' into production 2016-06-23 06:14:00 -07:00
Matt Lott
18de9ab298 Create call tasks and opps for license requests 2016-06-23 06:12:51 -07:00
Josh Callebaut
b8bdc0c726 Merge pull request #3754 from Zerrien/campaign-treema-display 
Clicking on level in treema makes the level flash
 2016-06-22 15:56:54 -07:00
Josh Callebaut
e953f7fc60 Cleaner jQuery selection 2016-06-22 15:36:42 -07:00
Josh Callebaut
0ad8fddff6 Clicking on level in treema makes the level flash 2016-06-22 15:11:27 -07:00
Rob
f100e7ab52 Non-integer indentation levels are impossible. 2016-06-22 15:08:20 -07:00
Rob
6a03163fcb - Use modern esper engine if we detect browser support it. 
- Change streaming batch size depending on how far into simulation we are.
- Hoist try catch out of onWorldLoad so Chrome and JIT it.
 2016-06-22 15:07:43 -07:00
leshark
d70a4ff14d Update ru.coffee 2016-06-22 22:59:44 +04:00
Matt Lott
0cf4b26b20 Merge branch 'master' into production 2016-06-22 09:46:33 -07:00
Bryukhanov Valentin
4f245a0ae9 Fix ru translation for "press" 2016-06-22 14:27:11 +03:00
Matt Lott
1d70837309 Exclude practice levels from teacher course guides 2016-06-21 21:10:59 -07:00
Matt Lott
73698129a0 Make level practice threshold available in editor 2016-06-21 16:41:47 -07:00
Cat Sync
168cdc800d Merge remote-tracking branch 'codecombat/master' 2016-06-21 15:23:36 -04:00
Rob
bdfa6d435a Add extra options to verifier. 2016-06-21 11:48:42 -07:00
Matt Lott
6eef19e488 Update homepage course languages image 2016-06-21 10:19:47 -07:00
Nick Winter
56cdfa9fc7 Update our /privacy address 2016-06-21 09:41:21 -07:00
Matt Lott
d65f667f5e Merge branch 'master' into production 2016-06-21 09:35:53 -07:00
Matt Lott
df90935aba Admin school counts page 2016-06-21 09:33:06 -07:00
Ana
4bac7765e2 Update sr.coffee (#3745) 
update courses section
 2016-06-21 11:05:30 +01:00
Nick Winter
e5189c90fb Merge branch 'master' into production 2016-06-20 17:11:01 -07:00
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