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
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
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
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
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
Matt Lott
e51186ec46
Add JS primer to update courses script
2016-08-02 11:08:46 -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
