Commit graph

3401 commits

Author SHA1 Message Date
Rob
1734a1b46f - Show reason why levels didn't load in verifier
- Remove multiplayer levels from default verifier level list.
2016-05-03 14:37:06 -07:00
Scott Erickson
aed5e6b8ac Fix removing students from a classroom
TeacherClassView loaded course instances by owner rather than by classroom,
so the student would be removed from course instances in unrelated
but commonly owned classrooms.
2016-05-03 13:08:42 -07:00
Rob
5e7b267691 - Add more test levels to verifier
- Add helper buttons to verifier.
2016-05-03 12:14:51 -07:00
Rob
3f41eaec01 - Allow ?dev=true in verifier
- Show progress bar and totals in verifier
- Fill in templates in solution source code.
2016-05-03 11:46:10 -07:00
phoenixeliot
c666a39d3b Fix StudentLoginModal crash on invalid login
Add test for student bad login
2016-04-29 15:34:11 -07:00
phoenixeliot
91fa467251 Fix teacher sessionless play; uses default campaign levels
Fix typo

Fix race condition with loading next level

Return an empty object for next level instead of an error;
Supermodel has a race condition when some of the models fail to load,
when we override an error response as "success".

Fix next level spec

Remove comment per Scott's request
2016-04-28 12:46:09 -07:00
Rob
f39cac3abf Try to keep learn more above the fold. 2016-04-28 10:52:37 -07:00
Nick Winter
747c5f29f7 Finally figured out how to use i18next interpolation correctly; using it on level counts in SubscribeModal 2016-04-28 10:07:47 -07:00
Scott Erickson
997fe1aafb CoursesView uses regular login and create account modals 2016-04-27 16:26:05 -07:00
Matt Lott
7b88eb0250 Remove Clojure from /about and play modals 2016-04-27 16:15:27 -07:00
phoenixeliot
1999b41ff3 Don't convert to teacher automatically in EnrollmentsView 2016-04-27 13:20:19 -07:00
Scott Erickson
675e3290ac Lock course content to classrooms 2016-04-27 09:58:04 -07:00
phoenixeliot
7c1059bffa Fix code review feedback
Fix code review feedback (2)

Fix code review feedback (3)
2016-04-26 16:37:36 -07:00
phoenixeliot
66f99dd834 Add translation tooltips for code
Tweak tooltips, add some translation keys

Fixed not showing translations for English-speakers

Remove comment
2016-04-26 16:37:07 -07:00
phoenixeliot
02d833639b Make LevelComponent names translatable, show spell name translations in doc tooltips 2016-04-26 16:37:06 -07:00
Rob
70999fa150 Track when COPPA dialog is shown. 2016-04-26 16:31:51 -07:00
Rob
5bd8f7a1cb COPPA tests. 2016-04-26 14:01:03 -07:00
Rob
4183764b61 Add birthday field to user that rejects users under 13 on signup. 2016-04-26 14:00:49 -07:00
Josh Callebaut
c6cbcd4777 Merge pull request #3395 from Zerrien/spade
Implements Spade functionality, and adds the sublime project file.
2016-04-26 11:15:17 -07:00
Josh Callebaut
c4652d82e2 Implements the SPADE logger into the SpellView
* Updates spade.js vendor file, adds a sublime-project for developers to use
* Moves server logic away from handlers
* Moves session update logic to middleware, sets up server schema to autorender IDs as ObjectIDs
* Modernizes the supermodel loading scheme and switches from constructor to initalize
2016-04-26 09:56:30 -07:00
Scott Erickson
3c715ceba8 Merge pull request #3562 from edtrist/PauseModalVideo
Pause help videos when guide modal is not visible
2016-04-26 09:39:12 -07:00
Nick Winter
e4392019a4 Fix console.warning -> console.warn typo 2016-04-25 17:25:30 -07:00
Nick Winter
e96f4651f2 Add basic listening for code problems to Verifier 2016-04-25 17:03:08 -07:00
edtrist
405fbeabf8 use view jquery 2016-04-25 22:19:28 +01:00
Rob
9fec6f6613 Don't break jQuery-UI autocomplete with algolia's 2016-04-21 11:21:11 -07:00
Scott Erickson
a452f1ce47 Update teacher trial request views, some related bug fixes
* Tweak wording, options
* Instead of storing changes in local storage, warn when users may lose changes by navigating away
* Fix CreateTeacherAccountView so that if you connect to an existing account, the redirect is triggered
* Fix users.coffee weird race condition
2016-04-20 16:30:11 -07:00
Rob
67686e8c71 Add district complete to teacher convert page. 2016-04-20 10:37:00 -07:00
Rob
f79a9b96bf Add district picker to teachers/signup 2016-04-20 10:29:59 -07:00
edtrist
fb15c0bf94 Pause help videos when guide modal is not visible 2016-04-20 00:38:44 +01:00
phoenixeliot
b4b435283b Don't clear me before tests (needs more thought) 2016-04-19 13:10:45 -07:00
phoenixeliot
79d4fc3126 Merge branch 'dashboard-bugfixes' 2016-04-19 12:36:36 -07:00
phoenixeliot
e2d08fa7cf Stuff
Partially fix ActivateLicensesModal.spec

