codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 08:41:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12178 commits 27 branches 0 tags 134 MiB
Commit graph

8837 commits

Author SHA1 Message Date
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