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

12502 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
5a4be88887 Named CS2 instructive activity 2016-09-15 13:20:22 -07:00
Nick Winter
77c16000e9 Add events module to CS2 curriculum plan. 2016-09-15 13:16:09 -07:00
ksuszka
fbe3733e5f Fixed wrong message for wrong password. (#3935) 2016-09-15 15:17:11 +01:00
Matt Lott
860ac8894b 🐛Fix delighted trial request test 2016-09-14 12:43:39 -07:00
Matt Lott
c92f2e152e Increase course trial request delighted delay to 10 days 2016-09-14 11:50:25 -07:00
Matt Lott
453aa1d0fb Show course description if no concepts on homepage 2016-09-14 11:11:01 -07:00
Matt Lott
7d38e9a06c 🐛Fix resource hub anonymous blurb centering 2016-09-14 10:37:38 -07:00
Matt Lott
42ed2ffde1 Remove student goals from game dev player view 2016-09-14 10:35:12 -07:00
Matt Lott
2be6a97dbd Unlock 1st part of resource hub for anonymous 2016-09-14 10:00:54 -07:00
Imperadeiro98
509df9a372 Some fixes to pt-BR 2016-09-14 15:01:22 +01:00
Matt Lott
0eae43c2e8 Add play level links to classroom levels admin page 2016-09-14 07:00:22 -07:00
Abimael Alcebíades
5b71a9bdb0 Update pt-BR.coffee (#3930) 2016-09-14 14:59:57 +01:00
Justinschut
eb77135b38 Update nl-NL.coffee (#3931) 
Some more translations for the dutch language.
 2016-09-14 14:59:26 +01:00
Matt Lott
cf34d1c935 No cache IE/Edge ajax db GETs via server response 
Closes #3929
 2016-09-14 06:06:32 -07:00
Nick Winter
5c4e9ca417 Finished CS3 curriculum guide 2016-09-13 16:12:23 -07:00
Rob
2a6e186c98 Also make redirect_uri configurable. 2016-09-13 15:33:58 -07:00
Phoenix Eliot
327474e53c Fix Brunch complaining about fonts' bower.json files 
Before this, Brunch would try to copy bower.json from those folders into our /fonts folder. Because there were two bower.json files, Brunch would always give this error:
`Error: ENOENT: no such file or directory, unlink '~/work/codecombat/public/fonts/bower.json'`

This fix just ignores those bower.json files instead of trying to put them in /public/fonts.
 2016-09-13 15:23:54 -07:00
Rob
8359c95489 Initial draft of clever integration. 2016-09-13 15:18:19 -07:00
Rob
6e2e3d5cb7 Check if searching for an id 2016-09-13 11:49:18 -07:00
Rob
61bf5824ac Query sphinx search if configured. 2016-09-13 11:48:49 -07:00
Nick Winter
9702c91127 Add first few modules for CS3 curriculum 2016-09-12 18:26:41 -07:00
Nick Winter
d7f4ef6809 Updates to CS 2 curriculum; stub for CS 3 curriculum modules 2016-09-12 16:26:59 -07:00
Thekiddiejsandpython
9f6d7c4932 Change Ipad message, fr.coffee update (#3927) 2016-09-12 23:50:18 +01:00
Thekiddiejsandpython
0db0409aa7 Update fr.coffee (#3926) 2016-09-12 23:21:12 +01:00
Justinschut
6c4d362210 Update nl-NL.coffee (#3918) 2016-09-12 23:19:29 +01:00
Matt Lott
318ec778d5 🐛Fix IE11 Array.find combat bug 
Array.find not supported yet
 2016-09-12 15:02:31 -07:00
Scott Erickson
a2e8badb6f Fix tests when running them as a user who has earned something 2016-09-12 10:57:17 -07:00
Matt Lott
9ccca9a5a3 🐛Remove duplicate test utils.makeLevelSession 2016-09-12 10:54:03 -07:00
Scott Erickson
71a63709e7 Restrict server jasmine to 2.4.1 2016-09-12 10:44:07 -07:00
Matt Lott
b803080bed Only return member sessions for assigned courses 
Closes #3906
 2016-09-12 09:24:20 -07:00
Matt Lott
346c29361b Redirect students away from /teachers and vice versa 
Closes #3910
 2016-09-12 06:28:42 -07:00
Matt Lott
ed8e36f5cd Put student pages under /students 
Closes #3909
 2016-09-12 06:20:59 -07:00
Matt Lott
9f93c0ed18 Restrict resource hub access 
Closes #3908
 2016-09-12 05:39:28 -07:00
Nick Winter
c86c3c4628 Fix session loading after all other dependencies and hanging the level load 2016-09-11 09:16:50 -07:00
Robin Yang
4eed50f92a Add Curriculum Specialist role to /about 2016-09-09 17:09:45 -07:00
Scott Erickson
6ac854c40a Add update classroom buttons to AdministerUserModal 2016-09-09 16:05:03 -07:00
Robin Yang
cdda8855b5 Fix homepage well button 2016-09-09 15:26:25 -07:00
Nick Winter
5d8569480b Separate print and web styles for course guides 2016-09-09 15:12:28 -07:00
Phoenix Eliot
c24e81aebb Redirect with same protocol as request 
Try using // instead of explicit protocol
 2016-09-09 14:59:41 -07:00
Nick Winter
bbe4a0540d Fix solution template problems breaking course guides, and list those broken solution templates in /artisans/solution-problems 2016-09-09 14:41:32 -07:00
Scott Erickson
7bab895dee Generalize new I18N view system 
Previously, when diplomats submit translations, the system
would try to figure out whether it should be a 'patch' or a 'change',
and then would either create a patch for an admin or artisan to
review and accept or reject, or would apply the changes immediately
and they would be live. This was done as a compromise between
getting translations live quickly, but also preventing already-translated
text from getting overwritten without oversight.

But having the client handle this added logical complexity. So
this makes all diplomats submit patches, no matter what. The server
is then in charge of deciding if it should auto-accept the patch or not.
Either way, a patch is created.

There was also much refactoring. This commit includes:

* Update jsondiffpatch so changes within array items are handled correctly
* Refactor posting patches to use the new auto-accepting logic, and out of Patch model
* Refactor POST /db/patch/:handle/status so that it doesn't rely on handlers
* Refactor patch stat handling to ensure auto-accepted patches are counted
* Refactor User.incrementStat to use mongodb update commands, to avoid race conditions
* Refactor Patch tests
 2016-09-09 10:59:26 -07:00
Imperadeiro98
e70556e900 Change pt-BR description 2016-09-09 15:01:58 +01:00
Rob
ffb4dd6a54 Dang HTTPS 2016-09-08 16:02:39 -07:00
Imperadeiro98
baa916e37a Update i18n (#3907) 
* Update i18n
* Change pt-BR description
* Remove dead code from HomeView
 2016-09-08 22:48:28 +01:00
Rob Blanckaert
af3e069828 Merge pull request #3872 from codecombat/filter-domains 
Code Review: Filter domains for webdev iFrame
 2016-09-08 17:46:00 -04:00
Robin Yang
e79b76818b Change Lisa's title 2016-09-08 12:43:57 -07:00
Robin Yang
1ec76050e2 Add link to /community on /about 2016-09-08 11:03:36 -07:00
Robin Yang
0219844c9d Increase legibility of Play Now 
Overrides $gold hex.
 2016-09-08 10:56:18 -07:00
Scott Erickson
1fb7996f6c Fix EarnedAchievement.upsertFor to handle achievements that had no rewards 2016-09-08 10:32:59 -07:00
Phoenix Eliot
00d6d588ec Update sales lead portioning 2016-09-07 16:11:12 -07:00