[IN PROGRESS] Don't display deleted users

Move userID to classroom.deletedMembers on user delete (not retroactive)

Fix PDF links for course guides, remove old PDFs from repo

Remove deprecated SalesView

Remove underline for not-yet-linked student names

Only show class select when there's more than one

Ignore case when sorting student names

Use student.broadName instead of name for display and sorting

Fix initial load not showing progress after joining a course (hacky)

Fix text entry for enrollment number input

Fix enrollment statistics

Fix enrollment stats completely (and add back in per-class unenrolled count)

Add deletedMembers to classroom schema

More fixes to enrollment stats (don't count nonmember prepaids)

Don't use 0 as implicit false for openSpots

Update suggested number of credit to buy automatically

Fix classroom edit form ignoring cleared values

Add alert text when more users selected than enrollments available

Alert user when trying to assign course to unenrolled students

Alert user when assigning course to nobody

Add some tests for TeacherClassView bulk assign alerts

Fix TeacherClassView tests failing without demos

Use model/collection.fakeRequests :D

Remove unused comment

Fix handling of improperly sorted deleted users on clientside

Add test for moving deleted users to deletedMembers

Add script for moving all deleted classroom members to classroom.deletedMembers

Completely rewrite tallying up enrollment statistics

Fix some tests to not be dependent on logged-in user

Address PR comments

Fix default number of enrollments to buy

Fix i18n for not enough enrollments

Use custom error message for classroom name length
2016-04-19 12:32:20 -07:00
Rob
988eeeeb07 Merge branch 'school-complete' 2016-04-18 23:35:50 -07:00
Rob
8d61c4387d Clear NCES data if complete data is manually edited. 2016-04-18 23:33:59 -07:00
Rob
e64d585841 Add extra information when a school is autocompleted. 2016-04-18 22:54:43 -07:00
phoenixeliot
70762f15cc Clear window.me before running tests 2016-04-18 14:32:33 -07:00
edtrist
b63bf06bed Added server error subscription to AuthModal 2016-04-18 02:12:42 +01:00
Catsync
b90f1fb18f Hack to use hero instead of self/this in SpellPalette docs (#3552)
Hack to change SpellPalette docs to use hero instead of self/this
2016-04-16 14:59:18 -07:00
Nick Winter
e3e3807844 Use jQuery version of Algolia autocomplete 2016-04-15 17:48:31 -07:00
Rob
e7356411fb Autocomplete names of schools on quote page. 2016-04-15 14:00:36 -07:00
phoenixeliot
c3da6a23c9 Change isTeacher checks to isSessionless for /play 2016-04-15 10:58:52 -07:00
Rob
ceb64ce9ca Improve verifier. 2016-04-13 16:41:16 -07:00
phoenixeliot
0416528de0 Fix language-getting for next level URL on teacher courses play 2016-04-13 16:32:39 -07:00
Catsync
7ff12f326f Merge pull request #3548 from Catsync/autocomplete-hero
hero autocomplete hack
2016-04-13 14:59:21 -04:00
phoenixeliot
a524256b5b Add sessionless play for Teachers 2016-04-12 19:34:05 -07:00
Nick Winter
a7114a2719 Implement headless verifier; fix headless client 2016-04-12 19:34:05 -07:00
Nick Winter
5949cf51f0 Merge pull request #3513 from UltCombo/beautifier-loop
JS beautifier: fix loop construct, fixes #3510
2016-04-12 17:13:12 -07:00
Cat Sync
fddba4e0ce Hacks autocomplete to use hero instead of self/this
Uses hero instead of self/this if “hero” is already in the code, in
javascript, python, and lua.
2016-04-12 14:31:50 -04:00
Josh Callebaut
6c0823486f Merge pull request #3539 from Zerrien/solutionSchema
Changes terminology to match schema
2016-04-07 15:30:13 -07:00
Josh Callebaut
4275d41324 Changes terminology to match schema 2016-04-07 14:49:55 -07:00
Matt Lott
5661a1fd8c Add site origin data to course trial requests 2016-04-07 12:13:48 -07:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
phoenixeliot
beb53d9f2f Various fixes and changes to teacher-accounts and teacher-dashboard 2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f Restrict teacher and student accounts to their respective areas and actions 2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185 Implement all of teacher-dashboard 2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f Implement teacher accounts 2016-04-04 15:18:06 -07:00
Scott Erickson
43389ac9b6 Merge pull request #3471 from delftswa2016/loggedIn-achievement-error
Error when accessing achievement without being logged in
2016-03-30 09:41:01 -07:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Scott Erickson
996200220f Merge pull request #3508 from codecombat/fix-teacher-quote-scroll
Fix teacher quote page having lots of blank space at the bottom (after submitting the form)
2016-03-28 11:59:56 -07:00
UltCombo
8326b5e182 JS beautifier: fix loop construct, fixes #3510
As JavaScript is the only language supported by the beautifier, and [CodeCombat is in the process of converting things to while (true)](https://github.com/codecombat/codecombat/issues/3510#issuecomment-201965310), I guess adding this quick hack to the view's code should suffice for now. Hopefully, the non-standard `loop` construct will be removed from other languages before they receive beautifier support.

If this doesn't seem good, I can move  this hack to `aether.beautify`, where it is possible to perform this substitution in a language-aware way (i.e. inside Aether's JavaScript implementation's [`beautify` method](418ccf2414/src/languages/javascript.coffee (L137))). Seeing as the `loop` construct is specific to CodeCombat, I'm not sure if that would be a good idea. Passing an options object with a flag to support the `loop` construct seems a bit overkill.

Let me know what works best for you.
2016-03-28 00:00:40 -03:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
phoenixeliot
8d254c700a Fix teacher quote page having lots of blank space at the bottom.
This is due to "flying-focus" taking up space at the bottom of the page. This solution is a bandaid. Ideally we have view-swapping logic that contains this type of thing and we just swap out views using one function.
2016-03-25 13:57:26 -07:00
Maikel Langezaal
3be8220e0a read only message 2016-03-24 14:10:09 +01:00
Nick Winter
00bd983590 Fix #3387 2016-03-23 15:24:38 -07:00
Matt Lott
50171a5b02 🐛Fix admin trial requests page
Server refactoring exposed incorrect server parameters.
2016-03-21 11:39:15 -07:00
Nick Winter
905c9cdb93 Use victory text and next level data on level completion. Update picoCTF logo. 2016-03-18 14:18:41 -07:00
Scott Erickson
461fb14f37 TestView styling and responsive tweaks 2016-03-18 11:03:55 -07:00
Scott Erickson
2a399e71fa Add CocoView.scrollToTop 2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d Refactor FacebookHandler and GPlusHandler
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Matt Lott
255ebbc048 Ads for free campaign players
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
2016-03-18 10:29:31 -07:00
Imperadeiro98
e4ab59ef65 Added a diplomat 2016-03-12 14:03:59 +00:00
Scott Erickson
464430200c Fix AccountSettingsView to only try to change permissions in development 2016-03-11 15:00:55 -08:00
Scott Erickson
a59e96f277 Tweak invalid class code behavior, fix hide modal button test 2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Matt Lott
eb7bebe293 Add DAU 30-day avg and daily total to dashboard 2016-03-08 15:27:57 -08:00
Matt Lott
bce9862be2 Update request demo Ux
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
2016-03-08 09:30:50 -08:00
Nick Winter
6a9a36b1eb Don't show misc achievements in picoCTF mode 2016-03-07 09:54:29 -08:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb Client-side support for beating picoCTF levels 2016-03-03 17:18:24 -08:00
Matt Lott
9e8e865049 Remove old homepage
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
2016-03-01 09:48:53 -08:00
Matt Lott
2e2bf95ff7 Remove classroom MAUs from KPI graphs
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
2016-02-29 13:58:00 -08:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774 Fix lesson time estimate dropdown in NewHomeView 2016-02-25 16:49:26 -08:00
Scott Erickson
78d221fe4c Refactor AdministerUserModal to use new flat style instead of legacy plain style 2016-02-25 11:49:34 -08:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Imperadeiro98
62c5b34a96 Update About page i18n
Also fixed some images
2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Matt Lott
e74a77342c Update admin trial requests page
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
2016-02-24 10:22:55 -08:00
Matt Lott
609884eb51 Update furthest course dashboard tables
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00