Commit graph

12701 commits

Author SHA1 Message Date
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
Matt Lott
7cd49b438b Update ZP -> Close lead importing to only query for last 30 days 2016-08-16 05:28:50 -07:00
lazydogP
2e0a7769ac Update zh-HANS.coffee 2016-08-16 07:33:15 +08:00
lazydogP
931103e4a4 Merge remote-tracking branch 'refs/remotes/codecombat/master' 2016-08-16 07:32:33 +08:00
Scott Erickson
731ee5bd32 Merge branch 'master' into production 2016-08-15 15:07:41 -07: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
f49305bd9d Update wd1 to released 2016-08-15 13:47:24 -07:00
Matt Lott
9ad181bc10 Merge branch 'master' into production 2016-08-15 13:37:53 -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
Scott Erickson
a5f18f88be Add script that migrates users with email-formatted usernames 2016-08-12 14:34:08 -07:00
Phoenix Eliot
bc0b3d0c29 Merge branch 'master' into production 2016-08-12 13:30:23 -07:00
Phoenix Eliot
76e461398e Clean up i18n TODOs 2016-08-12 13:27:30 -07:00
Phoenix Eliot
31a3f9dff8 Clean up console.log in server tests 2016-08-12 13:25:11 -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
Matt Lott
b27104bc1f Merge branch 'master' into production 2016-08-12 08:50:11 -07:00
Matt Lott
f96c3ab00e 🐛Fix course instance server test day range bugs 2016-08-11 22:46:15 -07:00
Matt Lott
5a6bed96b2 🐛Fix course solutions level ordering 2016-08-11 22:26:47 -07:00
Phoenix Eliot
e91a15338e Add View Project buttons to /courses 2016-08-11 16:38:14 -07:00
Matt Lott
341154ab31 🐛Fix course description typo 2016-08-11 16:03:56 -07:00
Matt Lott
be5bfc6881 Merge branch 'master' into production 2016-08-11 15:38:34 -07:00
Matt Lott
0f00ae1718 Disable supermodel timeout handling tests 2016-08-11 15:36:52 -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
f1572dbf48 Merge branch 'master' into production 2016-08-11 09:45:12 -07: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
90df2eaa0e Fix and test retrying logic, send error emails 2016-08-10 15:30:10 -07: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
eb70d90d9c Merge branch 'master' into production 2016-08-10 15:08:37 -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
954780d19f Finesse RequestQuoteView load waiting
Trying to get those tests to pass consistently on Travis.
2016-08-10 10:13:28 -07:00
Matt Lott
e968afc8ec Add school and district ids to zp lead importing 2016-08-10 10:13:00 -07:00