Commit graph

8691 commits

Author SHA1 Message Date
Nick Winter
790c0375f1 Increase name label background opacity as per Robin's suggestion 2016-05-31 17:22:37 -07:00
phoenixeliot
81b550aeb3 Fix extra scrolling space on right of page 2016-05-31 17:03:55 -07:00
Josh Callebaut
13b69d15f2 Display auto-complete box even after adding a new line 2016-05-31 16:50:22 -07:00
phoenixeliot
9f9590a223 Fix Select All text 2016-05-31 16:42:25 -07:00
Scott Erickson
dfd4602553 AuthModal handles empty fields, fix #3587 2016-05-31 15:54:28 -07:00
Scott Erickson
f684708a94 Fix Level indentation 2016-05-31 15:47:31 -07:00
Scott Erickson
634cc1fb15 Fix anchor links on /about 2016-05-31 15:37:30 -07:00
Nick Winter
e7f79ab721 Several fixes for level editor update speed--should be faster for making changes on complex levels 2016-05-31 15:32:32 -07:00
phoenixeliot
ebc94e6e4b Show something reasonable when class has no students 2016-05-31 15:12:10 -07:00
Scott Erickson
d4c5d418ff Improve CampaignEditor saving, particularly level order
* Do not cache campaign
* Instead have an on leave message if there are unsaved changes
* Propagate campaignIndex values to campaign and levels so that they signal a change in order

 The save modal seems to have a lot of issues with identifying what models have
 changed. I tried using different methods, but none were consistent. Moving on
 to other bugs.
