Commit graph

3213 commits

Author SHA1 Message Date
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
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
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
Bryukhanov Valentin
c4ee32f3e1 Merge pull request #3812 from Bryukh/master
Add bunch of Russian translation
2016-08-04 08:16:31 +03:00
Matt Lott
ba6d51659c Show in-game programming language
Closes #3814
2016-08-03 11:08:20 -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
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
e7c1d3d5d3 Remove stale educator wiki link 2016-07-29 14:36:31 -07: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
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
Matt Lott
b7f916116d Add game UI programming language label 2016-07-28 12:00:52 -07:00
Robin Yang
2cfe7d0b43 Add Elliot Blurb on About Page 2016-07-26 15:32:37 -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
rudmanmrrod
7b76180902 Added more translations (#3803) 2016-07-23 22:44:01 +01:00
phoenixeliot
b1277dc95f Merge branch 'game-dev-levels' 2016-07-21 10:14:22 -07:00
Nick Winter
436896de4a Update /about jobs 2016-07-21 09:06:57 -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
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
1e89775486 Basic campaign mode victory modal hookup for web-dev levels 2016-07-15 09:53:16 -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
c5c831c211 Remove real-time multiplayer prototype code 2016-07-14 10:26:09 -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
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
Bryukhanov Valentin
acaebcdbbb update ru.coffee - typo
"classroom_in_a_box" Russian typo fixed.
2016-07-05 09:30:33 +03:00
Bryukhanov Valentin
397bdbae12 Update ru.coffee new_home section
Fixed wrong translation phrases (were translated without context) and add newly translated phrases.
2016-06-29 13:20:28 +03:00
JurianLock
20ec35b85f Update nl-NL.coffee (#3770)
UX update
2016-06-28 13:09:49 +01:00
JurianLock
c6d5dc08fd Update nl-NL.coffee (#3769)
Spelling corrections.
2016-06-28 13:09:35 +01:00
Imperadeiro98
6011e5654b Uncomment headers from nb.coffee 2016-06-28 13:08:43 +01:00
Futsy
7b381d9881 Translated to Norwegian (Bokmål) (#3766)
* Translated to Norwegian (Bokmål)

I translated some of the words and quotes to Norwegian (Bokmål) and also
made some changes to some of them that were already translated

* More Translation

I have translated even more words and quotes

* Even more translation

I have translated even more words and quotes to Norwegian (Bokmål)

* something were wrong with my last commit ._.

Somehow these changes didn't join the last commit, but here they are

* A few more translated words and quotes

Yep it is even more stuff translated to Norwegian (bokmål)
2016-06-28 13:00:51 +01:00
Bryukhanov Valentin
c7a0f468ec Merge pull request #3752 from leshark/patch-2
Update ru.coffee
2016-06-28 14:36:48 +03:00
Matt Lott
d72e4eb750 Practice levels Ux and next level algorithm
Update classroom and gameplay Ux to surface practice levels as 3a, 3b,
etc.
Update next level logic to leverage practice levels based on per level
completion playtime thresholds.
Patrol buster and patrol buster A are live for testing.
Fix a few classroom Ux progress hover bubble info bugs.

Closes #3767
2016-06-27 14:05:42 -07:00
Bryukhanov Valentin
0878d76332 Merge pull request #3751 from Bryukh/patch-2
Fix ru translation for "press"
2016-06-27 18:16:05 +03:00
Diego Toala
691228c9e7 Update es-419.coffee (#3753)
I´ve translated to spanish more content. I´m sure it is ok on Latam context.
2016-06-24 13:32:43 +01:00
leshark
d70a4ff14d Update ru.coffee 2016-06-22 22:59:44 +04:00
Bryukhanov Valentin
4f245a0ae9 Fix ru translation for "press" 2016-06-22 14:27:11 +03:00
Ana
4bac7765e2 Update sr.coffee (#3745)
update courses section
2016-06-21 11:05:30 +01:00
Imperadeiro98
b758b531d8 Uncomment an header from fr.coffee 2016-06-18 10:36:30 +01:00
zeinamakky
8a955d22f3 translated some of the phrases (#3741) 2016-06-18 10:35:47 +01:00
Sara J. Martinez
0f257373be Add several translations for Latin American Spanish (#3740) 2016-06-18 10:34:33 +01:00
Matt Lott
4622337d82 Update licenses needed form
Ensure the needed licenses are in the subject resulting email.
2016-06-17 15:40:07 -07:00
Scott Erickson
972c632d85 Fix fr.coffee indentation 2016-06-16 14:32:52 -07:00
Catsync
6901b758e6 Update estimated course times (#3738)
* Update time estimates for courses.

* Update coming soon text.
2016-06-16 12:56:43 -07:00
Scott Erickson
86fc4a3846 Hints v1
Add per-level tips and tricks, available during gameplay to help unstick players.

Closes #3736
2016-06-15 16:12:41 -07:00
Diego Toala
6cd1bfac71 Update es-419.coffee (#3734)
I want to contribute translating to Spanish (Latam). This is a test to know I am doing right.
2016-06-14 11:29:25 +01:00
Ana
9bb1e3946f Update sr.coffee (#3733)
- fixed some typos and language flow issues
- translated more sections and started courses section
2016-06-10 20:45:50 +01:00
Imperadeiro98
ccd9bb3eb6 Uncomment and header in es-419.coffee 2016-06-10 11:49:32 +01:00
RUSLAN LÓPEZ CARRO
c1f0e2d5d0 Update es-419.coffee (#3732) 2016-06-10 11:48:50 +01:00
Nick Winter
23090b4198 Merge es-419.coffee 2016-06-09 14:29:57 -07:00
Imperadeiro98
ad37fd3460 Fix fr.coffee 2016-06-09 20:10:14 +01:00
dacha76
d5cbe1e11a translated "new_home" section to french. (#3728)
translated "new_home" section to french.
2016-06-09 20:07:13 +01:00
Scott Erickson
69f3ee3a5b Allow username login, tear out a bunch of related stuff in change
* Switch from auth.loginUser to User.loginPasswordUser with Promise
* Remove a cascade of unused views that were using auth.loginUser: StudentLogInModal, StudentSignupModal, HourOfCodeView
* Also remove auth.createUser
2016-06-08 13:55:19 -07:00
Ana
5da85621c6 Update sr.coffee (#3714)
- translation of contact, acc settings, community and clans sections + some other stuff
2016-06-05 14:47:27 +01:00
JurianLock
189f9fa7af Update nl-NL.coffee (#3713)
Some UX updates and some minor spelling checks.
2016-06-05 14:46:19 +01:00
phoenixeliot
870ae9a8a1 Add hero selector for courses mode
Use selected hero in Course mode play

Show selected hero on Courses (in progress)

Add hero select modal

Use short names, only show warriors

Use box-shadow instead of borders

Add tests for HeroSelectModal

Refactor modal opening test

Address code review feedback
2016-06-03 13:40:41 -07:00
Imperadeiro98
e8896e4d49 Uncomment header in de-AT.coffee 2016-06-03 20:03:09 +01:00
Oliver Harald Jessner
6829d60b80 Did more translations (#3711)
- Finished the code section
- Finished general section
- nearly finished the play section
  - Still don't understand which/what kind of  `"Poll" # Tooltip on poll button from /play` is meant.
2016-06-03 20:02:26 +01:00
Imperadeiro98
5a6fe46b22 Uncomment an header in de-AT.coffee 2016-06-03 14:25:20 +01:00
Oliver Harald Jessner
a12c9402f4 Adding some German words (#3699)
In some strings the contexts are missing, so its hard to translate.
2016-06-03 14:23:46 +01:00
Duy Trần
3c2e3e37d4 Vi translation (#3703)
* 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

* vi.coffee: update some strings
2016-06-02 18:58:29 +01:00
Rob
c20ee729ca Merge branch 'bug-smash' 2016-06-01 16:45:01 -07:00
phoenixeliot
9f9590a223 Fix Select All text 2016-05-31 16:42:25 -07:00
phoenixeliot
ebc94e6e4b Show something reasonable when class has no students 2016-05-31 15:12:10 -07:00
Matt Lott
ffcd89d327 Turn off video tutorials for course levels 2016-05-31 10:12:22 -07:00
Nick Winter
88a07b5c09 Destroy vim mode option 2016-05-30 17:08:11 -07:00
RUSLAN LÓPEZ CARRO
fccc33da59 Update es-419.coffee 2016-05-30 16:42:53 -05: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
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
770987715e Update under 13 account creation copy 2016-05-26 10:02:25 -07:00
Matt Lott
e218af8418 Terminology change: enrollments/credits => licenses
Closes #3676
2016-05-25 09:27:47 -07:00
phoenixeliot
a1a55a9b6d Remove revoke functionality 2016-05-24 16:05:40 -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
8fce97aad3 Fully remove Clojure and Io. Use new Aether 0.5.0. 2016-05-24 12:00:04 -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
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
abe9d5c267 Update copy on Update to Student button 2016-05-18 10:49:57 -07:00