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
11669 commits 27 branches 0 tags 134 MiB
Commit graph

8581 commits

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