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

12559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
0a3d78454a Merge branch 'master' into production 2016-08-24 16:08:08 -07:00
Nick Winter
878dcbdc49 Better handling of non-user-code problems in game-dev mode. Don't simulate whole level first time a game-dev level is loaded. 2016-08-24 15:21:09 -07:00
Matt Lott
80f8fd60d8 Update close automated emails 2016-08-24 14:46:15 -07:00
Matt Lott
d85cfcaddf Update zp -> close import script to be more forgiving 2016-08-24 14:33:47 -07:00
Matt Lott
f391030b44 Add hints test group distinction comments 2016-08-24 12:05:40 -07:00
Matt Lott
4832ec919a Merge branch 'master' into production 2016-08-24 09:27:47 -07:00
Matt Lott
22e3f445c0 Add achievement hidden property 2016-08-24 07:37:11 -07:00
Rob Blanckaert
d9b688c5b8 Merge pull request #3874 from codecombat/course-curriculum 
Create Markdown for CS1, CS2 Curriculum
 2016-08-23 18:16:19 -07:00
Rob
5c6fb20d7f Add back to top buttons. 2016-08-23 18:12:44 -07:00
Scott Erickson
b175c02714 Fix article test to handle patches endpoint change 2016-08-23 16:19:25 -07:00
Robin Yang
b550aae76a Remove target grades from Curriculum 2016-08-23 16:07:10 -07:00
Robin Yang
c3b3c6ea2a Update Student License requirement copy 2016-08-23 16:05:16 -07:00
Nick Winter
bfa49cbbc6 Fix sending too much and not enough data on arena sessions 2016-08-23 16:02:03 -07:00
Matt Lott
e05536e1e4 Send exported Close.io leads script 2016-08-23 14:48:42 -07:00
Robin Yang
52c1f3d625 Add CS1, CS2 to Resource Hub 
Also adding additional worksheets/PDFs.
 2016-08-23 14:46:02 -07:00
Robin Yang
5d31496ceb Update CS1, CS2 curriculum content 2016-08-23 14:45:32 -07:00
Scott Erickson
09a9358b9e Modify courses i18n edit view to be less error-prone 
* Do not use 'backup' system
* Warn when about to lose changes
* Show list of patches and their statuses
 2016-08-23 14:36:45 -07:00
Scott Erickson
ae28223b96 Add course edits stats properties to user schema 2016-08-23 13:34:19 -07:00
Scott Erickson
7d9d42a23f Fix i18nCoverage bug 
Sometimes, translations is undefined, so check that it exists
 2016-08-23 13:33:51 -07:00
Scott Erickson
24848da7bf Fix scrolling on PlayGameDevLevelView 2016-08-23 12:50:50 -07:00
Phoenix Eliot
e929686502 Enable session spectating for WebDev levels 2016-08-23 11:48:02 -07:00
Phoenix Eliot
31d36085c4 Merge branch 'master' into production 2016-08-23 11:18:19 -07:00
Phoenix Eliot
209b7d724e Fix webdev for china server 2016-08-23 11:08:57 -07:00
Scott Erickson
ef0547f72a Simplify applying licenses 
In TeacherClassView, when a teacher assigns a paid course to any unenrolled
student, the view automatically enrolls those students, rather than requiring
the teacher to enroll those students manually first. Update copy throughout.

Also add back (smaller) padding to progress dots in TeacherClassView.
 2016-08-23 10:43:31 -07:00
Matt Lott
68494a694d Merge branch 'master' into production 2016-08-23 10:17:52 -07:00
Matt Lott
c2ae4d3748 Add gd2 and wd2 to individual game 
Closes #3875
 2016-08-23 10:15:47 -07:00
Robin Yang
f8caa86579 Move resource templating from coffee to jade files 2016-08-23 09:38:11 -07:00
Scott Erickson
382304a256 Merge pull request #3869 from kdparkinson/master 
Thang name contributions
 2016-08-23 09:10:49 -07:00
Matt Lott
2728691739 Merge branch 'master' into production 2016-08-23 05:42:46 -07:00
Matt Lott
2584124017 Add array option to adjacentCampaigns.showIfUnlocked 2016-08-23 05:42:23 -07:00
Kenny Parkinson
2642dc896f Removed duplicate Anya 2016-08-22 19:14:55 -06:00
Robin Yang
fe3b9e01e0 Create Markdown for both CS1, CS2 Curriculum 2016-08-22 17:33:49 -07:00
Phoenix Eliot
3d8d0b96d3 Make popover pins stickier 2016-08-22 13:29:35 -07:00
Phoenix Eliot
b4fe0a3bee Fix SpellPaletteView's popover Ace 2016-08-22 13:23:52 -07:00
Phoenix Eliot
7f2d3d8b57 Fix iFrame being truncated 2016-08-22 12:01:48 -07:00
Scott Erickson
136d274d54 Render from partially-completed prerendered spritesheet correctly, fix #3641 2016-08-22 11:45:43 -07:00
Matt Lott
0cef562d9b Update subscription dialog blurbs 2016-08-22 11:29:30 -07:00
Matt Lott
61be34a0f4 Sort courses in teacher ux 
Closes #3870
 2016-08-22 11:18:26 -07:00
Scott Erickson
cdba1788e7 Tweak username-should-not-be-email error message 2016-08-22 11:02:40 -07:00
Matt Lott
fe49867043 Don't key off slugs in updateCourses.js 2016-08-22 06:27:02 -07:00
Matt Lott
7c9f7cbce7 Show correct programming language in level intro 2016-08-22 06:11:01 -07:00
Matt Lott
f2597229b5 No autocomplete x y, rename Zatanna to Autocomplete 
Don’t autocomplete common variables ’x’ or ‘y’:
return if /^x$|^y$/i.test(prefix)
Renaming zatanna to autocomplete

Closes #3865
 2016-08-22 05:46:07 -07:00
Kenny Parkinson
c1e9730499 added klondike as name for Polar Bear Pet #53 2016-08-20 09:39:05 -06:00
Kenny Parkinson
023a0e9ca8 Added 'Anya' as a female pixie. 2016-08-20 09:17:21 -06:00
Rob
c320e3d3a0 Merge branch 'master' into production 2016-08-19 17:46:35 -07:00
Rob Blanckaert
47e115a7eb Merge pull request #3866 from codecombat/static-teacher-pages 
Add Resource Hub to teacher dashboard
 2016-08-19 17:44:19 -07:00
Robin Yang
2b586420f3 Add i18n for Resource Hub 2016-08-19 17:42:02 -07:00
Robin Yang
611368f742 Add Resource Hub to teacher dashboard 2016-08-19 17:41:06 -07:00
Matt Lott
0cae331e2f Update gd2 and wd2 to released 2016-08-19 16:48:06 -07:00
Scott Erickson
c595183177 Remove teacher class view progress dot padding 2016-08-19 16:47:25 -07:00