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
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
8baa57748a
Merge branch 'master' into production
2016-08-05 13:28:36 -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 Lott
96cbcfada2
🐛 Fix prepaids middleware missing this.logError
2016-08-05 09:21:37 -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
