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

9030 commits

Author SHA1 Message Date
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
Scott Erickson
0cb92582f4 Add destroy method 2016-07-14 15:13:02 -07:00
Nick Winter
5b16da099a Hack LevelEditor to load web-dev levels 2016-07-14 12:47:25 -07:00
Nick Winter
be50657530 Remove Firebase for now. 2016-07-14 12:47:00 -07:00
Nick Winter
16b10612b6 Stub WebSurface showing for web-dev levels 2016-07-14 12:34:22 -07:00
phoenixeliot
5e10e34825 Add spy buttons to admin page search results 2016-07-14 11:27:18 -07:00
Nick Winter
c5c831c211 Remove real-time multiplayer prototype code 2016-07-14 10:26:09 -07:00
Scott Erickson
2284a9f495 Remove semi-colons from AnalyticsView to satisfy linter 2016-07-14 10:10:22 -07:00
Scott Erickson
48502c40e6 Merge pull request #3788 from matt-sanders/master 
fixes #3393 by allowing the content to scroll
 2016-07-14 10:03:12 -07:00
Nick Winter
349ab24da7 First pass at adding 'web-dev' level type 2016-07-14 09:38:45 -07:00
Nick Winter
c0a70cb2ab Refactor level type checks for easy greppability (level.isType) 2016-07-14 08:58:43 -07:00
Nick Winter
87ed53b24b Merge branch 'master' into web-dev-levels 2016-07-14 08:26:27 -07:00
Scott Erickson
fb9998b15e Add temp buttons to CourseDetailsView for testing PlayGameDevLevelView 2016-07-13 16:05:41 -07:00
Scott Erickson
b982f3fd52 Fix Camera bounds by adding ScriptManager 2016-07-13 16:05:41 -07:00
Scott Erickson
4a51045a41 Fix PlayGameDevLevelView when playing the first time, get frames streaming 
For whatever reason, the Angel does not normally allow streaming on the first world.
I hacked around it, but would be good to figure out why that restriction is there
in the first place.
 2016-07-13 16:05:41 -07:00
Scott Erickson
c9986ee05a Tweak Promises in PlayGameDevLevelView 2016-07-13 16:05:41 -07:00
Scott Erickson
45c8c2006d Quick fix LevelSessions require error 
In areas of the site that do not have lib/aether_utils, the require broke because it's
fetched only sometimes through the ModuleLoader.
 2016-07-13 16:05:41 -07:00
Nick Winter
f88223b994 Fix spawning Hero kind ThangTypes in game-dev levels 2016-07-13 14:20:22 -07:00
Scott Erickson
d7a2219b16 Refactor PlayGameDevLevelView to use promises 2016-07-13 13:28:54 -07:00
Scott Erickson
1b7ac76b9f Add loading and playing to PlayGameDevLevelView 2016-07-13 11:43:25 -07:00
Nick Winter
872e83e9b7 Don't use course hero in verifier / level editor for type: 'course' level 2016-07-13 10:04:43 -07:00
Scott Erickson
3a0695f59c Add some basic info to PlayGameDevLevelView 2016-07-12 15:12:11 -07:00
Scott Erickson
b674277e14 Add PlayGameDevLevelView styling 2016-07-12 14:44:31 -07:00
Scott Erickson
25e348c5ad Initial, basically working PlayGameDevLevelView 2016-07-12 14:07:10 -07:00
Scott Erickson
0b1e1ddcb4 Merge branch 'game-dev-levels' 2016-07-12 11:00:29 -07:00
Nick Winter
cd47a9d4ea Fix inconsistent verifier results when run with multiple levels batched 2016-07-11 16:59:00 -07:00
Matt Lott
f8a67ace0e Remove items from course victory dialog 2016-07-11 16:01:34 -07:00
Matt Lott
16c9f10043 🐛Fix course victory dialog level progress counts 
Use classroom versioned levels instead of latest course levels.
Use current level session instead of stale one.
 2016-07-11 13:28:52 -07:00
