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
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
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
1439016f9b
Remove schoolName from school-counts user query
2016-08-09 06:33:31 -07: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
themaka
f111c16482
Add Sean to /about ( #3826 )
...
* Add Sean to /about
* Remove empty line
2016-08-08 17:46:22 -07:00
Phoenix Eliot
1a53931f9c
Merge branch 'master' into production
2016-08-08 15:22:07 -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
3d024ce349
Merge branch 'master' into production
2016-08-08 11:50:47 -07:00
Scott Erickson
51b292cc3d
Add static messages to game dev levels for playtesting
2016-08-08 11:49:38 -07:00
Scott Erickson
c89ee139ed
Have GET param 'project' work with [] notation
...
Otherwise queries like $.ajax('/db/campaign', {data: {project:['name','slug']}})
cause 500 errors.
2016-08-08 09:35:42 -07:00
Imperadeiro98
d76a81438d
Remove dead line from ArticleEditView template
2016-08-07 19:13:31 +01:00