Commit graph

9091 commits

Author SHA1 Message Date
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
phoenixeliot
3ed835639e Compress jumbotron by 10% 2016-04-19 10:38:58 -07:00
Rob
988eeeeb07 Merge branch 'school-complete' 2016-04-18 23:35:50 -07:00
Rob
8d61c4387d Clear NCES data if complete data is manually edited. 2016-04-18 23:33:59 -07:00
Rob
e64d585841 Add extra information when a school is autocompleted. 2016-04-18 22:54:43 -07:00
phoenixeliot
70762f15cc Clear window.me before running tests 2016-04-18 14:32:33 -07:00
Imperadeiro98
d07a3394d1 Update pt-PT.coffee 2016-04-18 19:00:25 +01:00
edtrist
b63bf06bed Added server error subscription to AuthModal 2016-04-18 02:12:42 +01:00
Nick Winter
d739fbef9b Fix #3519; restricting importScripts has always been buggy and we probably don't need it 2016-04-17 17:32:37 -07:00
levrawonline
899422ef7f Update es-419.coffee 2016-04-17 16:17:03 -03:00
Nick Winter
15d762e93e Propagate i18n; remove newlines in en.coffee so that other locale files' line numbers will match 2016-04-16 18:11:22 -07:00
Nick Winter
43a1dcad2b Merge da.coffee 2016-04-16 18:07:39 -07:00
Nick Winter
1ceb7f2573 Merge nl-NL.coffee 2016-04-16 18:06:49 -07:00
Nick Winter
439e7bbcab Remove Errorception 2016-04-16 17:34:55 -07:00
Catsync
b90f1fb18f Hack to use hero instead of self/this in SpellPalette docs (#3552)
Hack to change SpellPalette docs to use hero instead of self/this
2016-04-16 14:59:18 -07:00
Nick Winter
e3e3807844 Use jQuery version of Algolia autocomplete 2016-04-15 17:48:31 -07:00
Scott Erickson
ecf6cd7054 Fix Travis tests 2016-04-15 15:36:35 -07:00
Rob
e7356411fb Autocomplete names of schools on quote page. 2016-04-15 14:00:36 -07:00
phoenixeliot
4b6dde9809 Unbreak non-course campaign for teachers 2016-04-15 13:39:11 -07:00
phoenixeliot
c3da6a23c9 Change isTeacher checks to isSessionless for /play 2016-04-15 10:58:52 -07:00
Scott Erickson
d5662fa2c9 Add fakeRequests array to models and collections during client tests
So you don't have to find the request through jasmine-ajax's functions.
2016-04-14 15:26:29 -07:00
cundamic
6885de36fc Update sk.coffee
subscription
2016-04-14 06:51:20 +02:00
Rob
ceb64ce9ca Improve verifier. 2016-04-13 16:41:16 -07:00
phoenixeliot
0416528de0 Fix language-getting for next level URL on teacher courses play 2016-04-13 16:32:39 -07:00
Catsync
7ff12f326f Merge pull request #3548 from Catsync/autocomplete-hero
hero autocomplete hack
2016-04-13 14:59:21 -04:00
cundamic
0dc913ba78 Update sk.coffee
translated 1-447
2016-04-13 17:59:24 +02:00
phoenixeliot
a524256b5b Add sessionless play for Teachers 2016-04-12 19:34:05 -07:00
Nick Winter
a7114a2719 Implement headless verifier; fix headless client 2016-04-12 19:34:05 -07:00
Nick Winter
5949cf51f0 Merge pull request #3513 from UltCombo/beautifier-loop
JS beautifier: fix loop construct, fixes #3510
2016-04-12 17:13:12 -07:00
Cat Sync
fddba4e0ce Hacks autocomplete to use hero instead of self/this
Uses hero instead of self/this if “hero” is already in the code, in
javascript, python, and lua.
2016-04-12 14:31:50 -04:00
Imperadeiro98
7d653bf567 Merge pull request #3532 from Minhir/patch-1
Update English to Russian translation.
2016-04-11 18:43:45 +01:00
Imperadeiro98
f3bbafda91 Small fixes to pt-BR.coffee 2016-04-11 18:43:15 +01:00
Imperadeiro98
3859c40f66 Merge pull request #3530 from jozadaquebatista/master
Update pt-BR.coffee
2016-04-11 18:39:07 +01:00
Imperadeiro98
1bb9678c05 Merge pull request #3543 from murat-yuksel/patch-1
Added some TR translations
2016-04-10 16:16:52 +01:00
Imperadeiro98
c056d97594 Small fixes to sk.coffee 2016-04-10 15:42:45 +01:00
Imperadeiro98
aa46de2b26 Merge pull request #3544 from cundamic/patch-21
Update sk.coffee
2016-04-10 15:39:20 +01:00
Imperadeiro98
0af4907f71 Merge pull request #3535 from levlas/patch-1
Suggestions till line 55
2016-04-10 15:36:16 +01:00
Imperadeiro98
14a6679ed9 Merge pull request #3531 from informaticienzero/master
Update fr.coffee
2016-04-10 15:35:13 +01:00
Imperadeiro98
312cc3ca1c Merge pull request #3527 from rafaelkan/patch-3
Update es-ES.coffee
2016-04-10 15:33:19 +01:00
Imperadeiro98
4f1e186cc2 Merge pull request #3525 from LawrenceFebs/patch-1
Update it.coffee
2016-04-10 15:32:36 +01:00
cundamic
fe8f081cc4 Update sk.coffee 2016-04-10 12:14:43 +02:00
cundamic
f2440bdbc9 Update sk.coffee
translated 1-318
2016-04-10 12:10:57 +02:00
Murat Yüksel
bd4811d7fd Added some TR translations 2016-04-09 17:48:11 +03:00
Scott Erickson
cabca6366f Show guides when users are a teacher OR own a classroom 2016-04-08 10:14:47 -07:00
Josh Callebaut
6c0823486f Merge pull request #3539 from Zerrien/solutionSchema
Changes terminology to match schema
2016-04-07 15:30:13 -07:00
Josh Callebaut
4275d41324 Changes terminology to match schema 2016-04-07 14:49:55 -07:00
Scott Erickson
5aeb559ad1 Fix ConvertToTeacherAccountView to save the email field 2016-04-07 14:40:21 -07:00
Matt Lott
5661a1fd8c Add site origin data to course trial requests 2016-04-07 12:13:48 -07:00
Levente Laszlo
cf4bdba31d Suggestions till line 55 2016-04-06 11:23:50 +02:00
Matt Lott
265f4a8c37 Update enrollments purchase blurb 2016-04-05 11:55:14 -07:00
Matt Lott
be254cf10e Route homepage students to /courses instead of /play 2016-04-05 10:43:06 -07:00
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Vladimir Ivakin
6ef5e6742c Update ru translation 2016-04-05 23:05:11 +06:00
Scott Erickson
eba4afec17 Merge remote-tracking branch 'origin/master' 2016-04-05 09:43:46 -07:00
Scott Erickson
932238bb82 Fix /teachers redirect 2016-04-05 09:34:45 -07:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
Matt Lott
133574356a Update /about page
Removing sales positions, adding marketing position
Updating benefits list
2016-04-05 06:29:03 -07:00
informaticienzero
622ff4cea1 Update fr.coffee
Corrections and typo changes to match French rules.
2016-04-05 12:13:00 +02:00
Matt Lott
a686021a8a Update courses getting started guide 2016-04-04 16:11:27 -07:00
phoenixeliot
c826543b40 Remove kinda broken enrollment stats (temporary) 2016-04-04 16:09:58 -07:00
phoenixeliot
beb53d9f2f Various fixes and changes to teacher-accounts and teacher-dashboard 2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f Restrict teacher and student accounts to their respective areas and actions 2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185 Implement all of teacher-dashboard 2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f Implement teacher accounts 2016-04-04 15:18:06 -07:00
Jozadaque Batista
a202681096 Update pt-BR.coffee 2016-04-04 16:34:02 -03:00
Jozadaque Batista
cfae28fc86 Update pt-BR.coffee 2016-04-04 15:08:00 -03:00
rafaelkan
6834a9069f Update es-ES.coffee
Traslate: loading_error, concepts and legal
2016-04-04 16:05:17 +02:00
Imperadeiro98
5e2c726a2b Merge pull request #3506 from rafaelkan/patch-2
Update es-ES.coffee
2016-04-03 18:12:56 +01:00
LawrenceFebs
d83395c4d8 Update it.coffee 2016-04-03 11:40:58 +02:00
Yuki Ueda
476b26fca2 Update ja.coffee 2016-04-02 18:14:30 +09:00
Scott Erickson
b01ab2eab1 Merge pull request #3521 from Kinzeng/master
Thang names
2016-04-01 09:29:26 -07:00
Kevin Zhang
8455bb2270 added Thang names 2016-04-01 01:07:39 -04:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09:00
Scott Erickson
43389ac9b6 Merge pull request #3471 from delftswa2016/loggedIn-achievement-error
Error when accessing achievement without being logged in
2016-03-30 09:41:01 -07:00
Rob
f10bcd632c Add esper support 2016-03-29 23:27:27 -07:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Imperadeiro98
dfdfbf620c Uncomment an header from sk.coffee 2016-03-29 20:24:55 +01:00
Imperadeiro98
322037f47d Merge pull request #3512 from cundamic/patch-20
Update sk.coffee
2016-03-29 20:24:12 +01:00
Imperadeiro98
b65e0d5031 Merge pull request #3511 from cundamic/patch-19
Update sk.coffee
2016-03-29 20:23:20 +01:00
Keld Ølykke
87b66747e8 Update da.coffee
Added some glue words to make concatenated sentences flow.
2016-03-29 01:31:12 +02:00
Keld Ølykke
2163dfa115 Update da.coffee
Fixed wrong indentation of courses.length.
2016-03-29 00:56:19 +02:00
Keld Ølykke
fbe1a817a9 Update da.coffee 2016-03-29 00:40:19 +02:00
Scott Erickson
996200220f Merge pull request #3508 from codecombat/fix-teacher-quote-scroll
Fix teacher quote page having lots of blank space at the bottom (after submitting the form)
2016-03-28 11:59:56 -07:00
Scott Erickson
6e16248cd8 Merge pull request #3509 from codecombat/header-avatar
Add small avatar to header
2016-03-28 11:17:58 -07:00
cundamic
0b22b6aa93 Update sk.coffee
Translation new_home finished.
2016-03-28 19:04:32 +02:00
cundamic
45b9395c3d Update sk.coffee
Translation new_home II
2016-03-28 11:39:54 +02:00
UltCombo
8326b5e182 JS beautifier: fix loop construct, fixes #3510
As JavaScript is the only language supported by the beautifier, and [CodeCombat is in the process of converting things to while (true)](https://github.com/codecombat/codecombat/issues/3510#issuecomment-201965310), I guess adding this quick hack to the view's code should suffice for now. Hopefully, the non-standard `loop` construct will be removed from other languages before they receive beautifier support.

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

Let me know what works best for you.
2016-03-28 00:00:40 -03:00
Imperadeiro98
539d0b01cc Update pt-PT.coffee 2016-03-26 21:38:59 +00:00
cundamic
ba2e92043a Update sk.coffee
translated new _home 1
2016-03-26 17:48:44 +01:00
cundamic
85b2d42cc6 Update sk.coffee
tips translations
2016-03-26 15:49:04 +01:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
phoenixeliot
0355ea3e1a Add small avatar to header 2016-03-25 16:25:51 -07:00
phoenixeliot
8d254c700a Fix teacher quote page having lots of blank space at the bottom.
This is due to "flying-focus" taking up space at the bottom of the page. This solution is a bandaid. Ideally we have view-swapping logic that contains this type of thing and we just swap out views using one function.
2016-03-25 13:57:26 -07:00
Nick Winter
914e7eb487 Propagate i18n 2016-03-25 10:54:28 -07:00
rafaelkan
da01d7fdba Update es-ES.coffee
Traslate
2016-03-25 01:25:09 +01:00
JurianLock
7b05223037 Update nl-NL.coffee
Reduced some translations so they fit better in the menu.
2016-03-24 15:34:15 +01:00
Maikel Langezaal
3be8220e0a read only message 2016-03-24 14:10:09 +01:00
Imperadeiro98
87a30b74af Merge pull request #3500 from Ikuyadeu/patch-1
Update ja.coffee
2016-03-24 11:21:23 +00:00
Imperadeiro98
5c8d6cc876 Merge pull request #3498 from sake12/master
update pl.coffee
2016-03-24 11:19:15 +00:00
Nick Winter
b208fddabb Fix #3484 2016-03-23 15:56:45 -07:00
Nick Winter
00bd983590 Fix #3387 2016-03-23 15:24:38 -07:00
Rob
455dd813b1 Add image refrenced by OpenGraph. 2016-03-22 12:47:13 -07:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Matt Lott
50171a5b02 🐛Fix admin trial requests page
Server refactoring exposed incorrect server parameters.
2016-03-21 11:39:15 -07:00
Nick Winter
eec50c8e44 Only collapse collision shapes for walls 2016-03-21 10:57:38 -07:00
Matt Lott
6a4132e057 Update campaign ads test groups 2016-03-21 08:07:22 -07:00
Yuki Ueda
27f5cb5e45 Update ja.coffee 2016-03-21 20:06:09 +09:00
Matt Lott
d1ae4adfbb Merge pull request #3499 from IC-Induja/master
Added 9 new loading screen comments
2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a Update /about page team section 2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8 Update level_loading.jade 2016-03-20 01:20:42 -04:00
sake12
9a52185e77 Update pl.coffee 2016-03-19 20:13:30 +01:00
Krzysztof Pomarański
1e9f950717 update pl.coffee 2016-03-19 12:25:56 +01:00
Matt Lott
5d71acba05 Replace HipChat with Slack 2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93 Use victory text and next level data on level completion. Update picoCTF logo. 2016-03-18 14:18:41 -07:00
Nick Winter
dc3ba40a45 One more change from #3483 2016-03-18 11:35:56 -07:00
Nick Winter
c42f2512e9 Merge nl-NL.coffee 2016-03-18 11:35:04 -07:00
Nick Winter
13928884b0 Merge iDEAL link for nl on home 2016-03-18 11:16:28 -07:00
Nick Winter
4a737d3045 Merge iDEAL link for nl on home 2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6 Add top margin to base-flat footer 2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37 TestView styling and responsive tweaks 2016-03-18 11:03:55 -07:00
Scott Erickson
ecfb148b3c Add spacing classes to style-flat 2016-03-18 11:03:55 -07:00
Scott Erickson
2a399e71fa Add CocoView.scrollToTop 2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d Refactor FacebookHandler and GPlusHandler
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Scott Erickson
1c629a3181 Fix options in forms.objectToForm 2016-03-18 11:03:55 -07:00
Scott Erickson
f21baa7af5 Migrate /db/trial.request for #3469 2016-03-18 11:03:55 -07:00
Scott Erickson
356523dd4b Add .btn-burgandy 2016-03-18 11:03:54 -07:00
Scott Erickson
46afe40637 Fix forms.scrollToFirstError when there is no error to scroll to 2016-03-18 11:03:54 -07:00
Scott Erickson
2e96a387e9 Add User.logout to client 2016-03-18 11:03:54 -07:00
Matt Lott
255ebbc048 Ads for free campaign players
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
2016-03-18 10:29:31 -07:00
Matt Lott
f14575ece6 Update subscribe modal level counts 2016-03-17 17:29:47 -07:00
Maikel Langezaal
49d7028e2e Cleanup 2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7 Cleanup i18n in some files 2016-03-16 21:49:19 +00:00
Zeldaretter
d565d5bc0b Update de-DE.coffee
i added and translated all lines that where missing from the original English en.coffee

I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401 Merge pull request #3492 from JurianLock/patch-7
Update nl-NL.coffee
2016-03-16 12:59:22 +00:00
Imperadeiro98
1b1ac3028f Merge pull request #3490 from Zeldaretter/patch-1
Update de-DE.coffee
2016-03-16 12:58:26 +00:00
JurianLock
3a46ada802 Update nl-NL.coffee
Another set of updates.
2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e Update de-DE.coffee
Added some new strings from the English original
2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c Update de-DE.coffee
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
2016-03-16 09:09:21 +01:00
Nick Winter
42e1ab6c99 Fix wall collision coalescing code 2016-03-15 15:52:15 -07:00
Zeldaretter
07f21d44bd Update de-DE.coffee
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
2016-03-15 22:01:03 +01:00
Nick Winter
ab29f7e10e Don't try to use Arvo for Cyrillic language headline fonts 2016-03-15 10:15:16 -07:00
Nick Winter
db813bd77e Merge zh-HANS.coffee 2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712 Merge pull request #3489 from JurianLock/patch-6
Update nl-NL.coffee
2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c Merge pull request #3485 from MatiasOlivera/master
Update es-419.coffee
2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084 Merge pull request #3481 from Zeldaretter/patch-1
Patch 1
2016-03-15 15:23:30 +00:00
Imperadeiro98
f659d22fa5 Merge pull request #3480 from delftswa2016/Chinese-translation
Chinese translation
2016-03-15 15:20:31 +00:00
Nick Winter
8a93374a87 Fix silly ancient math mistake 2016-03-15 08:05:00 -07:00
JurianLock
c1fb0c53a9 Update nl-NL.coffee
Another set of updates and tweaks.
2016-03-15 01:22:02 +01:00
Nick Winter
e5dda556c6 Add Mandate configuration for session save delays 2016-03-14 16:39:05 -07:00
Scott Erickson
07aad0ca18 Merge pull request #3463 from delftswa2016/maximize-button-fix
Fix the fullscreen-code button and beautiful-code button
2016-03-14 10:45:08 -07:00
Jacob Boon
ce8f7f2c14 include iDeal offer for Dutch (nl) users 2016-03-14 16:39:16 +01:00
Zeldaretter
d9e271da4a Update de-DE.coffee
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430 Update zh-HANS.coffee 2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726 Update teachers_quote 2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb Update about 2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da Update zh-HANS.coffee 2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca Update zh-HANS.coffee 2016-03-13 22:37:26 +01:00
Yu Liang
3dfb0c04b8 add margin-left for id 'create-account-btn' 2016-03-13 16:36:36 +01:00
Jan van den Berg
e449571139 Update nl-NL.coffee
Minor language fixes
2016-03-13 12:11:18 +01:00
yuliang123
c875c8c5ec fix misaligned login 2016-03-13 00:22:19 +01:00
Zeldaretter
37944f38d9 Update de-DE.coffee
typo
2016-03-12 22:18:31 +01:00
Zeldaretter
c968341cb4 Update de-DE.coffee
6hours of translating, only some Classroom stuff needs to be translated now.
2016-03-12 22:15:22 +01:00
yuliang123
1a11ade67b Update zh-HANS.coffee 2016-03-12 21:51:20 +01:00
yuliang123
b48e8eeecf Update zh-HANS.coffee 2016-03-12 21:39:26 +01:00
Nick Winter
96d0f4e7ee Merge nl-NL.coffee 2016-03-12 08:48:51 -08:00
Nick Winter
4f9932cd2f Merge pull request #3479 from delftswa2016/new-homepage-header-i18n
updated new homepage header (i18n)
2016-03-12 08:43:31 -08:00
Imperadeiro98
4b96cd272b Merge pull request #3477 from delftswa2016/update-Chinese-translation
Update zh-HANS.coffee
2016-03-12 14:12:03 +00:00
Imperadeiro98
7bce51c06b Small fixes to previous merge 2016-03-12 14:11:14 +00:00
Imperadeiro98
546ced6816 Merge pull request #3474 from mqrelly/master
Update hu.coffee: Translate new home page to Hungarian.
2016-03-12 14:09:33 +00:00
Imperadeiro98
820aeb0b04 Merge pull request #3467 from delftswa2016/NL-translation
NL translation
2016-03-12 14:07:56 +00:00
Imperadeiro98
e4ab59ef65 Added a diplomat 2016-03-12 14:03:59 +00:00
Imperadeiro98
551ec13743 Rearranged quotation marks in es-419.coffee 2016-03-12 14:02:45 +00:00
Imperadeiro98
d8ffcb355c Merge pull request #3464 from MatiasOlivera/master
Update es-419.coffee
2016-03-12 13:59:47 +00:00
Imperadeiro98
200d91a8a6 Merge pull request #3461 from Zeldaretter/patch-1
Update de-DEcoffee
2016-03-12 13:58:55 +00:00
Chengxin Ma
6ff7c562a8 updated new homepage header (i18n) 2016-03-12 12:19:21 +01:00
Chengxin Ma
db52cd0c83 updated new_home in zh-HANS.coffee 2016-03-12 02:26:42 +01:00
Chengxin Ma
e02083214a updated new_home in zh-HANS.coffee 2016-03-12 02:19:20 +01:00
Matt Lott
3a1627682d Update homepage logged out copy 2016-03-11 15:44:37 -08:00
Szabadkia Márk
ba266eae5c Update hu.coffee: Translate new home page to Hungarian.
Also fix minor spelling errors.
2016-03-12 00:14:51 +01:00
Scott Erickson
464430200c Fix AccountSettingsView to only try to change permissions in development 2016-03-11 15:00:55 -08:00
JurianLock
1d7d9c76b6 Update nl-NL.coffee
Another set of updates and tweaks
2016-03-12 00:00:51 +01:00
Scott Erickson
9d315a4848 Fix "students enrolled" to "students assigned" in TeacherCoursesView 2016-03-11 14:13:44 -08:00
Maikel Langezaal
5aff988ec5 Cleaned up code 2016-03-11 21:08:13 +01:00
Maikel Langezaal
e07d2561bd Made the treema visible to be build, but disabled and hidden the buttons 2016-03-11 21:01:06 +01:00
Maikel Langezaal
b4c8948f6e small typo 2016-03-11 19:33:59 +01:00
Matías Olivera
e614e5a76c Update play_level's tips 2016-03-11 14:05:23 -03:00
Martijn Cligge
550cec9cd1 NL. Coffee _ Added more translations
Added more translations and corrected old ones
2016-03-11 18:00:13 +01:00
Matías Olivera
d3323fc9c7 Update nav 2016-03-11 13:56:42 -03:00
Matías Olivera
cba4fbcad6 Update new home 2016-03-11 13:54:21 -03:00
yuliang123
457d6bbc6c Fix the fullscreen-code button and beautiful-code button 2016-03-11 16:59:45 +01:00
Maikel Langezaal
bee812149b Additions to dutch translation 2016-03-11 15:58:40 +01:00
Matt Lott
acba838db4 🐛Request demo Ux bugs
Only ask about login if not logged in
Add missing set up a class i18n string
2016-03-10 14:40:16 -08:00
Scott Erickson
84cdf1e2ce Add showRequiredError and showSignupRationale alerts and tests to CreateAccountModal 2016-03-10 11:37:31 -08:00
Scott Erickson
a59e96f277 Tweak invalid class code behavior, fix hide modal button test 2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Zeldaretter
5006fa8df3 Update de-DEcoffee
new translations.
please add me to the diplomatpages if you like my work, that would be a great honour.
Thanks^^
2016-03-10 16:47:26 +01:00
Imperadeiro98
910953d383 Fix build (part 2) 2016-03-10 14:47:45 +00:00
Imperadeiro98
a0b52aca49 Fix build 2016-03-10 14:37:38 +00:00
Imperadeiro98
60f0522192 Uncomment header in nl-NL.coffee 2016-03-10 14:36:48 +00:00
Imperadeiro98
b9e7417b07 Merge pull request #3460 from JurianLock/patch-4
Update nl-NL.coffee
2016-03-10 14:35:45 +00:00
Imperadeiro98
ed926ff799 Merge pull request #3459 from Zeldaretter/patch-3
Update De-de-coffee
2016-03-10 14:34:15 +00:00
Imperadeiro98
d3d408c5c6 Merge pull request #3455 from Agalondia/patch-1
Update id.coffee
2016-03-10 14:32:37 +00:00
Galandre Athalon
cbf8ebd98c Update id.coffee
There, i've got rid of the # in the translated bits, and change some things and translated a lot of others :D
2016-03-10 19:35:22 +08:00
JurianLock
aeec7a8e9c Update nl-NL.coffee
Another set of tweaks and updates
2016-03-10 11:37:47 +01:00
Zeldaretter
4d72fbeb63 Update De-de-coffee
New translations
2016-03-10 11:33:48 +01:00
Imperadeiro98
84ffdc8df2 Merge pull request #3446 from vellrya/patch-1
Update ru.coffee
2016-03-09 20:23:58 +00:00
Agalondia
6fec94ffbd Update id.coffee
Here's my translation for Indonesian, please consider it guys!
2016-03-09 22:17:29 +08:00
Chengxin Ma
a8e72aac70 fix Chinese grammar 2016-03-09 11:04:46 +01:00
Matt Lott
eb7bebe293 Add DAU 30-day avg and daily total to dashboard 2016-03-08 15:27:57 -08:00
JurianLock
25f598934d Update nl-NL.coffee
Few tweaks and some general updates.
2016-03-08 23:44:08 +01:00
Matt Lott
bce9862be2 Update request demo Ux
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
2016-03-08 09:30:50 -08:00
Robin Yang
ee331cc9c5 Change request quote headings H1/H2 to H3/H4 2016-03-07 13:56:34 -08:00
Imperadeiro98
86e10d0c34 Fix previous merge 2016-03-07 19:22:52 +00:00
Imperadeiro98
1577dc5708 Merge pull request #3444 from JurianLock/patch-2
Update nl-NL.coffee
2016-03-07 19:22:17 +00:00
Nick Winter
6a9a36b1eb Don't show misc achievements in picoCTF mode 2016-03-07 09:54:29 -08:00
Nick Winter
78379f2e6a Merge pull request #3440 from Imperadeiro98/master
Remove i18n from admin pages
2016-03-07 09:16:07 -08:00
Nick Winter
6d246129de Make languages fall sideways if needed (ex: nl-BE using nl-NL instead of en) 2016-03-07 08:13:49 -08:00
Nick Winter
9dc6a04f5e Fix #3447 2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f Update ru.coffee 2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d Update nl-NL.coffee 2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4 Fix previous merge 2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3 Update nl-NL.coffee 2016-03-06 22:30:09 +01:00
sake12
44cf0931c4 Update pl.coffee 2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced Fix build 2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00
Imperadeiro98
88091cf166 Update pt-PT.coffee 2016-03-05 14:15:52 +00:00
Nick Winter
fb9b169c62 Propagate a big i18n 2016-03-04 15:51:16 -08:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a Tweak text on admin page 2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb Client-side support for beating picoCTF levels 2016-03-03 17:18:24 -08:00
Scott Erickson
47f3223be1 Fix and improve new errors system
* Fix error property name -> errorName
* showNotyError can handle Backbone error callbacks where jqxhr is second param
* showNotyError correctly shows JSON error message or name
* Add timeout to showNotyError
2016-03-03 13:59:17 -08:00
Nick Winter
bada484445 Fix fetchPatchesWithStatus for non-versioned models 2016-03-02 16:19:33 -08:00
Imperadeiro98
defade9824 Merge pull request #3435 from Zeldaretter/patch-1
Update de-DEcoffee
2016-03-01 21:26:21 +00:00
phoenixeliot
939265a119 Fix supermodel.trackModel 2016-03-01 10:33:45 -08:00
Matt Lott
9e8e865049 Remove old homepage
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
2016-03-01 09:48:53 -08:00
Yuki Ueda
bfe45cbb88 Update ja.coffee 2016-03-01 20:47:09 +09:00
Matt Lott
19b7fe7295 Remove iOS position from /about careers section 2016-02-29 15:16:09 -08:00
Matt Lott
2e2bf95ff7 Remove classroom MAUs from KPI graphs
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
2016-02-29 13:58:00 -08:00
Zeldaretter
84f28b15c2 Update de-DEcoffee
New lines and some typos fixed
2016-02-29 19:49:05 +01:00
Mario Catuogno
b9379c9984 Update it.coffee 2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef Merge pull request #3432 from MarioCatuogno/patch-1
Update it.coffee
2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303 Merge pull request #3431 from mqrelly/master
Update hu.coffee
2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e Update it.coffee
Tried to translate some new lines to help.
2016-02-29 02:18:10 +01:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2 Update hu.coffee 2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e Fix build 2016-02-28 18:11:59 +00:00
Zeldaretter
1fabe3224e Update de-DEcoffee
New strings translated into german. Please add this strings soon. Thanks a lot
2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master
Added some lines for #710
2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739 Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too 2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93 Import approved trial requests into Close.io 2016-02-26 06:21:31 -08:00
Maikel Langezaal
40ed5618b8 Added i18n tags for new HomePage Issue #3413 2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f 2/26 ko update. 2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774 Fix lesson time estimate dropdown in NewHomeView 2016-02-25 16:49:26 -08:00
Scott Erickson
3f8652d9a9 Add showNotyNetworkError to app/core/errors 2016-02-25 15:50:53 -08:00
Scott Erickson
bd20536046 Add validateEmail to forms 2016-02-25 15:28:04 -08:00
Scott Erickson
1c4a84dee6 Handle when a SomethingResource fails, show Unknown Error 2016-02-25 15:15:39 -08:00
Scott Erickson
43a659ea80 Add styling for modal-base-flat 2016-02-25 15:15:15 -08:00
Scott Erickson
946436083c Add updateSelects to forms
So that in forms you don't have to find the equality for each option. Instead,
just set the select value and, afterRender, call updateSelects, the options that
matches the value will become selected.
2016-02-25 15:14:48 -08:00
blorente
ef8ed4b6ed Added some lines for #710 2016-02-25 23:41:27 +01:00
phoenixeliot
10e03c87c1 Fix style-flat color, .text-h1/2/etc style 2016-02-25 13:22:41 -08:00
Scott Erickson
78d221fe4c Refactor AdministerUserModal to use new flat style instead of legacy plain style 2016-02-25 11:49:34 -08:00
Scott Erickson
8b22b78f74 Add style-flat base
To create a modal with the flat style, just use modal-base-flat instead of modal-base
2016-02-25 11:40:27 -08:00
Imperadeiro98
b5bbe85836 Revert jobs i18n 2016-02-25 18:28:45 +00:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Matt Lott
8d1c39e714 Merge pull request #3421 from codecombat/AboutPageFixes
Improve responsiveness on fixed nav
2016-02-25 09:36:03 -08:00
phoenixeliot
401c185108 Improve responsiveness on fixed nav 2016-02-25 09:25:13 -08:00
Nick Winter
e2f40994e4 Merge lt.coffee 2016-02-25 09:03:00 -08:00
Imperadeiro98
62c5b34a96 Update About page i18n
Also fixed some images
2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957 Revert changes to LevelLoader and SuperModel 2016-02-24 19:32:28 +00:00
Matt Lott
e74a77342c Update admin trial requests page
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
2016-02-24 10:22:55 -08:00
Nick Winter
9a344d1a61 Sort a few name categories; remove a log. 2016-02-24 08:49:39 -08:00
Nick Winter
cac20fd39c Merge pull request #3416 from delftswa2016/additional-thang-names
Some additions to Ogre and Horse names
2016-02-24 08:46:49 -08:00
Matt Lott
609884eb51 Update furthest course dashboard tables
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Maikel Langezaal
8882ff8d46 Some additions to Ogre and Horse names 2016-02-24 12:56:02 +01:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Robin Yang
1d57199707 Add new buttons for email templates
Used in Request Quote Confirmation email.
2016-02-22 14:29:05 -08:00
Nick Winter
f16dbcd63c Merge pull request #3379 from jamesvdh/patch-1
Update nl-BE.coffee
2016-02-22 13:22:51 -08:00
Nick Winter
99acf2d40e Properly skip tweens for shadows we removed during sprite parsing 2016-02-22 13:11:46 -08:00
Nick Winter
956f9dc43d Handle updated CreateJS exports in SpriteParser 2016-02-22 12:57:35 -08:00
Scott Erickson
3c3db79ac1 Fix #3388
Overflow: hidden was cutting of info in the play view. Without it in the new home page, though,
infinite banners would expand the size of the page. Tried figuring out a way to not make the new
page require hiding overflow but found no obvious solution. Pages with infinite banners will
just need to be set to overflow: hidden individually.
2016-02-22 11:12:19 -08:00
Matt Lott
cac9a7463f Dashboard monthly revenue counts, and tabs 2016-02-20 17:27:45 -08:00
Scott Erickson
16969e1d5a Fix Travis tests 2016-02-19 13:58:21 -08:00
Scott Erickson
3390663486 Fix GuideView to use session.codeLanguage by default 2016-02-19 10:55:42 -08:00
adeeb1
e71a4b71dc Fixed GitHub authentication - #1764 2016-02-19 10:07:05 -08:00
Matt Lott
19d0e67002 Dashboard classroom vs campaign year chart 2016-02-19 09:32:17 -08:00
Matt Lott
ce525e7d99 Add played definition to analytics dashboard 2016-02-18 09:14:36 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Yuki Ueda
f942816188 Update ja.coffee 2016-02-18 21:57:01 +09:00
Matt Lott
1f01b3ffbd Update revenue analytics with payment.prepaidID 2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8 Restrict request quote emails
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2 Add picoCTF problem descriptions to levels; streamline picoCTF flows more 2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0 Fix recent scrolling changes for Firefox 2016-02-17 11:21:43 -08:00
Scott Erickson
53eea0c236 Fix navigation from one page to the next
* Reset flying focus so it doesn't lengthen the page
* Scroll to the top of the page when switching views
2016-02-17 11:05:52 -08:00
Scott Erickson
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b Add prepaids to payments
Closes #3402
2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21 Start to play picoCTF levels as course levels without hero selection 2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -08:00
Scott Erickson
c2f02ebbfb Fix scrollToLink, including removing unneeded offset 2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428 Update analytics dashboard
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
2016-02-16 09:23:42 -08:00
Nick Winter
1f52329c7a Merge pull request #3391 from khoa102/master
new update
2016-02-14 12:03:47 -06:00
minwook shin
a682bfffa2 korean translate continue...
parent = 부모
but korean manner is [Top people]+님(:nim)
so, 부모님=부모(parent)+님(:nim)xk
2016-02-13 11:15:40 +09:00
Tran Anh Khoa
ea6d68ce5b Update vi.coffee 2016-02-12 14:32:02 -06:00
Ihsara
a008597e35 Update vi.coffee
minor changes
2016-02-12 22:24:45 +02:00
Tran Anh Khoa
16a977103a Update vi.coffee 2016-02-12 10:43:53 -06:00
Ihsara
6105ef7b16 Merge pull request #7 from khoa102/khoa102-patch-1
Update vi.coffee
2016-02-12 18:03:18 +02:00
Tran Anh Khoa
2fbbf33455 Merge pull request #8 from codecombat/master
Update from Original Fork
2016-02-12 09:30:41 -06:00
minwook shin
5b58e58b86 Always korean translate
313 : Are the words taken from the Wizard of Oz ? i dont know munckin. so, i translate munchkin -> 난쟁이(dwarf : short man)
317 : Padawan is (star wars)yoda's Padawan?? i translate padawan -> 파[pa]다[da]완[wan] (I wrote as sound .)
355 : car and carpet... korean naming, car = 차[:cha]. add (카)[car] (I wrote as sound .)
2016-02-12 21:55:32 +09:00
Tran Anh Khoa
e576202132 Update vi.coffee 2016-02-11 21:41:18 -06:00
Tran Anh Khoa
67abb47abe Update vi.coffee
Fix bug on line 1150: 
Line 1234: edit a few word 
Line 665: thuê bao -> gói đăng ký
2016-02-11 09:08:24 -06:00
Imperadeiro98
6b7337ab3f Merge pull request #3386 from sungame/patch-1
Update sv.coffee
2016-02-11 14:20:27 +00:00
Ihsara
99d7821f61 Update vi.coffee
contributors job description update
2016-02-11 15:18:46 +02:00
Ihsara
895d8f378d Update vi.coffee
contributors update
2016-02-11 13:36:56 +02:00
Ihsara
489a3ccb64 Update vi.coffee
monor changes
2016-02-11 12:21:00 +02:00
Tran Anh Khoa
be7760c45e Merge pull request #6 from codecombat/master
Update from Original
2016-02-10 19:57:41 -06:00
Tran Anh Khoa
27a48616f7 Update vi.coffee 2016-02-10 17:58:12 -06:00
Tran Anh Khoa
8c86e8be24 Merge pull request #5 from khoa102/Ihsara-patch-1.0viTrans
Update vi.coffee
2016-02-10 16:53:10 -06:00
Nick Winter
6800ea2ff7 Add picoCTFProblem field to levels 2016-02-10 14:16:54 -08:00
Ihsara
5079413059 Merge pull request #4 from khoa102/khoa102-patch-1-viTranslation
Update vi.coffee
2016-02-11 00:02:05 +02:00
Ihsara
506b6996c0 Update vi.coffee
minor
2016-02-10 23:58:38 +02:00
Tran Anh Khoa
f50371e14d Update vi.coffee
Change a few tip into Vietnamese
2016-02-10 15:41:32 -06:00
Tran Anh Khoa
7ed371520f Merge pull request #3 from khoa102/Ihsara-patch-1.0viTrans
Ihsara patch 1.0vi trans
2016-02-10 15:21:47 -06:00
Ihsara
35a9bb96a7 Update vi.coffee 2016-02-10 23:11:42 +02:00
Tran Anh Khoa
60796ca83f Update vi.coffee 2016-02-10 13:30:27 -06:00
Ihsara
f54619607a Update vi.coffee 2016-02-10 21:25:35 +02:00
Tran Anh Khoa
5d0235828b Update vi.coffee 2016-02-10 11:04:05 -06:00
Tran Anh Khoa
e2abbc317a Update vi.coffee 2016-02-10 10:53:44 -06:00
Matt Lott
06436a4bb7 Add levelID property to show subscription modal events
Allows us to consolidate analytics collection indexes and code someday.
2016-02-09 16:50:55 -08:00
Josh Callebaut
7db678e63f Merge pull request #3380 from Zerrien/editorChanges
Style fixes and fixes level submission emails
2016-02-09 09:42:05 -08:00
Josh Callebaut
99955aa034 Corrects artisan guide modal subdomain 2016-02-09 09:37:09 -08:00
Nick Winter
0ef29ddb95 Restrict who counts as a teacher in analytics 2016-02-08 14:44:38 -08:00
Nick Winter
40d7c53cd0 Fix 435d5bb6 2016-02-08 14:34:29 -08:00
Nick Winter
435d5bb6d2 Improve getHomePageGroup and narrow to two variants 2016-02-08 14:20:30 -08:00
Scott Erickson
bb38c58903 Properly fix duplicate course instances
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
2016-02-08 12:48:29 -08:00
Robin Yang
3acb2a4c7a Add View Classes link to Request Demo area 2016-02-08 10:30:59 -08:00
Matt Lott
bd9ca8ee5f Add enrollments graph to analytics dashboard 2016-02-06 14:02:44 -08:00
sungame
9cbb5ad924 Update sv.coffee
Translated some english to swedish
2016-02-06 17:06:27 +01:00
Nick Winter
378ddccce7 Change loop concept to be specifically while loops 2016-02-05 18:11:27 -08:00
Scott Erickson
abb4e2fa47 Filter out duplicate course instances client-side 2016-02-05 14:03:43 -08:00
Scott Erickson
4034d21cd5 Have /schools and /teachers show new home page 2016-02-05 13:47:32 -08:00
Scott Erickson
902c39ffb1 Use default scrollbar for pages 2016-02-05 13:28:10 -08:00
Scott Erickson
944b6b743f Add homepage unsupported browser messages to new home page 2016-02-05 11:39:06 -08:00
Matt Lott
b495c581a7 Enable analytics tracking on request quote view 2016-02-05 10:49:46 -08:00
Matt Lott
e75bca2b43 Add active class definitions to analytics dashboard 2016-02-05 09:40:08 -08:00
Imperadeiro98
bc8476bff7 Merge pull request #3384 from chinesedfan/trans_zhs
Update zh-HANS.coffee
2016-02-05 16:22:36 +00:00
chinesedfan
eff2f68f43 Update zh-HANS.coffee 2016-02-05 15:52:50 +08:00
Matt Lott
5d2ad62fb9 Add top school counts to analytics dashboard 2016-02-04 17:31:25 -08:00
Matt Lott
e8c22679d9 Add trials to active classes analytics dashboard
Only looking at active classrooms, split into paid, trial, and free.
Active class: 12+ students total, 6+ active in last 30 days.
2016-02-04 16:31:52 -08:00
Scott Erickson
95e627f346 Merge pull request #3374 from taptapdan/issue-3138-CastButtonView
Refactor CastButtonView to use view in template
2016-02-04 14:53:13 -08:00
Daniel Fiore
d0d19f94e9 Refactor ProblemAlertView to use view in template 2016-02-04 14:44:29 -08:00
Robin Yang
67244005b2 Update Course 1 Guide
Added inline solutions instead of screenshots.
2016-02-03 16:33:14 -08:00
Robin Yang
1daa2e1db0 Update Getting Started Pdf link on /schools
Previous link was pointing to Hour of Code version, still had
free/unlimited trial language.
2016-02-03 16:18:14 -08:00
Scott Erickson
b98da5a32f Add login button and logout link to new home view in request demo area 2016-02-03 16:16:43 -08:00
Scott Erickson
89eb3d0dfb Add /courses link to new home page navbar, tweak wording 2016-02-03 11:16:15 -08:00
Scott Erickson
b91299a59f New home page tweaks 2016-02-03 10:59:54 -08:00
Josh Callebaut
0eb32aac24 Creates clickable links for default tasks 2016-02-03 10:26:36 -08:00
Scott Erickson
9e38587719 Do not hide teacher note for small screens, add close link 2016-02-03 10:10:43 -08:00
jamesvdh
3eca097675 Update nl-BE.coffee
Finished the translation. Some words or phrases might be slightly off due to the lack of context info. But in general it should be ok.
2016-02-03 17:53:40 +01:00
Yuki Ueda
2006feb9b3 Update ja.coffee 2016-02-03 17:12:41 +09:00
Nick Winter
c8601e81d6 Fix request-a-quote link in the footer 2016-02-02 17:14:26 -08:00
Nick Winter
14c734cfe8 Remove some logs to complete my testing 2016-02-02 16:56:08 -08:00
Daniel Fiore
6ad5d6bc73 Refactor CastButtonView to use view in template 2016-02-02 15:57:55 -08:00
Nick Winter
260fd21f4e Add Segment for teachers, misc analytics cleanup tweaks 2016-02-02 15:13:55 -08:00
Nick Winter
24fc14260e Add /privacy policy page 2016-02-02 15:13:54 -08:00
Scott Erickson
fa54b639c7 Hide modal wrapper when no modal 2016-02-02 15:13:54 -08:00
Scott Erickson
0e7e9aad39 Add new home page with test 2016-02-02 15:12:37 -08:00
Nick Winter
da04f9f8a6 Add VR wall to walls list 2016-02-02 08:16:23 -08:00
Scott Erickson
45fab8587a Merge remote-tracking branch 'origin/master' 2016-02-01 15:51:40 -08:00
Scott Erickson
ab62982bac Tweak RequestQuoteView form to better fit best practices
* Scroll to errors
* Set email input type to 'email'
2016-02-01 15:51:29 -08:00
Thijs de Haan
3a05c9ed6f Update nl-NL.coffee 2016-02-01 22:07:48 +01:00
Scott Erickson
5fffb2eefb Remove TeachersFreeTrialView 2016-02-01 10:40:22 -08:00
Cat Sync
ba63dcde2c Rearrange level editor task order 2016-02-01 10:53:50 -05:00
Matt Lott
c03875763e Add Get Started button
For teacher trial approved mail
2016-01-31 09:07:36 -08:00
Imperadeiro98
5a1d1e93dd Fix build 2016-01-30 10:21:36 +00:00
Ivan
b441161edb Update sr.coffee
Little more translation for today.
Best regards
2016-01-29 21:29:13 +01:00
Josh Callebaut
14ef28b658 Merge pull request #3369 from Zerrien/master
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
2016-01-29 09:42:04 -08:00
Imperadeiro98
546fdfa2b6 Fix build 2016-01-29 14:58:08 +00:00
Imperadeiro98
734797cc17 Merge pull request #3368 from Ivanmateja/patch-2
Update sr.coffee
2016-01-29 14:51:37 +00:00
Ivanmateja
4962c17107 Update sr.coffee
I have removed hashtags and signed CLA.  Hope that everything will work fine now. Sory for mistakes this Github is a little confusing at beginning.
Greetings
2016-01-29 15:21:22 +01:00
Imperadeiro98
6923491e45 Merge pull request #3367 from a1ip/patch-4
Update ru.coffee
2016-01-29 12:23:29 +00:00
Ivanmateja
ab681252e4 Update sr.coffee 2016-01-29 12:46:19 +01:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Scott Erickson
f657669dbc Extend forms
* formToObject handles checkboxes and radio buttons
* applyErrorsToForms handles required fields
* setErrorToField sets helpblock according to new forms best practices: before input and any help blocks
2016-01-28 17:18:24 -08:00
Philippe Rigovanov
ce05659ab5 Update ru.coffee 2016-01-29 01:26:24 +03:00
Josh Callebaut
7b5b4ca898 Uses @$ instead of @.find, method to convert dom into jQuery objects, and superior CoCoModel's getOwner() instead of trawling through the permissions list 2016-01-28 14:05:04 -08:00
Josh Callebaut
4a2d5c2e59 Fixes level ownership check 2016-01-28 14:05:04 -08:00
Josh Callebaut
bd825d3108 Includes the level name in the email and makes it clickable 2016-01-28 14:05:04 -08:00
Josh Callebaut
42efe6264b Sticks the level submission data into the contact form's message attribute 2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Philippe Rigovanov
94c0c27a03 Update ru.coffee 2016-01-29 00:45:16 +03:00
Matt Lott
0d9b7a634b Add homepage to Mixpanel page view tracking 2016-01-28 09:25:30 -08:00
Philippe Rigovanov
dd6f9711a4 Update ru.coffee 2016-01-27 23:15:52 +03:00
Scott Erickson
4ef5f40fa1 Network error handling fixes
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
3dda5710de Move demo border to TestView to be used generally 2016-01-27 10:42:02 -08:00
Scott Erickson
d00f8344be Add demo controls to TestView 2016-01-27 10:42:02 -08:00