Nick Winter
0364463f99
Propagate i18n
2016-08-18 13:50:34 -07:00
Nick Winter
8fbf9983d5
Fix zh-HANS.coffee merge
2016-08-18 13:47:51 -07:00
Nick Winter
a5be5feb85
Merge branch 'master' of github.com:codecombat/codecombat
2016-08-18 13:41:15 -07:00
Nick Winter
f749938800
Fix vi.coffee merge
2016-08-18 13:40:49 -07:00
Imperadeiro98
5dd746af4a
Small change to select hero wording
2016-08-18 21:39:54 +01:00
Nick Winter
54d45cbfbf
Fix fi.coffee merge
2016-08-18 13:39:03 -07:00
Scott Erickson
300c81e72b
Course translations fixes
...
* Restrict patch handling properly
* Fix #3860 , CS 2 description
* i18nCoverage is updated when new translations are auto-accepted
* Course patches are listed on PendingPatchesView properly
* 'Artisan' permission allows editing course translations
2016-08-18 13:29:52 -07:00
Scott Erickson
d4af931e05
Add course (name, description) translations
2016-08-18 10:10:18 -07:00
Yuki Ueda
bd5a453b7f
Update ja.coffee ( #3859 )
2016-08-18 17:32:46 +01:00
Matt Lott
720e7ea897
Update beta campaign world selector images
2016-08-17 21:14:11 -07:00
Matt Lott
f44821bfe1
🐛 Fix admin student licenses range coloring
2016-08-17 21:08:23 -07:00
Phoenix Eliot
6b1adb9b31
Turn off emails to Josh about timeouts
2016-08-17 16:54:37 -07:00
Imperadeiro98
15b795b855
Update pt-PT.coffee
2016-08-17 22:32:41 +01:00
Matt Lott
46e05e893b
Redirect students and teachers on sign in
...
Closes #3857
2016-08-17 14:17:16 -07:00
Matt Lott
b647252956
Update /courses UI
2016-08-17 14:15:52 -07:00
Nick Winter
01affc2054
Fix bug in premium level selection code
2016-08-17 12:05:31 -07:00
Matt Lott
b057168e61
Update add students dialog
...
Updating copy, removing everything except email inviting
2016-08-17 11:10:48 -07:00
Nick Winter
6e4cd57d44
Propagate i18n
2016-08-17 10:02:36 -07:00
Nick Winter
8ec17265dc
Give China server all free levels but hide paid levels ( #3855 )
...
* Give China server all free levels but hide paid levels
* Don't prompt to buy gmes on free-only server on insufficient gems for item/hero purchases
2016-08-17 10:00:56 -07:00
Matt Lott
2c2c052d5a
🐛 Fix course slug check for /teachers/courses tests
2016-08-16 17:08:47 -07:00
Matt Lott
84e3ee270a
Add primer level support to classroom Ux
...
Exclude levels if classroom.aceConfig.language == level.primerLanguage
Closes #3856
2016-08-16 16:52:17 -07:00
Matt Lott
efa4b2b158
🐛 Fix teacher dashboard course # progress
2016-08-16 16:30:12 -07:00
Phoenix Eliot
a1b012c7f5
Add support for optional arguments, and web components
...
Refactor
Don't use globals in template
2016-08-16 13:43:08 -07:00
Phoenix Eliot
fd45c9d473
Implement HeroSelectModal for demo flow
...
Add Campaign factory
First basic tests for HeroSelectModal in demo flow
Implement HeroSelectModal for demo flow
Improve tests
Disable empty test
Fix text inconsistency around 'me'
Just listen once
Add HeroSelectModal events test
Don't reuse destroyed modal
Fix inconsistent modal close behavior
Fix tests
2016-08-16 11:19:40 -07:00
lazydogP
2e0a7769ac
Update zh-HANS.coffee
2016-08-16 07:33:15 +08:00
Scott Erickson
b471b909c5
Disable projects tab
2016-08-15 15:04:05 -07:00
Matt Lott
f84897eaa7
Update home course tiles
2016-08-15 14:41:09 -07:00
Matt Lott
e62dbed362
Shift user code yellow arrow tips inward based on indentation
...
Closes #3850
2016-08-15 13:36:43 -07:00
Rob
b308da0473
Add analytics even for LevelLoad errors.
2016-08-15 13:34:06 -07:00
Scott Erickson
e9c7edb6be
Fix populate i18n to also populate thang component configs
2016-08-15 11:54:04 -07:00
iammehmetguler
803fc39998
Update tr.coffee ( #3842 )
...
* Update tr.coffee
calendar
* Update tr.coffee
login, signup
2016-08-13 11:26:39 +01:00
Phoenix Eliot
c2ce804839
Fix worker-based syntax annotations
2016-08-12 16:28:29 -07:00
Scott Erickson
2dadc8458c
Remove hardcoded student ui game dev play instructions
2016-08-12 14:38:32 -07:00
Phoenix Eliot
76e461398e
Clean up i18n TODOs
2016-08-12 13:27:30 -07:00
Phoenix Eliot
73bbe598da
Improve WebDev level image gallery
...
Improve image gallery
Add How to Copy/Paste section
Fix modal close button
Add specs for image gallery
Fix up i18n
Fix render resetting scroll
Address code review feedback
Ensure afterRender is called
2016-08-12 13:19:26 -07:00
Phoenix Eliot
e91a15338e
Add View Project buttons to /courses
2016-08-11 16:38:14 -07:00
Matt Lott
2905563729
🐛 Remove semi-colons from course solutions view
2016-08-11 15:34:39 -07:00
Matt Lott
a7e290fffe
Replace course guide PDFs with solutions pages
2016-08-11 15:29:56 -07:00
Zeldaretter
5fc184da67
Update de-De.coffee ( #3838 )
...
some translations
2016-08-11 22:13:03 +01:00
iammehmetguler
e21217dad3
Update tr.coffee ( #3837 )
...
calendar
2016-08-11 21:29:23 +01:00
Scott Erickson
d679700966
Disable SuperModel retrying
...
Seems to be causing issues when requests retry with different parameters,
for example:
https://github.com/codecombat/codecombat/blob/master/app/views/NewHomeView.coffee#L42-L45
This retries without the original GET parameters and returns a 403 as a result.
2016-08-11 09:44:36 -07:00
Scott Erickson
37d0b23103
Merge pull request #3835 from Imperadeiro98/master
...
Remove obsolete ErrorView from templates
2016-08-11 08:30:42 -07:00
Matt Lott
eaddf2fa8d
Add level schema primerLanguage
...
For web-dev 2 course in the short term
2016-08-11 06:08:58 -07:00
Abimael Alcebíades
1436b6e2a3
Update pt-Br.coffee ( #3836 )
...
added new translations
2016-08-11 11:12:09 +01:00
Phoenix Eliot
a4f48bbc17
Add tests for SuperModel load retrying
...
Clear timeouts after each test
2016-08-10 15:28:33 -07:00
Phoenix Eliot
d3db19dee3
Report timeout problems, and fix retries
...
Fix getting model URLs
2016-08-10 15:28:25 -07:00
Matt Lott
c87f505759
Add gd1 and wd1 to campaign world Ux
...
Add 1st game-dev and web-dev campaigns to world selector
Take player back out to world selector after completing campaigns up through forest
Closes #3828
2016-08-10 15:06:14 -07:00
Matt Lott
2e5f9abd97
🐛 Fix autocomplete suggestion limit comment
2016-08-10 14:45:59 -07:00
Imperadeiro98
4b4c19928f
Remove obsolete ErrorView from templates
2016-08-10 21:15:38 +01:00
Matt Lott
e65dc8e2a5
Update homepage anonymous CTA buttons
...
I’m a Teacher -> /teachers/signup
I’m a Student -> /home#create-account-student
2016-08-10 13:14:41 -07:00
Scott Erickson
2e5c15cc6d
Internationalize student UI for game dev levels
2016-08-10 12:47:34 -07:00
Scott Erickson
ff2d505720
Internationalize PlayGameDevLevelView
2016-08-10 12:47:34 -07:00
Scott Erickson
ffa840910d
Do not automatically show victory modal for shareable game dev levels
...
Students are likely to want to keep working on their level, even if
they beat it.
2016-08-10 12:47:34 -07:00
Matt Lott
d14bea3110
Add hero. autocomplete entries
...
Adding up to 10 highest importance hero. duplicate autocomplete entries
that include ‘hero.’
Increasing max suggestions allowed from 10 to 20
2016-08-10 11:17:56 -07:00
Scott Erickson
9b992a8679
Merge pull request #3823 from Imperadeiro98/master
...
Fix #2844
2016-08-10 09:46:20 -07:00
Abimael Alcebíades
54ec028962
added new translations ( #3834 )
2016-08-10 09:17:52 +01:00
Nguyễn Việt Dũng
65e7aa358b
Update vi.coffee
2016-08-10 10:16:27 +07:00
Abimael Alcebíades
40aa30d161
Update pt-BR.coffee ( #3830 )
2016-08-09 21:17:11 +01:00
Bram Dekker
c620d29755
Update nl-NL.coffee ( #3829 )
...
translated some lines in the signup section.
2016-08-09 21:16:25 +01:00
Glubu
d3b56b3e97
typo and punctuation fixed ( #3817 )
2016-08-09 21:15:43 +01:00
Matt Lott
6a8776c31b
🐛 Add parent blurb to signup birthdate check
2016-08-09 06:33:15 -07:00
Matt Lott
a00f2600f6
🐛 Show API docs popovers higher over surface
2016-08-09 06:03:58 -07:00
Matt Lott
5fc88ebeeb
🐛 Fix extra space in he.coffee
2016-08-09 05:38:35 -07:00
VilkkuV
7188822552
Update fi.coffee
2016-08-09 10:26:01 +03:00
themaka
f111c16482
Add Sean to /about ( #3826 )
...
* Add Sean to /about
* Remove empty line
2016-08-08 17:46:22 -07:00
phoenixeliot
5b8d66cd1c
Add hero selector to create account modal
...
Don't show grey border around Anya in signup modal
Refactor reload handling
Fix courses page updating to chosen hero
2016-08-08 15:19:44 -07:00
Nick Winter
6b49d4ccf6
Propagate he.coffee
2016-08-08 15:18:57 -07:00
Nick Winter
3ff34b376f
Manually merge #3825 : add Hawaiian
2016-08-08 13:10:28 -07:00
wyyi
f3ffaf5e34
Update uk.coffee ( #3824 )
2016-08-08 20:48:24 +01:00
borispinatel
5a077e628d
Update fr.coffee ( #3801 )
2016-08-08 20:47:34 +01:00
Scott Erickson
51b292cc3d
Add static messages to game dev levels for playtesting
2016-08-08 11:49:38 -07:00
VilkkuV
2e8a395349
Update fi.coffee
2016-08-08 21:44:39 +03:00
VilkkuV
a32d32674a
Update fi.coffee
2016-08-08 20:48:30 +03:00
Imperadeiro98
d76a81438d
Remove dead line from ArticleEditView template
2016-08-07 19:13:31 +01:00
Imperadeiro98
9df2c97923
Fix #2844
2016-08-07 19:02:51 +01:00
Nora Kenez
57b7791286
Update hu.coffee ( #3813 )
...
* Update hu.coffee
* Update hu.coffee
2016-08-07 15:40:25 +01:00
Imperadeiro98
cc24d962c5
Fix systems documentation tab background
...
Same as #3794
2016-08-07 15:35:42 +01:00
Phoenix Eliot
6697d33681
Fix level editor child window size
...
Makes it slightly larger at 1280x640, which is our target screen size
for slightly smaller than chromebook screens.
2016-08-05 16:16:09 -07:00
Matt Lott
6f08d5e422
Add required district field to teacher trial request forms
...
School now optional
N/A placeholder on district field and don't save it if it's n/a
Updating required field error UI a bit, and there is some larger
refactoring needed here later.
NCES phone number for district only entries will currently be a child
school, will fix later.
Closes #3818
2016-08-05 13:25:19 -07:00
Scott Erickson
f4c0e4144e
Add some comments and a TODO for the supermodel retrying system
2016-08-05 13:23:44 -07:00
Scott Erickson
2287c4f1e5
Merge pull request #3811 from themaka/master
...
Adding Croatian and Māori to languages
2016-08-05 13:04:47 -07:00
themaka
175d8a9983
Comment out the "common"
...
Which I've learned is not used until someone's actually translated
something in that section ...
2016-08-05 15:11:15 -04:00
Matt Lott
8b8086a95d
🐛 Fix admin classrooms levels page campaign lookup
2016-08-05 12:09:36 -07:00
Scott Erickson
960d296dd1
Merge pull request #3816 from matt-sanders/background_fixes
...
fixes #3796 #3794 #3793
2016-08-05 10:33:33 -07:00
Catsync
adda9747e9
Add a value 'hidden' for campaign's type property ( #3819 )
...
Nick would have to manually remove the defaulted ‘hero’ type from new
campaigns to make sure it wasn’t included in various campaign related
queries until we were ready. Now we can set this to hidden in the
campaign editor.
2016-08-05 10:31:46 -07:00
Matt Sanders
ef7b9aa3aa
fixes #3794 by not making everything 100% height
2016-08-05 17:12:18 +12:00
Matt Sanders
95146e7820
fixed the background issue on the tasks tab
2016-08-05 17:02:22 +12:00
Matt Sanders
d5e3be62a4
fixed the background issue on the achievements view
2016-08-05 16:52:02 +12:00
Nick Winter
246469bdde
A couple fixes for demo flow
2016-08-04 18:37:13 -07:00
Josh Callebaut
33134eb6c9
Merge pull request #3815 from Zerrien/campaign-arrow-fix
...
Tweak campaign connecton arrows
2016-08-04 10:38:45 -07:00
Josh Callebaut
41cf864dc7
Add divide by zero check'
2016-08-04 10:20:50 -07:00
Bryukhanov Valentin
c4ee32f3e1
Merge pull request #3812 from Bryukh/master
...
Add bunch of Russian translation
2016-08-04 08:16:31 +03:00
Josh Callebaut
796c35f66d
Tweak campaign connecton arrows so they point more accurately to the next level
2016-08-03 14:53:03 -07:00
Nick Winter
6917843018
Add a couple animations to defaultActions while game-dev lazy rendering isn't working
2016-08-03 13:32:49 -07:00
Nick Winter
35966b24c1
ES5ify web-dev-listener.js
2016-08-03 13:02:55 -07:00
Matt Lott
ba6d51659c
Show in-game programming language
...
Closes #3814
2016-08-03 11:08:20 -07:00
Matt Lott
079ad6c0fa
Replace /about Matt and Nick pics with real photos
2016-08-03 10:17:57 -07:00
phoenixeliot
5dc3ebe9b1
Include other timeout error codes for good measure
2016-08-02 14:25:14 -07:00
phoenixeliot
36449bb6b6
Account for both types of timeouts in retry logic
2016-08-02 14:18:26 -07:00
phoenixeliot
2e9ff61436
Fix broken ladder in course
2016-08-02 13:43:13 -07:00
phoenixeliot
eaaea6f08b
Retry models when they time out
2016-08-02 13:42:56 -07:00
Nick Winter
fad53cf43f
Don't wait for simulation load progress on game-dev levels
2016-08-02 12:31:36 -07:00
phoenixeliot
5f560f3e7d
Don't allow conversion to student without a ClassCode
...
Fix i18n and tests
2016-08-01 16:44:57 -07:00
phoenixeliot
94e3c5a2b5
Add first/last names to Account Settings
2016-08-01 14:12:35 -07:00
Valentin Bryukhanov
2e3d1531bf
Add bunch of Russian translation
2016-08-01 08:48:00 +03:00
Imperadeiro98
e34abb0d27
Update pt-PT.coffee
2016-07-30 13:59:55 +01:00
Nick Winter
24d58a1971
Handle old programming languages during simulation
2016-07-29 16:36:12 -07:00
phoenixeliot
d388975217
Fix unescaped HTML in goal descriptions
2016-07-29 16:21:13 -07:00
phoenixeliot
51706a52be
Fix indefiniteLength error on first frame
2016-07-29 16:16:50 -07:00
phoenixeliot
f3ffcc2885
Make hamburger more visible
2016-07-29 14:55:42 -07:00
phoenixeliot
83557910b2
Fix CSV export and projects tab
2016-07-29 14:37:45 -07:00
Nick Winter
e7c1d3d5d3
Remove stale educator wiki link
2016-07-29 14:36:31 -07:00
themaka
8135bd73d0
Added Māori and Croatian to list of languages to display on Diplomat page.
2016-07-29 15:53:01 -04:00
themaka
2d87a51f30
Forgot to update language names in first line of hr/mi .coffee
2016-07-29 15:39:37 -04:00
themaka
66817657f0
Added "te reo Māori" (Māori) to locale
2016-07-29 15:34:34 -04:00
themaka
715939dfb1
Adding Croatian language to locale
2016-07-29 15:20:24 -04:00
phoenixeliot
4af822d13a
Revert "Add game UI programming language label"
...
This reverts commit b7f916116d
2016-07-29 11:23:42 -07:00
Matt Lott
1c777ee7f5
Update site desert image
2016-07-28 16:10:28 -07:00
phoenixeliot
4abc26a8d4
Fix progress resetting
2016-07-28 15:47:17 -07:00
phoenixeliot
a47bdc084a
Allow admins to become teachers
2016-07-28 15:28:31 -07:00
phoenixeliot
dd66a8c252
Add detection of HTML/CSS/JS comments for entrypoints
2016-07-28 15:10:01 -07:00
Nick Winter
592e57351c
Propagate i18n
2016-07-28 13:49:12 -07:00
Nick Winter
82c4367308
Avoid \n escape character in i18n strings for tooling
2016-07-28 13:47:23 -07:00
Nick Winter
d77625bc77
Game dev levels ( #3810 )
...
* Tweak API doc behavior and styling
* Instead of moving to the left during active dialogues, just move to the top
* Allow pointer events
* Adjust close button
* Re-enable pinning API docs for game-dev and web-dev levels
* Make sidebar in PlayGameDevLevelView stretch, better layout columns
* Set up content of PlayGameDevLevelView sidebar to scroll
* Add rest of PlayGameDevLevelView sidebar content, rework what loading looks like
* Finish PlayGameDevLevelView
* Add share area below
* Cover the brown background, paint it gray
* Tweak PlayGameDevLevelView
* Have progress bar show everything
* Fix Surface resize handling
* Fix PlayGameDevLevelView resizing incorrectly when playing
* Add GameDevVictoryModal to PlayGameDevLevelView
* Don't show missing-doctype annotation in Ace
* Hook up GameDevVictoryModal copy button
* Fix onChangeAnnotation runtime error
* Fix onLevelLoaded runtime error
* Have CourseVictoryModal link to /courses when course is done
* Trim, update CourseDetailsView
* Remove last vestiges of teacherMode
* Remove giant navigation buttons at top
* Quick switch to flat style
* Add analytics for game-dev
* Update Analytics events for gamedev
* Prefix event names with context
* Send to Mixpanel
* Include more properties
* Mostly set up indefinite play and autocast for game-dev levels
* Set up cast buttons and shortcut for game-dev
* Add rudimentary instructions when students play game-dev levels
* Couple tweaks
* fix a bit of code that expects frames to always stick around
* have PlayGameDevLevelView render a couple frames on load
* API Docs use 'game' instead of 'hero'
* Move tags to head without combining
* Add HTML comment-start string
Fixes missing entry point arrows
* Fix some whitespace
2016-07-28 13:39:58 -07:00
Matt Lott
b7f916116d
Add game UI programming language label
2016-07-28 12:00:52 -07:00
Matt Lott
2f7fa4e6e7
Always show level and course name in-game
2016-07-28 06:15:17 -07:00
Rob
4d8d4ff268
Defer breakage of Concept Map if we don't have esper.
2016-07-27 16:55:10 -07:00
Rob
b0f653db19
Remove white pixels from logo via. Robin.
2016-07-27 16:45:14 -07:00
Rob
b7fcaa50a6
Change keyword autocomplete logic.
2016-07-27 16:37:57 -07:00
Nick Winter
e3453cb0f3
Update Simulator to new, simple way of making UserCodeMap
2016-07-27 15:57:35 -07:00
Rob
6c9f351f01
Group concept map by campaign.
2016-07-27 14:17:37 -07:00
Rob
75e3c54d54
Add concept map view to artisans.
2016-07-27 13:44:55 -07:00
Scott Erickson
ac4df997c1
Display treema errors
2016-07-26 16:48:04 -07:00
Robin Yang
2cfe7d0b43
Add Elliot Blurb on About Page
2016-07-26 15:32:37 -07:00
phoenixeliot
642847c9c5
Improve progress dot layout for extra courses
2016-07-26 13:11:51 -07:00
phoenixeliot
bd8a284ce6
Improve layout of help blocks in signup form
2016-07-26 11:54:02 -07:00
Scott Erickson
8117a000c1
Fix PlayLevelView race condition typo
2016-07-26 10:38:15 -07:00
Scott Erickson
053ce34faf
Prevent users from signing up with or changing to an email-like username
2016-07-25 16:33:48 -07:00
Scott Erickson
34310642c7
Add destudent and deteacher buttons to AdministerUserModal
2016-07-25 16:09:24 -07:00
Scott Erickson
1064d64172
Update FB API to v2.7
...
We were on v2.0, which is being deprecated on August 8th
2016-07-25 13:56:05 -07:00
phoenixeliot
f1f020a50d
Use course.releasePhase instead of .adminOnly
...
Remove old comment
2016-07-25 11:29:30 -07:00
Nick Winter
9ae5109e40
Show projects in TeacherClassView, proper font in first web-dev project level for now for demo
2016-07-24 14:42:07 -07:00
Matt Lott
9ad7376edf
Add shareable to admin classroom levels page
2016-07-24 08:09:12 -07:00
Matt Lott
9962ff83d4
Level editor play classroom options
2016-07-23 21:03:19 -07:00
rudmanmrrod
7b76180902
Added more translations ( #3803 )
2016-07-23 22:44:01 +01:00
Nick Winter
ea61499a10
Add Done button hotkey
2016-07-22 17:59:32 -07:00
phoenixeliot
cac87559c6
Remove frequent console logs in web levels
2016-07-22 10:43:08 -07:00
phoenixeliot
f9d0adaca6
Fix levelType refactor
2016-07-22 10:43:08 -07:00
Scott Erickson
b1c69b686c
Add admin button to update course content for classrooms
2016-07-21 15:16:17 -07:00
Scott Erickson
57f8aedaa5
Hide student tab on TeacherClassView until it's ready
2016-07-21 13:54:37 -07:00
