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

9099 commits

Author SHA1 Message Date
Glubu
d3b56b3e97 typo and punctuation fixed (#3817) 2016-08-09 21:15:43 +01:00
Matt Lott
6a8776c31b 🐛Add parent blurb to signup birthdate check 2016-08-09 06:33:15 -07:00
Matt Lott
a00f2600f6 🐛Show API docs popovers higher over surface 2016-08-09 06:03:58 -07:00
Matt Lott
5fc88ebeeb 🐛Fix extra space in he.coffee 2016-08-09 05:38:35 -07:00
VilkkuV
7188822552 Update fi.coffee 2016-08-09 10:26:01 +03:00
themaka
f111c16482 Add Sean to /about (#3826) 
* Add Sean to /about

* Remove empty line
 2016-08-08 17:46:22 -07:00
phoenixeliot
5b8d66cd1c Add hero selector to create account modal 
Don't show grey border around Anya in signup modal

Refactor reload handling

Fix courses page updating to chosen hero
 2016-08-08 15:19:44 -07:00
Nick Winter
6b49d4ccf6 Propagate he.coffee 2016-08-08 15:18:57 -07:00
Nick Winter
3ff34b376f Manually merge #3825: add Hawaiian 2016-08-08 13:10:28 -07:00
wyyi
f3ffaf5e34 Update uk.coffee (#3824) 2016-08-08 20:48:24 +01:00
borispinatel
5a077e628d Update fr.coffee (#3801) 2016-08-08 20:47:34 +01:00
Scott Erickson
51b292cc3d Add static messages to game dev levels for playtesting 2016-08-08 11:49:38 -07:00
VilkkuV
2e8a395349 Update fi.coffee 2016-08-08 21:44:39 +03:00
VilkkuV
a32d32674a Update fi.coffee 2016-08-08 20:48:30 +03:00
Imperadeiro98
d76a81438d Remove dead line from ArticleEditView template 2016-08-07 19:13:31 +01:00
Imperadeiro98
9df2c97923 Fix #2844 2016-08-07 19:02:51 +01:00
Nora Kenez
57b7791286 Update hu.coffee (#3813) 
* Update hu.coffee

* Update hu.coffee
 2016-08-07 15:40:25 +01:00
Imperadeiro98
cc24d962c5 Fix systems documentation tab background 
Same as #3794
 2016-08-07 15:35:42 +01:00
Phoenix Eliot
6697d33681 Fix level editor child window size 
Makes it slightly larger at 1280x640, which is our target screen size
for slightly smaller than chromebook screens.
 2016-08-05 16:16:09 -07:00
Matt Lott
6f08d5e422 Add required district field to teacher trial request forms 
School now optional
N/A placeholder on district field and don't save it if it's n/a
Updating required field error UI a bit, and there is some larger
refactoring needed here later.
NCES phone number for district only entries will currently be a child
school, will fix later.

Closes #3818
 2016-08-05 13:25:19 -07:00
Scott Erickson
f4c0e4144e Add some comments and a TODO for the supermodel retrying system 2016-08-05 13:23:44 -07:00
Scott Erickson
2287c4f1e5 Merge pull request #3811 from themaka/master 
Adding Croatian and Māori to languages
 2016-08-05 13:04:47 -07:00
themaka
175d8a9983 Comment out the "common" 
Which I've learned is not used until someone's actually translated
something in that section ...
 2016-08-05 15:11:15 -04:00
Matt Lott
8b8086a95d 🐛Fix admin classrooms levels page campaign lookup 2016-08-05 12:09:36 -07:00
Scott Erickson
960d296dd1 Merge pull request #3816 from matt-sanders/background_fixes 
fixes #3796 #3794 #3793
 2016-08-05 10:33:33 -07:00
Catsync
adda9747e9 Add a value 'hidden' for campaign's type property (#3819) 
Nick would have to manually remove the defaulted ‘hero’ type from new
campaigns to make sure it wasn’t included in various campaign related
queries until we were ready. Now we can set this to hidden in the
campaign editor.
 2016-08-05 10:31:46 -07:00
Matt Sanders
ef7b9aa3aa fixes #3794 by not making everything 100% height 2016-08-05 17:12:18 +12:00
Matt Sanders
95146e7820 fixed the background issue on the tasks tab 2016-08-05 17:02:22 +12:00
Matt Sanders
d5e3be62a4 fixed the background issue on the achievements view 2016-08-05 16:52:02 +12:00
Nick Winter
246469bdde A couple fixes for demo flow 2016-08-04 18:37:13 -07:00
Josh Callebaut
33134eb6c9 Merge pull request #3815 from Zerrien/campaign-arrow-fix 
Tweak campaign connecton arrows
 2016-08-04 10:38:45 -07:00
Josh Callebaut
41cf864dc7 Add divide by zero check' 2016-08-04 10:20:50 -07:00
Bryukhanov Valentin
c4ee32f3e1 Merge pull request #3812 from Bryukh/master 
Add bunch of Russian translation
 2016-08-04 08:16:31 +03:00
Josh Callebaut
796c35f66d Tweak campaign connecton arrows so they point more accurately to the next level 2016-08-03 14:53:03 -07:00
Nick Winter
6917843018 Add a couple animations to defaultActions while game-dev lazy rendering isn't working 2016-08-03 13:32:49 -07:00
Nick Winter
35966b24c1 ES5ify web-dev-listener.js 2016-08-03 13:02:55 -07:00
Matt Lott
ba6d51659c Show in-game programming language 
Closes #3814
 2016-08-03 11:08:20 -07:00
Matt Lott
079ad6c0fa Replace /about Matt and Nick pics with real photos 2016-08-03 10:17:57 -07:00
phoenixeliot
5dc3ebe9b1 Include other timeout error codes for good measure 2016-08-02 14:25:14 -07:00
phoenixeliot
36449bb6b6 Account for both types of timeouts in retry logic 2016-08-02 14:18:26 -07:00
phoenixeliot
2e9ff61436 Fix broken ladder in course 2016-08-02 13:43:13 -07:00
phoenixeliot
eaaea6f08b Retry models when they time out 2016-08-02 13:42:56 -07:00
Nick Winter
fad53cf43f Don't wait for simulation load progress on game-dev levels 2016-08-02 12:31:36 -07:00
phoenixeliot
5f560f3e7d Don't allow conversion to student without a ClassCode 
Fix i18n and tests
 2016-08-01 16:44:57 -07:00
phoenixeliot
94e3c5a2b5 Add first/last names to Account Settings 2016-08-01 14:12:35 -07:00
Valentin Bryukhanov
2e3d1531bf Add bunch of Russian translation 2016-08-01 08:48:00 +03:00
Imperadeiro98
e34abb0d27 Update pt-PT.coffee 2016-07-30 13:59:55 +01:00
Nick Winter
24d58a1971 Handle old programming languages during simulation 2016-07-29 16:36:12 -07:00
phoenixeliot
d388975217 Fix unescaped HTML in goal descriptions 2016-07-29 16:21:13 -07:00
phoenixeliot
51706a52be Fix indefiniteLength error on first frame 2016-07-29 16:16:50 -07:00
phoenixeliot
f3ffcc2885 Make hamburger more visible 2016-07-29 14:55:42 -07:00
phoenixeliot
83557910b2 Fix CSV export and projects tab 2016-07-29 14:37:45 -07:00
Nick Winter
e7c1d3d5d3 Remove stale educator wiki link 2016-07-29 14:36:31 -07:00
themaka
8135bd73d0 Added Māori and Croatian to list of languages to display on Diplomat page. 2016-07-29 15:53:01 -04:00
themaka
2d87a51f30 Forgot to update language names in first line of hr/mi .coffee 2016-07-29 15:39:37 -04:00
themaka
66817657f0 Added "te reo Māori" (Māori) to locale 2016-07-29 15:34:34 -04:00
themaka
715939dfb1 Adding Croatian language to locale 2016-07-29 15:20:24 -04:00
phoenixeliot
4af822d13a Revert "Add game UI programming language label" 
This reverts commit b7f916116d.

Some heights in gameplay were made worse by this; needs some more work.
 2016-07-29 11:23:42 -07:00
Matt Lott
1c777ee7f5 Update site desert image 2016-07-28 16:10:28 -07:00
phoenixeliot
4abc26a8d4 Fix progress resetting 2016-07-28 15:47:17 -07:00
phoenixeliot
a47bdc084a Allow admins to become teachers 2016-07-28 15:28:31 -07:00
phoenixeliot
dd66a8c252 Add detection of HTML/CSS/JS comments for entrypoints 2016-07-28 15:10:01 -07:00
Nick Winter
592e57351c Propagate i18n 2016-07-28 13:49:12 -07:00
Nick Winter
82c4367308 Avoid \n escape character in i18n strings for tooling 2016-07-28 13:47:23 -07:00
Nick Winter
d77625bc77 Game dev levels (#3810) 
* Tweak API doc behavior and styling

* Instead of moving to the left during active dialogues, just move to the top
* Allow pointer events
* Adjust close button
* Re-enable pinning API docs for game-dev and web-dev levels

* Make sidebar in PlayGameDevLevelView stretch, better layout columns

* Set up content of PlayGameDevLevelView sidebar to scroll

* Add rest of PlayGameDevLevelView sidebar content, rework what loading looks like

* Finish PlayGameDevLevelView

* Add share area below
* Cover the brown background, paint it gray

* Tweak PlayGameDevLevelView

* Have progress bar show everything
* Fix Surface resize handling

* Fix PlayGameDevLevelView resizing incorrectly when playing

* Add GameDevVictoryModal to PlayGameDevLevelView

* Don't show missing-doctype annotation in Ace

* Hook up GameDevVictoryModal copy button

* Fix onChangeAnnotation runtime error

* Fix onLevelLoaded runtime error

* Have CourseVictoryModal link to /courses when course is done

* Trim, update CourseDetailsView

* Remove last vestiges of teacherMode
* Remove giant navigation buttons at top
* Quick switch to flat style

* Add analytics for game-dev

* Update Analytics events for gamedev

* Prefix event names with context
* Send to Mixpanel
* Include more properties

* Mostly set up indefinite play and autocast for game-dev levels

* Set up cast buttons and shortcut for game-dev

* Add rudimentary instructions when students play game-dev levels

* Couple tweaks

* fix a bit of code that expects frames to always stick around
* have PlayGameDevLevelView render a couple frames on load

* API Docs use 'game' instead of 'hero'

* Move tags to head without combining

* Add HTML comment-start string

Fixes missing entry point arrows

* Fix some whitespace
 2016-07-28 13:39:58 -07:00
Matt Lott
b7f916116d Add game UI programming language label 2016-07-28 12:00:52 -07:00
Matt Lott
2f7fa4e6e7 Always show level and course name in-game 2016-07-28 06:15:17 -07:00
Rob
4d8d4ff268 Defer breakage of Concept Map if we don't have esper. 2016-07-27 16:55:10 -07:00
Rob
b0f653db19 Remove white pixels from logo via. Robin. 2016-07-27 16:45:14 -07:00
Rob
b7fcaa50a6 Change keyword autocomplete logic. 2016-07-27 16:37:57 -07:00
Nick Winter
e3453cb0f3 Update Simulator to new, simple way of making UserCodeMap 2016-07-27 15:57:35 -07:00
Rob
6c9f351f01 Group concept map by campaign. 2016-07-27 14:17:37 -07:00
Rob
75e3c54d54 Add concept map view to artisans. 2016-07-27 13:44:55 -07:00
Scott Erickson
ac4df997c1 Display treema errors 2016-07-26 16:48:04 -07:00
Robin Yang
2cfe7d0b43 Add Elliot Blurb on About Page 2016-07-26 15:32:37 -07:00
phoenixeliot
642847c9c5 Improve progress dot layout for extra courses 2016-07-26 13:11:51 -07:00
phoenixeliot
bd8a284ce6 Improve layout of help blocks in signup form 2016-07-26 11:54:02 -07:00
Scott Erickson
8117a000c1 Fix PlayLevelView race condition typo 2016-07-26 10:38:15 -07:00
Scott Erickson
053ce34faf Prevent users from signing up with or changing to an email-like username 2016-07-25 16:33:48 -07:00
Scott Erickson
34310642c7 Add destudent and deteacher buttons to AdministerUserModal 2016-07-25 16:09:24 -07:00
Scott Erickson
1064d64172 Update FB API to v2.7 
We were on v2.0, which is being deprecated on August 8th
 2016-07-25 13:56:05 -07:00
phoenixeliot
f1f020a50d Use course.releasePhase instead of .adminOnly 
Remove old comment
 2016-07-25 11:29:30 -07:00
Nick Winter
9ae5109e40 Show projects in TeacherClassView, proper font in first web-dev project level for now for demo 2016-07-24 14:42:07 -07:00
Matt Lott
9ad7376edf Add shareable to admin classroom levels page 2016-07-24 08:09:12 -07:00
Matt Lott
9962ff83d4 Level editor play classroom options 2016-07-23 21:03:19 -07:00
rudmanmrrod
7b76180902 Added more translations (#3803) 2016-07-23 22:44:01 +01:00
Nick Winter
ea61499a10 Add Done button hotkey 2016-07-22 17:59:32 -07:00
phoenixeliot
cac87559c6 Remove frequent console logs in web levels 2016-07-22 10:43:08 -07:00
phoenixeliot
f9d0adaca6 Fix levelType refactor 2016-07-22 10:43:08 -07:00
Scott Erickson
b1c69b686c Add admin button to update course content for classrooms 2016-07-21 15:16:17 -07:00
Scott Erickson
57f8aedaa5 Hide student tab on TeacherClassView until it's ready 2016-07-21 13:54:37 -07:00
Matt Lott
01679982d5 Remove intro/overview from guide game menu 
Unless picoCTF
Will show guide option if non-course and help videos.
 2016-07-21 11:11:11 -07:00
phoenixeliot
b1277dc95f Merge branch 'game-dev-levels' 2016-07-21 10:14:22 -07:00
Scott Erickson
908354d6cb Merge pull request #3805 from UltCombo/campaign-view-level-titles-tooltip 
Campaign view: fix level titles getting cut off
 2016-07-21 09:18:43 -07:00
Nick Winter
436896de4a Update /about jobs 2016-07-21 09:06:57 -07:00
Matt Lott
4226cd098d Shrink campaign map flags, hovers, click areas 2016-07-20 21:03:48 -07:00
UltCombo
11ba5333d4 Campaign view: fix level titles getting cut off 
E.g.:

![Forest - level titles cut off](http://i.imgur.com/cfIbyXv.png)
 2016-07-21 00:02:39 -03:00
phoenixeliot
2ebf94c3db Combine extracted script/style tags 2016-07-20 17:20:21 -07:00
Matt Lott
15bcae8a17 Show API popup entirely over surface 
Covering user code causes problems for players.
 2016-07-20 17:06:51 -07:00
phoenixeliot
ce137f00cb Fix level preview CSS 2016-07-20 17:04:01 -07:00
phoenixeliot
f28c17c9bf Fix spacing to be consistent 2016-07-20 15:47:20 -07:00
phoenixeliot
62813e41a3 Extract styles and scripts 2016-07-20 15:44:01 -07:00
Matt Lott
72905c7ff2 Reduce Mixpanel event tracking 
Turning off homepage events and play pageviews.
 2016-07-20 14:45:13 -07:00
phoenixeliot
6fdda491bd Fix for when database courses/campaigns don't match 2016-07-19 14:13:24 -07:00
Rob Blanckaert
5bb7f243f5 Update web-dev-listener.js 2016-07-19 13:44:25 -07:00
phoenixeliot
58284dff33 Turn on Ace HTML worker for syntax errors 2016-07-19 11:30:02 -07:00
Matt Lott
01a8312617 🐛Classroom last played string null level check 2016-07-19 10:10:48 -07:00
Matt Lott
1f1132ecf8 Prioritize displaying first/last names over username 2016-07-18 12:38:29 -07:00
phoenixeliot
4e449fea3b Fix gplus/fb signin and tests 2016-07-18 11:41:18 -07:00
phoenixeliot
1d616cd92a Fix indentation 2016-07-18 10:46:51 -07:00
phoenixeliot
bb6262483f Allow username-only signup for classroom users 
Address some code review feedback

Correct error code in test

Don't try to send emails to empty addresses

Add tests for subscriptions

Add tests for Next Steps email

Fix specs

Add reason for disabled test
 2016-07-18 10:41:17 -07:00
Bryukhanov Valentin
2852f5014c Update ru.coffee - hints ui 
Add "hints" translations in the editor UI
 2016-07-18 19:54:20 +03:00
Matt Lott
607c129c7f School active licenses admin page 2016-07-18 09:41:42 -07:00
Nick Winter
f94cc2ec1f Fix CS1, CS2, GD1, WD2, CS3, etc. labeling in TeacherClassesView, too 2016-07-17 01:12:58 -07:00
Nick Winter
6e65171a83 i18n, comments, misc cleanup 2016-07-17 00:53:17 -07:00
Nick Winter
320aa0f3d9 Add first guess for other web-dev concepts 2016-07-16 23:30:10 -07:00
Nick Winter
b04e968da5 Add support for CSS docs 2016-07-16 23:17:05 -07:00
Nick Winter
5d0b9c875a Fix some typos that made it not work in Firefox (not sure how it worked in Chrome) 2016-07-16 13:32:54 -07:00
Nick Winter
0cd3278b8f Add simple ImageGalleryView for some sample images in web-dev levels 2016-07-16 13:11:43 -07:00
Nick Winter
d37527d21b Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc 2016-07-16 00:35:52 -07:00
Nick Winter
dc6a1de9fa Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc 2016-07-16 00:33:10 -07:00
Nick Winter
b64bcd9f02 Use shareable false/true/'project' for different levels of shareability 2016-07-15 23:26:43 -07:00
Nick Winter
6ae89e31f1 Add direct link to play game/web-dev creations while coding them 2016-07-15 22:14:25 -07:00
Nick Winter
5d26b03918 Add buttons to view game/web-dev levels to courses views 2016-07-15 21:57:04 -07:00
Nick Winter
5f95a4d158 Play game-dev levels without API restrictions. Show game button in CourseDetailsView only when appropriate. 2016-07-15 20:47:09 -07:00
Nick Winter
7e4733f07e Hack: check HTML goals now and in a second to account for built-in CSS transition 2016-07-15 20:25:37 -07:00
Nick Winter
224ad54bdd View web dev levels. Add proper victory modal game/webpage share links. Fix playing game dev levels. Add generic change transition to all web-dev pages. 2016-07-15 20:03:12 -07:00
Scott Erickson
0570644943 Set up a bunch of game dev, web dev playing logic 2016-07-15 16:57:39 -07:00
Nick Winter
788a14398a Fix starting web dev levels 2016-07-15 16:22:33 -07:00
Scott Erickson
7b38181241 Merge branch 'master' into game-dev-levels 2016-07-15 16:02:21 -07:00
Scott Erickson
ab704a1cab Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels 
# Conflicts:
#	app/views/play/level/PlayLevelView.coffee
 2016-07-15 16:01:57 -07:00
Scott Erickson
10ca59d10f Have CourseVictoryModal used for course-ladder levels 2016-07-15 15:54:22 -07:00
Scott Erickson
486949d07c Admin only courses (#3797) 
* adminOnly course field

* Properly check not-admin-only when fetching courses
 2016-07-15 13:28:35 -07:00
Nick Winter
9be8151959 Don't create God for web-dev levels 2016-07-15 13:24:54 -07:00
Nick Winter
5a688e42c7 Slightly more flexible iframe origin checking 2016-07-15 11:19:22 -07:00
Nick Winter
1e640fb74c Fix CampaignView styles to cover the whole screen with background again 2016-07-15 10:14:00 -07:00
Nick Winter
1e89775486 Basic campaign mode victory modal hookup for web-dev levels 2016-07-15 09:53:16 -07:00
Nick Winter
739973cb47 Sending goal states to GoalManager and GoalStatusView 2016-07-15 09:11:36 -07:00
Nick Winter
c44c16e5d2 Started implementing web-dev goals 2016-07-15 00:40:32 -07:00
Nick Winter
69f21514b9 Add Lodash to iframe content 2016-07-14 22:43:49 -07:00
Nick Winter
e3670165e7 Remove code for multiple spells; rename SpellListTabEntryView to SpellTopBarView; remove hero avatar from SpellTopBarView 2016-07-14 22:43:25 -07:00
Nick Winter
220db3106c Run button now recreates web-dev DOM; no submit button 2016-07-14 19:48:27 -07:00
Nick Winter
33ba3f6033 Enable docs for web-dev levels 2016-07-14 19:14:18 -07:00
Nick Winter
ed320a8d9e WebSurfaceView now parsing player code through virtual DOM into iframe 2016-07-14 18:07:36 -07:00
Scott Erickson
9d0ad7af44 Start work on having course arenas use the CourseVictoryModal 2016-07-14 16:50:17 -07:00
Scott Erickson
9a79cae09d Fix PlayGameDevLevelView to run in course mode 2016-07-14 16:49:48 -07:00
phoenixeliot
c3ed217964 Fix i18n render bug on SimulateTabView 2016-07-14 16:20:15 -07:00
Scott Erickson
c0bc10ffb6 Add projects tab stub to TeacherClassView 2016-07-14 15:53:54 -07:00
Scott Erickson
61caf3dcd3 Merge branch 'master' into game-dev-levels 2016-07-14 15:50:04 -07:00
Scott Erickson
dd88f39761 Add shareable property to levels 2016-07-14 15:48:42 -07:00