Commit graph

10929 commits

Author SHA1 Message Date
Matt Lott
2d8d107a58 Update Handler admin get query params
Unclear how this was supposed to work before these changes.
2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765 Remove placeholder text in invite email box in course details page
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
2015-10-09 13:45:33 -07:00
Matt Lott
9a0b98890c Merge branch 'master' into production 2015-10-09 09:33:36 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
b51a933a11 Merge branch 'master' into production 2015-10-09 08:05:51 -07:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511 Update level_loading.jade 2015-10-09 09:35:30 -05:00
Nick Winter
6fb14559ab Merge branch 'Fokusnica-master' 2015-10-09 06:08:50 -07:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
ded6b14b6a Better indented soundjs-NEXT.combined.js 2015-10-09 12:36:36 +01:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2
Translate careers
2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1
Update to zh-HANS period ( 。)
2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622 1. set periodEnd to the next month if subscription cancelled at periodEnd 2015-10-08 19:43:13 -07:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up
Cleaned up a couple of files
2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2 Update to zh-HANS period ( 。) 2015-10-09 11:11:51 +13:00
Imperadeiro98
bc58596eec Merge pull request #3090 from javatlacati/patch-2
Update es-419.coffee
2015-10-08 22:41:09 +01:00
RUSLAN LÓPEZ CARRO
721b2c024e Update es-419.coffee 2015-10-08 16:35:21 -05:00
Matt Lott
701a72e7c9 Merge branch 'master' into production 2015-10-08 12:28:12 -07:00
Matt Lott
99c20b88fa Don't show seat count when enrolling in free courses 2015-10-08 12:27:53 -07:00
Matt Lott
171678caad Add try out courses blurb to top of /teachers page 2015-10-08 11:51:00 -07:00
Matt Lott
38f6615762 Latest enabled teacher trial requests script 2015-10-08 10:30:56 -07:00
Imperadeiro98
6e6b389094 Merge pull request #3089 from javatlacati/patch-2
Update es-419.coffee
2015-10-08 17:56:36 +01:00
Matt Lott
bb3d9fa05a Merge branch 'master' into production 2015-10-08 09:44:14 -07:00
RUSLAN LÓPEZ CARRO
853d08b71e Update es-419.coffee 2015-10-08 11:44:13 -05:00
Matt Lott
9e8294fae8 Comment out courses teacher survey UI
The teacher survey infrastructure does not support courses yet.
2015-10-08 09:40:40 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b Update level_loading.jade
How about adding these two quotes? :D
2015-10-08 11:36:19 -05:00
AkaKaras
71e8e8c5f5 Merge remote-tracking branch 'codecombat/master' into translation 2015-10-08 12:34:27 -04:00
Nick Winter
285d767051 Merge pull request #3087 from makertech81/patch-5
changed links
2015-10-08 06:46:51 -07:00
TJ Ledwith
a94e7f9fe9 changed links 2015-10-08 09:20:00 -04:00
Nick Winter
7e8b6589d5 Update HipChat links 2015-10-08 06:14:36 -07:00
Matt Lott
a6f4085b13 Update course details progress colors
Only show not started key when expanded progress.
2015-10-08 06:10:12 -07:00
Matt Lott
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
Nick Winter
9df2886345 Merge pull request #3086 from makertech81/patch-4
Added a few names.
2015-10-08 05:15:44 -07:00
TJ Ledwith
a87ec2bd81 Added a few names.
Added a few names.
2015-10-08 07:43:48 -04:00
Matt Lott
a6e3110549 Update course details completed level/concept to light blue 2015-10-07 17:30:16 -07:00
Matt Lott
ce4afe187a Update course invite email subject and body with course name 2015-10-07 17:24:28 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses
Default to 9999 instead.
2015-10-07 17:08:22 -07:00
Matt Lott
3eb450631a 🐛Restrict course level progress to course levels 2015-10-07 16:58:59 -07:00
Scott Erickson
50f7391e76 Remove programming language and progress class settings 2015-10-07 16:31:19 -07:00
Scott Erickson
76422b3585 Put free teacher evaluation blurb in /courses/enroll on /courses too 2015-10-07 16:23:35 -07:00
Matt Lott
3292f13bc3 Ensure students play course levels in order 2015-10-07 15:33:52 -07:00