2016-05-31 15:09:26 -07:00
Scott Erickson
d36908f8c1 Grant admins access to teacher and student only pages 2016-05-31 15:09:26 -07:00
phoenixeliot
826c9c9de0 Trim 'Course: ' from course level names (pt 2) 2016-05-31 15:01:34 -07:00
phoenixeliot
d0251d20bf Trim 'Course: ' from course level names 2016-05-31 14:48:53 -07:00
phoenixeliot
41d8346c1e Don't show teacher warning to students who own classrooms 2016-05-31 13:56:06 -07:00
Scott Erickson
249255e4dc AuthModal and CreateAccountModal load gplus and facebook on init
On Windows/Chrome, the first click of the g+ button shows a popup
blocked warning, because the action is deferred while loading the
gplus library. Have the modals load the library first, and enable the
buttons when they're ready.
2016-05-31 12:39:30 -07:00
Imperadeiro98
9f4861bbaa Fix note in #3636 2016-05-31 19:29:55 +01:00
Josh Callebaut
50df5cc33f Merge branch 'bug-smash' of https://github.com/codecombat/codecombat into bug-smash 2016-05-31 11:24:06 -07:00
Josh Callebaut
fd43e09abc Fix #3350 2016-05-31 11:23:28 -07:00
phoenixeliot
f067337635 Fix classroom student count 2016-05-31 11:22:42 -07:00
Nick Winter
da90ab980e Fix some failing tests 2016-05-31 10:59:06 -07:00
Nick Winter
5ff1c4b700 Fix #3427: allow language-specific images in Markdown articles 2016-05-31 10:48:23 -07:00
Matt Lott
fd8f65cadc Help button should open "Overview" (Guide) by default 2016-05-31 10:37:30 -07:00
Matt Lott
ffcd89d327 Turn off video tutorials for course levels 2016-05-31 10:12:22 -07:00
duybkict
4f369a1e2f #3138 #3488 refactor UserView, MainUserView 2016-05-31 09:56:55 -07:00
Nick Winter
e8f18f08f5 Fix #3636: make CourseVictoryModal close button look clickable 2016-05-31 09:44:38 -07:00
Nick Winter
4160058505 Make skipping real-time playback jump to final frame. Fix #2827. 2016-05-31 08:50:17 -07:00
Nick Winter
96e6e0de9e Fix #2889: show incremental gem and xp award for replayable levels, not total 2016-05-30 17:33:15 -07:00
Nick Winter
88a07b5c09 Destroy vim mode option 2016-05-30 17:08:11 -07:00
Nick Winter
6f63de5ec8 Improve contrast of name labels against their backgrounds 2016-05-30 16:45:33 -07:00
Nick Winter
c00f436ab5 Show to-be-deleted student info in RemoveStudentModal 2016-05-30 16:33:00 -07:00
Nick Winter
065069cfdd Make CourseVictoryModal respect Markdown in next level description 2016-05-30 16:26:55 -07:00
Nick Winter
904d58a8ef Fix player-code-immutable vector methods with new Esper 2016-05-30 16:09:55 -07:00
Nick Winter
85e38ba851 Add the stylesheet for the previous commit 2016-05-30 16:03:00 -07:00
Nick Winter
1deddc6fd2 Verifier now runs all solutions and lets you choose which campaigns and languages to skip. 2016-05-30 13:51:09 -07:00
Duy Trần
f1ace99dad Vi translation (#3691)
* Translate into Vietnamese

* Translate and edit some Vietnamese strings

* update Vietnamese translate

* try to fix some error

* fix bugs with tab character

* update vi.coffee: play_level

* Update vi.coffee

* update vi.coffee

* update text on Home page

* Vietnamese: update legal

* vi.coffee: edit community page

* vi.coffee: update user's page

* vi.coffee: about page

* update vi.coffee

* update vi.coffee

* vi.coffee: invoices

* vi.coffee: account_prepaid

* update vi.coffee

* vi.coffee: error strings

* Update vi.coffee

* update vi.coffee

* vi.coffee: update contact form

* vi.coffee: minor update

* vi.coffee: update about page, modify some strings

* update vi.coffee

* vi.coffee: minor update

* no message

* Update vi strings, fix minor bug in page /community

* vi.coffee: update Adventure and Artisan

* vi.coffee: update Adventurer

* vi.coffee: reverse changes

* vi.coffee: reverse changes

* vi.coffee: update some strings

* vi.cofffe: update Diplomat

* vi.coffee: update Diplomat

* vi.coffee: update descriptions of classes

* vi.coffee: update Ambassador

* remove .cleafix div, will fix in another branch

* refactor ClansView #3138 #3488

* use initialize() in ClansView #3138 #3488

* update vi.coffee

* update vi.coffee

* exclude changes on ClansView

* vi.coffee: update play screen

* vi.coffee: update some strings

* vi.coffee: update createClass form

* vi.coffee: modify some strings on home page and teachers page

* minor fix
2016-05-30 20:58:11 +01:00
Imperadeiro98
ac3ef36a21 Fix es-419.coffee 2016-05-30 20:57:48 +01:00
RUSLAN LÓPEZ CARRO
5f90866efd Update es-419.coffee (#3695) 2016-05-30 20:56:33 +01:00
Imperadeiro98
92e2eaa4cd Fix some i18n files (#3696)
Uncomment headers and change translation
2016-05-30 20:24:24 +01:00
Nick Winter
c0e1f5fc1c Fix arrows zooming in from (0, 0) in real-time playback mode 2016-05-30 10:23:17 -07:00
Nick Winter
252b9a0448 Pets should only have one name 2016-05-30 10:02:51 -07:00
Louis Robinson
fde005b2c8 Added more names for #53 (#3692) 2016-05-30 09:39:38 -07:00
Fabrício Matté
06df1b9485 i18n pt-BR: add translations for code keywords (#3694) 2016-05-30 09:33:42 -07:00
Dong殺布沙
25daaead12 Zh han traditional update (#3690)
* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee
2016-05-30 09:32:36 -07:00
Kevin Avignon
d6bb496d19 French translation (#3687)
* Initial work on navigation context

* navigation section completed

* started work in the code section

* code section completed

* started work in the sign up section

* completed work in the sign up section

* common section completed

* general section completed

* work started in play_level section

* work done in play_level section

* work in calendar section started

* work done in calendar section

* work started in account_prepaid

* work in progress in account_prepaid
2016-05-30 09:30:51 -07:00
GrecK0
59eeef75d6 Update es-ES.coffee (#3677)
Hi, 

Several sentences translated to it's spanish version.

Regards!!!
2016-05-30 09:29:31 -07:00
JurianLock
956e91c2f5 Update nl-NL.coffee (#3674)
Did some user-flow optimizations and some spelling checks.
2016-05-30 09:28:55 -07:00
Ana
3042462080 Update sr.coffee (#3673)
began translation of skill docs and clans
2016-05-30 09:28:33 -07:00
Nick Winter
98970fe45c Merged uk.coffee 2016-05-30 09:27:01 -07:00
Matt Lott
9ce4ac51f0 Role-based hard feature blocks 2016-05-27 10:40:54 -07:00
Matt Lott
d0d3d838ed Better page titles
Also ditching non-production constructor page titles
2016-05-27 09:40:46 -07:00
Matt Lott
4bb3ac1f0a Replace Anoner with Anonymous
Closes #3686
2016-05-26 16:54:24 -07:00
Scott Erickson
6b3e94d60a Remove log 2016-05-26 15:12:10 -07:00
Scott Erickson
7d1d1500d9 Fix course progress tab select 2016-05-26 15:01:23 -07:00
Scott Erickson
8f7e4e2278 Add hints to level schema, I18N editor 2016-05-26 14:51:28 -07:00
Matt Lott
770987715e Update under 13 account creation copy 2016-05-26 10:02:25 -07:00
Bryukhanov Valentin
7e958639b2 Add choice method in rand (#3682)
As in python random module. It can be useful for levels instead "someArray[@world.rand.rand(someArray.length)]".
2016-05-26 09:44:50 -07:00
Matt Lott
e218af8418 Terminology change: enrollments/credits => licenses
Closes #3676
2016-05-25 09:27:47 -07:00
Nick Winter
9cdc3289db Rename pet name categories 2016-05-25 09:23:32 -07:00
phoenixeliot
7c8a2b3020 Fix My Classes progress dot again 2016-05-24 16:59:46 -07:00
phoenixeliot
a1a55a9b6d Remove revoke functionality 2016-05-24 16:05:40 -07:00
Scott Erickson
8dbc86ca04 Fix bugquest bugs
Hide TeachersContactModal after sending message

Fix GET /db/level/:handle/session, more extensively test

Fix EnrollmentView number of students input to stop losing focus on input

Fix EnrollmentsView syntax

Fix ActivateLicensesModal "Get Enrollments" button when already in the enrollments page

Update EnrollmentsView with new credit numbers when ActivateLicensesModal closes

Hide search box in TeacherClassView "Enrollment Status" tab

Tweak EnrollmentsView styling

Fix EnrollmentsView tests

Fix AnalyticsView

Make EnrollmentsView more explicitly handle undefined and empty array prepaid groups

Remove log

CoursesView handles JoinClassModal cancel

Re-enable EditStudentModal set password button when the form changes

Fix course instance tests, next level endpoint bug

Fix EditStudentModal tests
2016-05-24 14:10:56 -07:00
phoenixeliot
3d705e5d70 Fix bugquest bugs
Fix link to /teachers/classes (fixes bugquest#20)

Fix edit button color/icon (bugquest#23)

Fix bugquest#34

Fix password input width (bugquest#33)

Center new pasword text

Fix teacher password reset endpoint (bugquest#4)

Refactor+use NewHomeView logic for user page button (Fixes bugquest#2)

Refactor teacher-password-reset endpoint

This makes it much easier to prevent collisions with other logic when PUTing new User attributes.

Add regression test for converting to teacher account

Fix email verified links, require login (fix bugquest#16)

Fix me having stale emailVerified value (Fixes bugquest#40)

Don't show JoinClassModal to students

Add paragraph to JoinClassModal (fixes bugquest#14)

Update change-password label text (fixes bugquest#30)

Fix prompting for login on Account Settings page (bugquest #10)

Show validation errors for teacher password reset (bugquest#36)

Show yellow progress dot in My Classes if anyone has started (bugquest#55)

Remove confusing text (bugquest#100)
2016-05-24 14:10:17 -07:00
Scott Erickson
f0fa88206d Add Enrollment start/end dates, remove self-serve
* Refactor several related endpoints and views
* Redesign EnrollmentView, add TeacherContactModal
* Add "Enrollment Status" tab to TeacherClassView
* Delete PurchaseCoursesView and related files
* Style-flatten RemoveStudentModal
* Fix error handling in ActivateLicensesModal
* TeacherCoursesView loads faster by only loading course campaigns, and not load prepaids
2016-05-24 14:07:28 -07:00
phoenixeliot
8496343a02 Improve student account recovery
This adds the ability to verify email addresses of a user, so we know they have access to the email address on their account.

Until a user has verified their email address, any teacher of a class they're in can reset their password for them via the Teacher Dashboard. When a user's email address is verified, a teacher may trigger a password recovery email to be sent to the student.

Verification links are valid forever, until the user changes the email address they have on file. They are created using a timestamp, with a sha256 of timestamp+salt+userID+email. Currently the hash value is rather long, could be shorter.

Squashed commit messages:

Add server endpoints for verifying email address

Add server endpoints for verifying email address (pt 2)

Add Server+Client endpoint for sending verification email

Add client view for verification links

Add Edit Student Modal for resetting passwords

Add specs for EditStudentModal

Tweak method name in EditStudentModal

Add edit student button to TeacherClassView

Fix up frontend for teacher password resetting

Add middleware for teacher password resetting

Improve button UX in EditStudentModal

Add JoinClassModal

Add welcome emails, use broad name

Use email without domain as fallback instead of full email

Fetch user on edit student modal open

Don't allow password reset if student email is verified

Set role to student on user signup with classCode

Tweak interface for joinClassModal

Add button to request verification email for yourself

Fix verify email template ID

Move text to en.coffee

Minor tweaks

Fix code review comments

Fix some tests, disable a broken one

Fix misc tests

Fix more tests

Refactor recovery email sending to auth

Fix overbroad sass

Add options to refactored recovery email function

Rename getByCode to fetchByCode

Fix error message

Fix up error handling in users middleware

Use .get instead of .toObject

Use findById

Fix more code review comments

Disable still-broken test
2016-05-24 14:07:28 -07:00
Nick Winter
dd08a8bd64 Fix always using JavaScript for enemy AI in multiplayer 2016-05-24 13:54:49 -07:00
Nick Winter
8fce97aad3 Fully remove Clojure and Io. Use new Aether 0.5.0. 2016-05-24 12:00:04 -07:00
duybkict
2ded5ff4f0 Refactor ClansView #3138 #3488 2016-05-24 10:05:03 -07:00
duybkict
0e2b919ec1 Refactor AnalyticsView #3138 #3488 2016-05-24 09:35:54 -07:00
Ana
3eadde4007 Update sr.coffee (#3668)
a small update for teacher, version and contact sections
2016-05-21 19:05:18 +01:00
Dong殺布沙
bf537aa3a0 Zh hant (#3664)
* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee

* Update zh-HANT.coffee
2016-05-19 19:58:45 +01:00
Duy Trần
c461a0055d Vi translation (#3661)
* Translate into Vietnamese

* Translate and edit some Vietnamese strings

* update Vietnamese translate

* try to fix some error

* fix bugs with tab character

* update vi.coffee: play_level

* Update vi.coffee

* update vi.coffee

* update text on Home page

* Vietnamese: update legal

* vi.coffee: edit community page

* vi.coffee: update user's page

* vi.coffee: about page

* update vi.coffee

* update vi.coffee

* vi.coffee: invoices

* vi.coffee: account_prepaid

* update vi.coffee

* vi.coffee: error strings

* Update vi.coffee

* update vi.coffee

* vi.coffee: update contact form

* vi.coffee: minor update

* vi.coffee: update about page, modify some strings

* update vi.coffee

* vi.coffee: minor update

* no message

* Update vi strings, fix minor bug in page /community

* vi.coffee: update Adventure and Artisan

* vi.coffee: update Adventurer

* vi.coffee: reverse changes

* vi.coffee: reverse changes

* vi.coffee: update some strings

* vi.cofffe: update Diplomat

* vi.coffee: update Diplomat

* vi.coffee: update descriptions of classes

* vi.coffee: update Ambassador

* remove .cleafix div, will fix in another branch

* refactor ClansView #3138 #3488

* use initialize() in ClansView #3138 #3488

* update vi.coffee

* update vi.coffee

* exclude changes on ClansView

* vi.coffee: update play screen

* vi.coffee: update some strings

* vi.coffee: update createClass form
2016-05-19 19:57:29 +01:00
duybkict
75c7d140d1 refactor UnsubcribeView #3138 #3488 2016-05-19 07:41:16 -07:00
Scott Erickson
184be0bf65 CourseDetailsView does not link to next course if the student is not assigned to that course 2016-05-18 17:03:49 -07:00
Josh Callebaut
d6586d2e94 Merge pull request #3604 from Zerrien/taskViewAbstraction
Task view abstraction
2016-05-18 15:15:19 -07:00
Josh Callebaut
d4a557ef70 Fix uncommented campaigns 2016-05-18 14:53:34 -07:00
Ana
bc036edfb9 Update sr.coffee (#3659)
* Update sr.coffee

adjusted the translation for the newest locale file

* Update sr.coffee
2016-05-18 22:31:33 +01:00
Matt Lott
c88a7a1cea Merge pull request #3653 from themaka/thang-name-lengthener
Increased max thang-name-length to 60 characters
2016-05-19 08:49:33 +12:00
Josh Callebaut
a190acb108 Kebab-cases html ids 2016-05-18 13:33:02 -07:00
Josh Callebaut
cca19f2008 Fix string interpolation, fix jx jade DNT comments 2016-05-18 13:25:00 -07:00
Josh Callebaut
a5cad6f986 Utilize debounce, clean up event logic, remove unused CourseGearView 2016-05-18 12:50:51 -07:00
Josh Callebaut
38e97ab404 Refactor all server-side fetching calls, refactor solutionProblemView, minor changes to rest 2016-05-18 12:50:50 -07:00
Josh Callebaut
19e1c808d8 Fix filename convention, improve solution checker, remove old files 2016-05-18 12:50:50 -07:00
Josh Callebaut
30c879ddc0 Fix bug with Solution Problem View's problem count; add start of Course Gear View 2016-05-18 12:50:50 -07:00
Josh Callebaut
443bbae5db Improves level/campaign fetching for the solution problems view, and switches the names of the files 2016-05-18 12:50:49 -07:00
Josh Callebaut
bd322b3899 Improvements on solution tracking 2016-05-18 12:50:49 -07:00
Josh Callebaut
8df6a182e8 Further changes on the Analytics view 2016-05-18 12:50:49 -07:00
Josh Callebaut
62a027e76e Initial stages of an analytics view 2016-05-18 12:50:49 -07:00
Josh Callebaut
0436f18279 Migrates Artisan helpers to their own directory and begins implementation of level tasks view 2016-05-18 12:50:49 -07:00
Matt Lott
abe9d5c267 Update copy on Update to Student button 2016-05-18 10:49:57 -07:00
Scott Erickson
fe257e7d3d Merge pull request #3651 from duybkict/fix-community-page
fix community page layout
2016-05-18 09:45:51 -07:00
Scott Erickson
d513dfee66 Merge pull request #3656 from duybkict/fix-3488
#3488: use initialize() on PrepaidView
2016-05-18 09:30:57 -07:00
Thijs de Haan
fb52ed5835 Update nl-NL.coffee (#3658)
added a couple of translations
2016-05-18 17:28:17 +01:00
Duy Trần
cc82e944c5 Vi translation (#3612)
* Translate into Vietnamese

* Translate and edit some Vietnamese strings

* update Vietnamese translate

* try to fix some error

* fix bugs with tab character

* update vi.coffee: play_level

* Update vi.coffee

* update vi.coffee

* update text on Home page

* Vietnamese: update legal

* vi.coffee: edit community page

* vi.coffee: update user's page

* vi.coffee: about page

* update vi.coffee

* update vi.coffee

* vi.coffee: invoices

* vi.coffee: account_prepaid

* update vi.coffee

* vi.coffee: error strings

* Update vi.coffee

* update vi.coffee

* vi.coffee: update contact form

* vi.coffee: minor update

* vi.coffee: update about page, modify some strings

* update vi.coffee

* vi.coffee: minor update

* no message

* Update vi strings, fix minor bug in page /community

* vi.coffee: update Adventure and Artisan

* vi.coffee: update Adventurer

* vi.coffee: reverse changes

* vi.coffee: reverse changes

* vi.coffee: update some strings

* vi.cofffe: update Diplomat

* vi.coffee: update Diplomat

* vi.coffee: update descriptions of classes

* vi.coffee: update Ambassador

* remove .cleafix div, will fix in another branch
2016-05-18 17:24:25 +01:00
Matt Lott
6f6d65a005 /courses/update-account page
Allows a user to update their account based on their current role of:
individual, student, or teacher

Closes #3647
2016-05-18 06:06:28 -07:00
duybkict
f6e4aa3249 #3488: use initialize() on PrepaidView 2016-05-18 16:59:36 +07:00
Maka
95dd067c9c Increased max thang-name-length to 60 characters 2016-05-17 23:04:46 -04:00
duybkict
733f4edc20 fix community page layout 2016-05-18 09:37:32 +07:00
Dong殺布沙
f017ecd52b Update zh-HANT.coffee (#3635)
* Update zh-HANT.coffee 

2016/MAY/15th leorlf2h XarBuXar

* Update zh-HANT.coffee 

2016/MAY/15th leorlf2h XarBuXar(ingameID)
2016-05-17 20:28:18 +01:00
Olha Horobets
422f92974f Add translations (#3650) 2016-05-17 20:05:26 +01:00
Nick Winter
1c8ba6cf40 Add /SEEN URLs used in magazine ad 2016-05-17 10:50:25 -07:00