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

12439 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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 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
Matt Lott
05159ff7c2 Support course slugs that match course names 
Must be backwards compatible until we update the course slugs.

Closes #3867
 2016-08-19 16:05:37 -07:00
Scott Erickson
acfe62a786 Merge pull request #3868 from codecombat/course-progress-projects 
Add project/arena pills to course progress tab to TeacherClassView
 2016-08-19 16:05:09 -07:00
Scott Erickson
aeddfe77d6 Add project/arena pills to course progress tab to TeacherClassView 
Also remove templating for deprecated progress tab
 2016-08-19 15:48:45 -07:00
Matt Lott
cfcda2bd00 🐛Update no students text in class view 2016-08-19 15:06:25 -07:00
Matt Lott
d392f7780e Force level primer language usage for students 2016-08-19 14:26:39 -07:00
Matt Lott
726ad525fa Remove add students from /teacher/classes 
No longer make sense after add students dialog UI update.
 2016-08-19 13:32:17 -07:00
Imperadeiro98
b21cfe55cb Fix i18n of cast-button-view.jade 2016-08-19 17:56:05 +01:00
Scott Erickson
dbf63e250c Add realtime keyboard events for game dev 2016-08-19 09:44:36 -07:00
Lucas P
de739bb6db Translation PT-BR (#3861) 
Just  an small update.
Will do more!
 2016-08-19 17:06:00 +01:00
Matt Lott
b280e6ff79 Find invalid courses script 2016-08-18 18:36:31 -07:00
Matt Lott
d6d208803c Undefined check on homepage, update updateCourses.js 2016-08-18 18:36:31 -07:00
Phoenix Eliot
dc7c220b57 Add goal checking on user clicks 2016-08-18 16:40:48 -07:00
Matt Lott
fb0357e0f9 Remove duplicate course entries from updateCourses.js 2016-08-18 15:27:06 -07:00
Nick Winter
2f220eb007 Fix #3843 2016-08-18 14:39:14 -07:00
Phoenix Eliot
c33f86768a Translate level wrapper code 2016-08-18 14:09:34 -07:00
Imperadeiro98
605169e792 Update pt-PT.coffee 2016-08-18 22:06:39 +01:00
Nick Winter
0364463f99 Propagate i18n 2016-08-18 13:50:34 -07:00
Nick Winter
37d94b8a1c Merge branch 'lazydogP-master' 2016-08-18 13:47:59 -07:00
Nick Winter
8fbf9983d5 Fix zh-HANS.coffee merge 2016-08-18 13:47:51 -07:00
Nick Winter
a5be5feb85 Merge branch 'master' of github.com:codecombat/codecombat 2016-08-18 13:41:15 -07:00
Nick Winter
1f9ecfc7a8 Merge branch 'dungkunit-patch-1' 2016-08-18 13:41:06 -07:00
Nick Winter
f749938800 Fix vi.coffee merge 2016-08-18 13:40:49 -07:00
Imperadeiro98
5dd746af4a Small change to select hero wording 2016-08-18 21:39:54 +01:00
Nick Winter
ee168e9313 Merge branch 'VilkkuV-patch-1' 2016-08-18 13:39:13 -07:00
Nick Winter
54d45cbfbf Fix fi.coffee merge 2016-08-18 13:39:03 -07:00
Scott Erickson
300c81e72b Course translations fixes 
* Restrict patch handling properly
* Fix #3860, CS 2 description
* i18nCoverage is updated when new translations are auto-accepted
* Course patches are listed on PendingPatchesView properly
* 'Artisan' permission allows editing course translations
 2016-08-18 13:29:52 -07:00