phoenixeliot
0cf04a9658 Fix birthday form layout in firefox 2016-07-11 11:51:12 -07:00
Nick Winter
a5a955ca6b Always show indent guides 2016-07-11 08:35:44 -07:00
Nick Winter
15aeb7631f Rename default ogres-die goal 2016-07-11 08:35:44 -07:00
David Liu
2ebef96d28 Fix birthday form validation in signup (#3787) 2016-07-11 08:34:29 -07:00
Matt Sanders
ed498ace7e fixes #3393 by allowing the content to scroll 2016-07-11 17:01:33 +12:00
Matt Lott
9b68e91409 🐛Fix analytics dashboard coursePrepaid use 2016-07-10 17:55:07 -07:00
Matt Lott
f598e43957 Admin classroom export respects classroom versioning 2016-07-08 18:47:06 -07:00
Matt Lott
1bf3eb54dd 🐛Fix admin classroom progress export paging 2016-07-08 18:24:47 -07:00
Nick Winter
8c48e4fc14 Remove transpiledCode and screenshot from LevelSession 2016-07-08 17:04:24 -07:00
phoenixeliot
6fb4cbd9ac Remember checkbox state in TeacherClassView 2016-07-08 16:24:33 -07:00
phoenixeliot
b25782f2b6 Pass username/password from CreateAccountModal to AuthModal 2016-07-08 16:24:33 -07:00
phoenixeliot
1b8d3ed023 Improve spacing for CreateAccountModal on chromebooks 
Improve spacing for type-select screen on chromebooks

Improve spacing for basic-info screen on chromebooks

Improve spacing for confirmation screen on chromebooks

tweak spacing
 2016-07-08 16:24:33 -07:00
Scott Erickson
f5c9be4831 Merge branch 'master' into game-dev-levels 2016-07-08 14:26:48 -07:00
Scott Erickson
b2bb129cbf Add realTimeInputEvents to world and gameUIState, with just mousedown events 2016-07-08 14:17:07 -07:00
Scott Erickson
10d344504a Add check to TomeView 
Found a bug while playing Ogre Encampment: click the Chest before clicking past the
intro screen and the game throws an error, when `updateSpellPalette` tries to access
call `spell.getSource()` but `spell` is undefined. This check keeps the same behavior
but handles the error.
 2016-07-08 13:27:42 -07:00
Scott Erickson
5b0b5e4169 Tweak ModuleLoader handling of index files, fix #3783 2016-07-08 13:13:28 -07:00
Jun-Yuan Yan - sss2500
6925c4a7d5 Update : zh-HANT translate (#3779) 2016-07-08 15:53:29 +01:00
GrecK0
cca69f8074 Update es-ES.coffee (#3772) 
Some lines translated/updated to spanish.

Best Regards!!!
 2016-07-08 15:51:34 +01:00
Scott Erickson
976015734d Update CreateAccountModal comments 2016-07-07 16:58:50 -07:00
Scott Erickson
151bf93177 Fix checkEmail to prevent duplicate checks 2016-07-07 16:55:57 -07:00
Scott Erickson
54c1361b1c Fix admin view when not an admin 2016-07-07 16:48:26 -07:00
Scott Erickson
1da82fa851 Fix #1199 2016-07-07 16:34:24 -07:00
Marvellanius
c0f163938e added a new logo (circle) (#3774) 2016-07-07 16:23:00 -07:00
Scott Erickson
ecde42f356 Fix catch callback 2016-07-07 16:22:08 -07:00
phoenixeliot
21cd890bfa Use translated ClassCode error message 2016-07-07 16:03:07 -07:00
Scott Erickson
af9f7201d0 Finish new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
e9b7543242 Start new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
5e6c9709f9 Display better error when invalid class code is entered 2016-07-07 15:32:11 -07:00
Matt Lott
cad067fa8c 🐛Fix admin classroom progress CSV 
Respect fetch paging.
 2016-07-07 15:18:04 -07:00
phoenixeliot
21233e631d Fix arena back-to-levels link 2016-07-07 15:14:25 -07:00
phoenixeliot
855d38dfcc Fix hero select modal spacing 2016-07-07 11:48:05 -07:00
phoenixeliot
ddbbe40586 Compress student jumbotron image 2016-07-07 11:28:02 -07:00
Matt Lott
a884fbf38b Admin class progress CSV export 2016-07-07 11:07:38 -07:00
Rob
228019ac89 - Limit when this autocompletion can pop up. 
- Remove some left over cruft from the text completer.
 2016-07-06 13:31:46 -07:00
Rob
c7901c3237 Unbreak things when you don't have glasses. 2016-07-05 12:34:54 -07:00
Bryukhanov Valentin
acaebcdbbb update ru.coffee - typo 
"classroom_in_a_box" Russian typo fixed.
 2016-07-05 09:30:33 +03:00
Rob
5dd4db7676 Correctly feature detect WeakMap. 2016-07-01 16:44:16 -07:00
Rob
9c7320e26a - Move Zatanna out of own repo and into CodeCombat 
- Move snippet creation out of SpellView
- Disable text based completions.
 2016-07-01 16:39:21 -07:00
Matt Lott
15a605505e Link classroom levels from main admin page 2016-07-01 07:56:56 -07:00
Bryukhanov Valentin
d663de6481 Merge pull request #3771 from codecombat/locale-ru-updates 
Update ru.coffee new_home section
 2016-07-01 15:09:05 +03:00
Matt Lott
ba54754373 Admin classroom levels page 2016-06-30 08:29:27 -07:00
Rob
ac47928131 - Reduce size of answer code in verifier 
- Assume we want to run a single level on only one core for accurate speed testing.
 2016-06-29 16:18:36 -07:00