codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-18 03:23:42 -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
Matt Lott
18de9ab298 Create call tasks and opps for license requests 2016-06-23 06:12:51 -07:00
Josh Callebaut
b8bdc0c726 Merge pull request #3754 from Zerrien/campaign-treema-display 
Clicking on level in treema makes the level flash
 2016-06-22 15:56:54 -07:00
Josh Callebaut
e953f7fc60 Cleaner jQuery selection 2016-06-22 15:36:42 -07:00
Josh Callebaut
0ad8fddff6 Clicking on level in treema makes the level flash 2016-06-22 15:11:27 -07:00
Rob
f100e7ab52 Non-integer indentation levels are impossible. 2016-06-22 15:08:20 -07:00
Rob
6a03163fcb - Use modern esper engine if we detect browser support it. 
- Change streaming batch size depending on how far into simulation we are.
- Hoist try catch out of onWorldLoad so Chrome and JIT it.
 2016-06-22 15:07:43 -07: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
Matt Lott
1d70837309 Exclude practice levels from teacher course guides 2016-06-21 21:10:59 -07:00
Matt Lott
73698129a0 Make level practice threshold available in editor 2016-06-21 16:41:47 -07:00
Rob
bdfa6d435a Add extra options to verifier. 2016-06-21 11:48:42 -07:00
Matt Lott
6eef19e488 Update homepage course languages image 2016-06-21 10:19:47 -07:00
Nick Winter
56cdfa9fc7 Update our /privacy address 2016-06-21 09:41:21 -07:00
Matt Lott
df90935aba Admin school counts page 2016-06-21 09:33:06 -07:00
Ana
4bac7765e2 Update sr.coffee (#3745) 
update courses section
 2016-06-21 11:05:30 +01:00
Nick Winter
2679bced07 Fix level editor not loading after recent hotfix 2016-06-20 17:10:55 -07:00
Scott Erickson
b36752107e Hot fix for teachers playing level previews 2016-06-20 14:26:45 -07:00
Nick Winter
380977f766 Fix #3744: course levels work with no hero selected 2016-06-20 10:47:15 -07:00
Matt Lott
e0170d0339 Add hero-practice level type and threshold to schema 
Filtering out hero-practice levels from classrooms until the Ux
supports them.
 2016-06-19 20:23:32 -07: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
514fce349a Include ladder levels in level stats in teacher views, clean client test logs 2016-06-17 15:15:13 -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
57def1fbeb Merge pull request #3727 from duybkict/refactor-MyMatchesTabView 
#3138 #3488 refactor MyMatchesTabView
 2016-06-16 10:41:17 -07:00
Scott Erickson
a4b5e92b06 Merge pull request #3726 from duybkict/refactor-SimulateTabView 
#3138 #3488 refactor SimulateTabView
 2016-06-16 10:34:53 -07:00
Matt Lott
6739353d8e 🐛Fix hint intro overview duplicates 2016-06-16 10:21:37 -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
Scott Erickson
c8e7b79e5d Make demoEl run _.once 2016-06-15 16:09:24 -07:00
Scott Erickson
de138c2581 Disable ModuleLoader debug logs because they get in the way 2016-06-15 16:09:24 -07:00
phoenixeliot
e841334c86 Fix join class modal (temporary hack) 2016-06-15 13:28:03 -07:00
phoenixeliot
9239d2a81b Fix text overflowing on teacher dashboard 2016-06-15 13:09:43 -07:00
Nick Winter
109de55185 Stop unprocessing flag events when serializing the flag history so that flag history is properly deterministic again 2016-06-14 18:02:08 -07:00
phoenixeliot
749601c9d8 Don't cache classrooms (fetched by memberID) 2016-06-14 14:27:57 -07:00
phoenixeliot
e73a31abe6 Fix loading hero thangs more 2016-06-14 13:03:42 -07:00
phoenixeliot
b3f8b79897 Register dependencies for course mode too 2016-06-14 12:01:12 -07:00
phoenixeliot
2dc66f5947 Log some stuff for debugging 2016-06-14 11:54:29 -07:00
Matt Lott
ecb5169ca7 Add hintsB to level schema 2016-06-14 10:29:30 -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
Nick Winter
a96d5df78e Don't protect APIs in game-dev levels 2016-06-13 16:21:22 -07:00
phoenixeliot
ccf5b449e3 Use classroom.courses.levels instead of campaign.levels 2016-06-13 14:47:10 -07:00
phoenixeliot
98bfcb4c9e Fix footer margin on TeacherClassView 2016-06-13 14:45:24 -07:00
phoenixeliot
dccb4f3172 Fix Alejandro's name 2016-06-13 12:11:22 -07:00
Matt Lott
e7d076be65 Update logo 2016-06-11 21:33:15 -07: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
d2634e63ed Fix #3642: AIs using aiSource now don't need API protection (with new Aether) 2016-06-09 17:59:19 -07:00
Rob
3a9f0adba8 Switch to using actual node server to receive log events 2016-06-09 17:00:35 -07:00
Nick Winter
bd14e49707 Fix #3701: load data properly for simulation again. 2016-06-09 16:48:18 -07:00
Matt Lott
55bd49fde0 Add course playtimes to student progress CSV 2016-06-09 14:44:47 -07:00
Nick Winter
8203727d60 Fix #3457 2016-06-09 14:35:19 -07:00
Nick Winter
23090b4198 Merge es-419.coffee 2016-06-09 14:29:57 -07:00
Rob
aa7f2af700 No ads, act two. 2016-06-09 12:13:17 -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
Matt Lott
9dbcf27e11 Add classroom Mixpanel logging 
Closes #3720
 2016-06-09 10:46:26 -07:00
duybkict
0c0f075424 #3138 #3488 refactor MyMatchesTabView 2016-06-09 10:31:53 +07:00
duybkict
a4e8cafdb3 #3138 #3488 refactor SimulateTabView 2016-06-09 10:00:47 +07:00
Nick Winter
b0fcddac68 Add game-dev level type (#3725) 
* Initial pass adding new game-dev level type.

* Fix a failing test with updated LevelSystem required properties

* Bring back normal Angel worker timeout times

* Fix another failing LevelSystem test since removing propertyDocumentation
 2016-06-08 16:57:00 -07:00
Scott Erickson
0d5bf6b4de Merge branch 'username-login' 2016-06-08 15:48:46 -07:00
Scott Erickson
c57fd6f460 Do not set campaignIndex for levels except for course campaigns 2016-06-08 15:48:26 -07:00
Matt Lott
546598396d Add Lisa to /about page 2016-06-08 15:46:21 -07:00
phoenixeliot
8f20e9f7d1 Fix missing names for Ida/Nando 2016-06-08 14:40:37 -07: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
Scott Erickson
86699a8510 Merge pull request #3719 from duybkict/refactor-LadderTabView 
#3138 #3488 refactor LadderTabView
 2016-06-08 10:01:37 -07:00
Scott Erickson
2f9f062165 Merge pull request #3718 from duybkict/refactor-LadderPlayModal 
#3138 #3488 refactor LadderPlayModal
 2016-06-08 09:53:59 -07:00
Scott Erickson
6beae97911 Merge pull request #3717 from duybkict/refactor-ContributorClassView 
#3138 refactor contributor views
 2016-06-08 09:43:14 -07:00
Scott Erickson
9a36cf514e Merge pull request #3716 from duybkict/fix-3678-rebase 
Fix #3678 display error on loading resources failed - rebased
 2016-06-08 09:35:31 -07:00
duybkict
23d45ab947 #3138 #3488 refactor LadderTabView 2016-06-08 16:36:01 +07:00
Matt Lott
c3f1e6e04c Turn off homepage logged out a/b tests 2016-06-07 05:36:48 -07:00
duybkict
c1f1b4a048 #3138 #3488 refactor LadderPlayModal 2016-06-07 18:05:06 +07:00
duybkict
7e4573f37c #3138 refactor contributor views 2016-06-07 17:09:00 +07:00
duybkict
f439ffddc7 fix issue #3678 2016-06-07 09:42:57 +07:00
Scott Erickson
be78f4049c Fix adding inventory items to hero in level editor 
Was only happening when HeroPlaceholder had HasPet component.
Presumably because the collection was loaded by HasPet, but the thang node
for the inventory node needed to populate its autocomplete array.
 2016-06-06 15:35:10 -07:00
Scott Erickson
53a7510c46 Remove logs 2016-06-06 14:30:58 -07:00
Scott Erickson
891d0fe12f Fix TeacherClassView sometimes not loading 
This was a race condition where the view would trigger a render
before courses loaded, and the template required them when it had
some of its other resources.
 2016-06-06 13:55:37 -07:00
phoenixeliot
d9959db856 Fix sending invitation emails 2016-06-06 13:43:41 -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
0d5ad789e5 Add time played to level progress tooltips 2016-06-03 16:52:59 -07:00
Scott Erickson
7a0fb967f0 Add clearer reports to client TestView 2016-06-03 16:26:03 -07:00
Rob
2ef10f58b3 Fix bug where visual indents couldn't nest. 2016-06-03 14:01:37 -07:00
Scott Erickson
705463615b Fix some intermittent client erroring 
Some tests are triggering achievement polling. Prevent that from happening.
 2016-06-03 13:40:41 -07: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
Scott Erickson
5e1942c0d3 Fix adding levels to campaigns 2016-06-03 13:30:56 -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
Scott Erickson
f6f941b13d Merge pull request #3705 from duybkict/refactor-LadderView 
refactor LadderView
 2016-06-03 10:21:28 -07: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
Rob
8d2df0baff Kill some console logs @poojawins 2016-06-02 20:17:52 -07:00
duybkict
e7f221813e remove constructor, handle load async process 2016-06-03 09:23:35 +07:00
duybkict
b88ca10f21 Merge branch 'master' into refactor-LadderView 2016-06-03 09:06:58 +07:00
Rob
3485abd413 Don't show indent guides for incorrect python indention. 2016-06-02 18:46:47 -07:00
phoenixeliot
ae3b8057f7 Detect URL classCode in createAccountModal 2016-06-02 12:51:05 -07:00
Matt Lott
50ee20d3ae Send teacher contact us form emails through Close.io 2016-06-02 11:13:52 -07: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
phoenixeliot
7dc490bbcb Add Create Account button to student-only pages 2016-06-02 10:28:10 -07:00
Scott Erickson
6e48d700bc Merge branch 'update-invite-to-classroom' 
Work was duplicated. Merging in changes from branch, but leaving
the master version as is in this commit.
 2016-06-02 10:20:19 -07:00
duybkict
a9d9a67383 refactor LadderView 2016-06-02 15:44:19 +07:00
duybkict
215ff1faaf refactor MainLadderView 2016-06-02 14:54:00 +07:00
Rob
c20ee729ca Merge branch 'bug-smash' 2016-06-01 16:45:01 -07:00
Rob
c08d426c6b Use cloudflare for analytics so we get the correct SSL cert. 2016-05-31 19:56:37 -07:00
phoenixeliot
e053ad5c61 Only show progress dot for assigned courses (TeacherClassesView) 2016-05-31 17:51:45 -07:00
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
RUSLAN LÓPEZ CARRO
fccc33da59 Update es-419.coffee 2016-05-30 16:42:53 -05: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
Scott Erickson
c0172c4347 Add a missing 'view' in prepaid-view.jade 2016-05-17 10:07:34 -07:00
Scott Erickson
0fb6b3095f Merge pull request #3623 from duybkict/fix-3138 
Fix #3138
 2016-05-17 09:54:21 -07:00
Scott Erickson
d74d75b584 Merge pull request #3626 from codecombat/improve-join-classroom 
Make joining classrooms more stable
 2016-05-17 09:44:32 -07:00
Scott Erickson
5065594ced Merge pull request #3648 from duybkict/fix-dev-env 
Fix isProduction logic
 2016-05-17 09:42:59 -07:00
Scott Erickson
700f3bcf9c Merge pull request #3649 from duybkict/fix-3158 
Cleanup achievements.sass #3158
 2016-05-17 09:39:20 -07:00
Imperadeiro98
c52d188b9e Fix indentation in nl-NL.coffee 2016-05-17 17:20:45 +01:00
Bram Dekker
58966d6d6d added Dutch translations (#3646) 2016-05-17 17:19:21 +01:00
Mihbo
97551aee36 Update uk.coffee (#3645) 
Add translation of lines 185-233 ("code" section)
 2016-05-17 17:18:40 +01:00
Elian Kamal
5862c8e21c Update he.coffee (#3640) 
+ A minor update to the newly generated translations for the site.
 2016-05-17 17:18:06 +01:00
Imperadeiro98
ab8d8b1cf5 Fix typo in zh-HANS.coffee 2016-05-17 17:17:06 +01:00
lazydogP
ddb4c00c58 Update translation (#3639) 2016-05-17 17:16:20 +01:00
Vladimir Ivakin
88eeb73480 Update ru.coffee (#3633) 2016-05-17 17:12:49 +01:00
Olha Horobets
1f95b1ae91 Add some translations (#3632) 2016-05-17 17:10:58 +01:00
Ana
b234295555 Update sr.coffee (#3631) 
translation for code itself
 2016-05-17 17:10:02 +01:00
Yuki Ueda
9385f01bba Update ja.cofee #3627 (#3630) 2016-05-17 17:09:12 +01:00
duybkict
f1e60bcba4 Merge branch 'master' into fix-3158 2016-05-17 11:10:31 +07:00
duybkict
4ccf29a7f9 clean up achievements.sass 2016-05-17 11:08:28 +07:00
duybkict
322fd2d853 fix isProduction logic 2016-05-17 09:33:00 +07:00
Scott Erickson
f6b3016d85 POST /db/classroom/-/members joins any free course instances, rather then CoursesView doing so 2016-05-16 16:47:08 -07:00
Nick Winter
e538e54d7a Re-enable sales job posting 2016-05-16 16:01:44 -07:00
Matt Lott
9ee8e04514 Redirect /hoc to match /?hour_of_code=true behavior 
Both go directly to /play now
 2016-05-16 14:50:34 -07:00
Olha Horobets
7ff302ef48 Add translations 2016-05-15 20:35:23 +03:00
Imperadeiro98
6d5f3e236f Add i18n to new-item-view.jade 2016-05-14 21:25:01 +01:00
Nick Winter
ce9eeb0fde Market Development Representative job is filled already 2016-05-13 15:57:02 -07:00
Rob
58895470ed Unattach resize event when NewHomeView is destoryed 2016-05-13 15:46:37 -07:00
Nick Winter
f723b2155b copy-i18n-tags now adds quotes around necessary translation keys 2016-05-13 15:42:41 -07:00
Nick Winter
1744a60314 Re-add the missing quotes around the new translation keys 2016-05-13 15:33:42 -07:00
Imperadeiro98
525d22895d Update code snippets 2016-05-13 20:10:23 +01:00
Rob
dbc6f6821f No ads for now. 2016-05-13 11:26:52 -07:00
Nick Winter
ad5df3be26 Propagate i18n 2016-05-13 11:14:55 -07:00
Nick Winter
d079c29f51 Update locale interpolation format for non-English (see 747c5f29f7) like in #3613 2016-05-13 10:53:39 -07:00
JurianLock
146f57e58e Update nl-NL.coffee (#3613) 
* Update nl-NL.coffee

* Update nl-NL.coffee

* Update nl-NL.coffee

* Update nl-NL.coffee
 2016-05-13 10:48:41 -07:00
Cat Sync
6e11b0dcda Definitely use hero if hero is present in the user code. 2016-05-13 13:37:36 -04:00
Cat Sync
59408c0de2 Merge remote-tracking branch 'codecombat/master' into flip-hero-logic 2016-05-13 13:32:46 -04:00
Imperadeiro98
fca09ad796 Update i18n 
Remove some strings that are repeated or unused
 2016-05-13 15:43:12 +01:00
duybkict
b58fce5868 #3138: refactor PrepaidView 2016-05-13 18:18:17 +07:00
duybkict
61ea013caf #3138: refactor PrepaidRedeemModal 2016-05-13 18:14:17 +07:00
phoenixeliot
9cb6e99942 Add operator keywords and truth values to translations 
Add and tweak code translations

Translate shortened words to complete words
 2016-05-12 13:46:44 -07:00
Imperadeiro98
ff48734a52 Update pt-PT.coffee 2016-05-12 21:45:44 +01:00
Olha Horobets
84d6ae5fe2 Add more translations (#3620) 
Found better phrase for 'codecombat_is'.
Added more translations.
 2016-05-12 21:18:24 +01:00
Rob
9bf118962f Disable Clojure and IO 2016-05-12 11:36:10 -07:00
Matt Lott
bc928253a5 Add site origin to demo requests admin page 2016-05-12 11:03:35 -07:00
duybkict
672c89e0bc Update Vagrant setup scripts 
install nodejs using nvm
fix issues with Windows/Linux new line characters
update auto-reload-brunch
drop bless-brunch
resolve related issue #3588
 2016-05-12 09:46:34 -07:00
Scott Erickson
0770a61534 Merge pull request #3608 from duybkict/fix-1874 
fix issue #1874
 2016-05-12 09:11:39 -07:00
duybkict
2a5968e001 no message 2016-05-12 09:10:54 +07:00
phoenixeliot
05ae7057db Fix class joining when entering it in the signup field 2016-05-11 14:53:05 -07:00
phoenixeliot
35d0352a92 Autofill class code from URL in signup modal 2016-05-11 14:53:05 -07:00
Matt Lott
8e6293824b 🐛Fix admin demo requests 7-day average 2016-05-11 11:55:46 -07:00
Matt Lott
8bc9cd5ee6 Admin teacher demo requests page 
Incoming rates table
Student counts table
 2016-05-11 11:52:32 -07:00
Olha Horobets
ea6d5e4867 Add some more translations (#3618) 
Found a better word for 'engaging'
Added more translations
 2016-05-11 19:32:28 +01:00
Scott Erickson
8328d955a8 Merge pull request #3616 from duybkict/fix-3158 
Fix issue #3158: remove unused sass files
 2016-05-11 09:58:28 -07:00
korytsya
0c62e9310d Changed slogan (#3617) 
* Changed slogan

* Uncomment line
 2016-05-11 15:37:22 +01:00
Imperadeiro98
acee9d7331 Correct indentation in nl-BE.coffee 2016-05-11 15:36:53 +01:00
JurianLock
225d610fbe Update nl-BE.coffee (#3614) 2016-05-11 15:35:46 +01:00
duybkict
8deb172b63 remove unused sass files 2016-05-11 16:49:09 +07:00
duybkict
48b58b5348 Fix issue with i18n strings 2016-05-11 09:39:35 +07:00
duybkict
2db37c7556 Merge branch 'master' into fix-1874 2016-05-11 09:18:02 +07:00
Rob
913565397b Allow passing languages into verifier. 2016-05-10 15:21:02 -07:00
Rob
c6392e0f74 Turn on esper 2016-05-10 14:12:35 -07:00
Cat Sync
50c8588231 Default to using hero unless self/this is present in the player's code. 
This affects the autocomplete and spell palette api docs.
 2016-05-09 12:49:25 -04:00
Scott Erickson
c707129b5e Disable esper, LevelSession.state.dateFirstCompleted schema restriction 2016-05-09 09:32:51 -07:00
Duy Trần
4172f03fad Vi translation (#3609) 
* 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
 2016-05-07 10:16:39 +01:00
phoenixeliot
ec8bce9f70 Put back clobbered pt-PT code translations 2016-05-06 15:26:21 -07:00
duybkict
dedc13f749 fix issue #1874 2016-05-07 04:12:54 +07:00
Scott Erickson
f7a6d354af Add school and teacher names to invite email context 2016-05-06 13:28:19 -07:00
phoenixeliot
8223122a6b Refactor and update teacher-dashboard 
This updates TeacherClassView and ActivateLicensesModal to use the
new state-based rendering system, making it much snappier and less clunky
feeling, and improving data consistency.

Features also included in this:
- Hover details for progress dots in TeacherClassView
- ActivateLicensesModal has an "All Students" option and better handling
  when you switch classrooms in the dropdown
- Unenrolled/Unassigned students are shown separately in Course Progress and
  can be enrolled/assigned from there.

Add Back to Classes button on demo-request submitted view

Delete temporary patch file

Show unenrolled students separately in Course Progress (incomplete)

Migrate TeacherClassView to use orchestrator-style events, add unassigned students section, replace bootstrap tabs with state-based tabs

Convert missed instance variables to be in @state

Fix merge errors

(in progress) Convert a bunch of stuff to use state and events (removing student needs fixing)

Fix up modal interactions, some bugs

Switch state to be a Model, sync up course dropdowns

Convert student sorting to use state model

Add hover tooltips to TeacherClassView Students tab

Don't keep tooltip open when you mouse into it

Add dateFirstCompleted and Course Progress tooltips

Course Overview progress tooltips

Refactor ActivateLicensesModal

Refactors:
Uses state object for view state
Passes back the updated users in 'redeem-users' event instead of modifying given collection

Features:
Add 'All Students' dropdown option
Don't forget checked students if you change classroom from dropdown,
  but only enroll the ones visible when you click "Enroll (n) Students"

Separate enrolled students; improve style

Rearrange error text

Disable enroll-students button when none are selected

Remove console.logs

Move style-flat variables to another file

This prevents .style-flat from being copied in multiple times to the resulting CSS.

Show Unarchive button when on the page for an archived class

Move text to en.coffee

Only sort students on first classroom sync

Fix merge error

Handle sessions missing completion date in view logic instead of migration script

Listen to classroom sync more than once in case it gets unarchived
 2016-05-06 13:13:11 -07:00
Scott Erickson
0e96b4b250 Merge branch 'master' of https://github.com/codecombat/codecombat 2016-05-06 12:12:50 -07:00
Scott Erickson
fffe5f995d Merge branch 'master' of https://github.com/Marvellanius/codecombat into dutch-localization-update 2016-05-06 12:03:34 -07:00
Nick Winter
578ef34bdf Propagate i18n 2016-05-06 11:56:22 -07:00
Scott Erickson
3ad395ecb8 Lightweight invoice purchases show description on PaymentsView 2016-05-06 11:43:54 -07:00
Matt Lott
6916de6c8b Update enroll students copy 2016-05-05 17:15:52 -07:00
Nick Winter
32f74531e4 Enable Esper by default in certain cases; improve verifier a bit; misc cleanup 2016-05-05 16:56:58 -07:00
Nick Winter
e4c904463c No more transpiledCode 2016-05-05 13:22:30 -07:00
Matt Lott
4827dc57e7 Add MDR position to /about 2016-05-05 13:04:27 -07:00
Imperadeiro98
b61b676333 Update pt-PT (#3606) 
Also update some repeated and missing i18n
 2016-05-05 20:07:43 +01:00
Scott Erickson
63a11a75f4 Refactor client tests to use factories instead of fixtures 2016-05-05 11:24:29 -07:00
Matt Lott
b70e9bbcfe Add export student progress csv to class view 
Works on Chrome and Firefox, not so great on Safari, untested on IE and
Edge.
 2016-05-05 09:54:24 -07:00
Yuki Ueda
8c7bfc0d04 Update ja.coffee (#3605) 2016-05-05 15:48:37 +01:00
Duy Trần
7b7a94b10b Update vi.coffee (#3603) 
* 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
 2016-05-05 15:45:18 +01:00
Mihbo
2c9a611409 Update uk.coffee (#3600) 
Translate a few strings
 2016-05-05 15:43:03 +01:00
GrecK0
6780689417 Update es-ES.coffee (#3594) 
Several lines in english were updated to a propper spanish sentence.

Hope this helps.
Regards!!!
 2016-05-05 15:42:14 +01:00
Imperadeiro98
32c7cb1b71 Fix nl-NL.coffee 2016-05-05 15:41:15 +01:00
zimmah
d1a0ea526f Update nl-NL.coffee (#3593) 
Few fixes to rarely used words or mistranslations and many new additions.
 2016-05-05 15:37:21 +01:00
stephanzlatarev
0c40d3f6aa app/locale/bg.coffee translations for new_home (#3590) 
* app/locale/bg.coffee translations for new_home

* app/locale/bg.coffee translations for new_home
 2016-05-05 15:35:52 +01:00
Scott Erickson
1489df3f23 Show messages that IE9 and IE10 are deprecated, fix and clean existing systems 
* Trim index_old_browser.html (shown on /play/) to simple page
* Fix useragent middleware to attach where needed
* Show IE alert on all pages on application init
 2016-05-04 15:05:55 -07:00
Matt Lott
92de821b76 Always show subscription in account dropdown if subscriber 
Event if teacher or student.
 2016-05-04 14:08:33 -07:00
Marvellanius
390ae8fa2c reverted unnecessary change in original file 2016-05-04 16:02:15 +02:00
Marvellanius
cef1f95a5a add dutch localisation to payment 
add dutch localisation static files
 2016-05-04 15:38:33 +02:00
Marvellanius
532dbda651 fix empty product bug 2016-05-04 15:38:33 +02:00
Marvellanius
edaa04f7c9 make buy-gems-model wider 2016-05-04 15:34:38 +02:00
Nick Winter
22007fff9b Make multiplayer work in esper mode 2016-05-03 22:26:48 -07:00
Rob
42b49975e8 Add multithreading to verifier. 2016-05-03 19:51:19 -07:00
Matt Lott
c357aa4f25 Update /about company address 2016-05-03 16:04:14 -07:00
Rob
5af695494c Reclaim some memory from the verifier. 2016-05-03 15:15:44 -07:00
Duy Trần
98a5644226 Update vi.coffee (#3596) 
* 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
 2016-05-03 22:53:10 +01:00
Imperadeiro98
08ac880fad Merge pull request #3591 from KonstantinLA/patch-4 
Update ru.coffee
 2016-05-03 22:50:36 +01:00
Scott Erickson
c1dc80e93f Escape inputs for name conflict checks 2016-05-03 14:47:39 -07:00
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
Nick Winter
074610095d Make room for inventory play button on short screens 2016-05-02 15:06:19 -07:00
Duy Trần
b4e6ca513f Translate into Vietnamese (#3584) 
* 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
 2016-05-02 13:14:32 -07:00
Nick Winter
d5592eeb4f Merge es-419.coffee 2016-05-02 13:10:31 -07:00
KonstantinLA
12ef4eed4e Update ru.coffee 
I think, don`t need translate code keywords
 2016-05-02 11:06:42 +03:00
phoenixeliot
9f3aac3313 Merge branch 'fix-login-error' 2016-04-29 15:38:37 -07:00
phoenixeliot
c666a39d3b Fix StudentLoginModal crash on invalid login 
Add test for student bad login
 2016-04-29 15:34:11 -07:00
Imperadeiro98
fc9974dbe1 Uncomment headers from nl-NL.coffee 2016-04-29 20:50:25 +01:00
Imperadeiro98
909250fec3 Merge pull request #3586 from JurianLock/patch-10 
Update nl-NL.coffee
 2016-04-29 20:48:41 +01:00
Scott Erickson
5884a7ce8d Add changelog link to /teacher/courses 2016-04-29 09:23:57 -07:00
JurianLock
f15509cba1 Update nl-NL.coffee 2016-04-29 11:05:04 +02:00
phoenixeliot
2f63c11024 Fix padding-top for level-loading-goals 2016-04-28 16:36:30 -07:00
phoenixeliot
e65a9248f3 Fix last level text and continue button 2016-04-28 16:14:19 -07:00
Scott Erickson
a676f26303 Tweak created date on teacher classroom view 2016-04-28 14:20:33 -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
Imperadeiro98
135f7f05ad Update pt-PT.coffee 2016-04-28 20:30:19 +01:00
Scott Erickson
3fed1743fc Flatten /courses 2016-04-28 12:08:31 -07:00
phoenixeliot
64061d60e1 Don't show first course in bulk-assign dropdown 2016-04-28 11:33:29 -07:00
Rob
31495208bf Add border to birthday selector to match style. 2016-04-28 11:29:05 -07:00
Scott Erickson
82675bf05a Add created date to teacher classroom view 2016-04-28 11:28:02 -07:00
Scott Erickson
f0c0b549e2 Show language dropdown when anonymous 2016-04-28 11:15:36 -07:00
phoenixeliot
08986ffd37 Reposition continue button to always be visible (ShareProgressModal) 2016-04-28 11:09:44 -07:00
Rob
f39cac3abf Try to keep learn more above the fold. 2016-04-28 10:52:37 -07:00
Nick Winter
51003d21dd Propagate i18n 2016-04-28 10:09:52 -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
Nick Winter
d666e4e39c Don't translate 'RetroStyle Games' in most cases 2016-04-28 10:07:47 -07:00
Matt Lott
8deea61be8 Update account restricted copy 2016-04-28 09:42:17 -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
Scott Erickson
7788608d2d Navbars collapse below large screen sizes 2016-04-27 16:07:55 -07:00
Matt Lott
cdddc24693 Add user.ageRange enum values update note 2016-04-27 15:23:03 -07:00
Nick Winter
89db933c90 Change wording on enrollment purchase page for larger purchases 2016-04-27 14:17:53 -07:00
phoenixeliot
84ec2d630f Make some Course materials teacher-only on dashboard 2016-04-27 13:24:54 -07:00
phoenixeliot
1999b41ff3 Don't convert to teacher automatically in EnrollmentsView 2016-04-27 13:20:19 -07:00
Imperadeiro98
9433cefcdc Merge pull request #3579 from i32ropie/master 
Update es-ES.coffee
 2016-04-27 18:21:04 +01:00
Imperadeiro98
404171fd23 Merge pull request #3582 from KonstantinLA/patch-3 
Update ru.coffee
 2016-04-27 18:07:32 +01:00
Imperadeiro98
de23d178c2 Merge pull request #3578 from ana-esova/patch-1 
Update sr.coffee
 2016-04-27 18:04:27 +01:00
Scott Erickson
675e3290ac Lock course content to classrooms 2016-04-27 09:58:04 -07:00
KonstantinLA
17fa7226e5 Fix build error 2016-04-27 16:06:21 +03:00
KonstantinLA
6868f1f7e4 Fix placeholder for the subscribe module 2016-04-27 15:52:59 +03:00
KonstantinLA
8000cdc139 Update ru.coffee 
Added russian translation. 
Some fixes
 2016-04-27 15:34:06 +03:00
phoenixeliot
c9ed76471a Add bad translations to Portuguese for testing purposes 2016-04-26 16:37:47 -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
aa93a3ec6c Translate spell type (function/method/snippet/etc) 2016-04-26 16:37:06 -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
4e630362ce - Switch to flat modal 
- Diffuse test time bomb
 2016-04-26 14:35:07 -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
Matt Lott
283c874496 Update /privacy COPPA section 2016-04-26 11:20:47 -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
Eduardo Roldan
0c49e9d175 Update es-ES.coffee 2016-04-26 14:37:46 +02: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
Scott Erickson
e8d0ec08cb Merge pull request #3572 from UltCombo/i18n-subscription-modal 
Update subscribe modal's style to support i18n, fixes #3526
 2016-04-25 13:22:18 -07:00
Scott Erickson
92f58b29b0 Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate 2016-04-25 12:28:46 -07:00
Ana
cd9c2dfccb Update sr.coffee 2016-04-24 21:56:46 +02:00
Ana
51a3eee697 Update sr.coffee 
Translated more sections and fixed some previous lines~
 2016-04-24 21:45:09 +02:00
Imperadeiro98
814c78be8b Uncomment headers from sr.coffee 2016-04-24 14:45:08 +01:00
Imperadeiro98
582abb0d87 Merge pull request #3568 from ana-esova/patch-1 
Update sr.coffee
 2016-04-24 14:42:42 +01:00
Imperadeiro98
4fe258fe7f Merge pull request #3576 from KonstantinLA/patch-2 
Update ru.coffee
 2016-04-24 14:41:10 +01:00
Imperadeiro98
b17c0b9785 Merge pull request #3575 from UltCombo/i18n-pt-br-newhome 
i18n pt-BR: add and improve some `new_home` translations
 2016-04-24 14:40:24 +01:00
Imperadeiro98
53f1216878 Merge pull request #3573 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-04-24 14:39:18 +01:00
Imperadeiro98
a5a56f5085 Merge pull request #3569 from JurianLock/patch-9 
Update nl-NL.coffee
 2016-04-24 14:38:25 +01:00
Imperadeiro98
31d42f3132 Merge pull request #3567 from KonstantinLA/patch-1 
Update ru.coffee
 2016-04-24 14:36:58 +01:00
KonstantinLA
a7cb7a6207 Update ru.coffee 
Added russian translation
 2016-04-24 14:13:53 +03:00
UltCombo
fdb8b4ffeb i18n pt-BR: add and improve some new_home translations 2016-04-24 02:41:31 -03:00
Yuki Ueda
25bd614f9d Update ja.coffee 2016-04-24 11:38:23 +09:00
UltCombo
0ad2d086eb subscribe modal: interpolate feature values for all languages 2016-04-23 22:57:10 -03:00
Matt Lott
93194d4f1e Change top nav Courses link to Students 2016-04-23 16:54:24 -07:00
UltCombo
304cdc1113 Update subscribe modal's style to support i18n, fixes #3526 
Subscribe modal: make the "parent" and "sale" buttons take only as much space as necessary and the "subscribe" button takes all the remaining space, this fixes #3526.

Here's how the new style looks:

### Before
![](http://i.imgur.com/uwt9Jed.png)
![](http://i.imgur.com/1VKdJjZ.png)

### After
![](http://i.imgur.com/2ElCHMT.png)
![](http://i.imgur.com/G4EAi1P.png)
 2016-04-23 19:11:54 -03:00
Matt Lott
7a49eb4c77 Update /about Nolan png 2016-04-22 09:23:30 -07:00
JurianLock
156f53b0a0 Update nl-NL.coffee 2016-04-22 15:58:03 +02:00
Ana
7fcc5c9ae7 Update sr.coffee 
-Prevedene nove stvari, par grešaka u pisanju ispravljeno
-Sekcija o uplatama je pisana u 2. licu množine (formalno), mada mogu prepraviti na 2. lice jednine, kao i za ostale sekcije što je pisano ranije
 2016-04-22 15:31:03 +02:00
KonstantinLA
eab0712b75 Update ru.coffee 
Translate nav module
 2016-04-22 16:10:18 +03:00
Imperadeiro98
37e4976a0f Merge pull request #3566 from qinwenshi/master 
Add Chinese translation for teachers
 2016-04-22 13:08:11 +01:00
Matt Lott
b5f6fef862 Update /about benefits copy 2016-04-21 20:55:20 -07:00
Matt Lott
4a7518ca6f Add new team members to /about 2016-04-21 20:45:13 -07:00
Wen
d8793a315c Add Chinese translation for teachers 2016-04-22 11:34:13 +08:00
Rob
9fec6f6613 Don't break jQuery-UI autocomplete with algolia's 2016-04-21 11:21:11 -07:00
Yuki Ueda
5280470af6 Update ja.coffee 2016-04-21 16:06:30 +09: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