Commit graph

11402 commits

Author SHA1 Message Date
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
Matt Lott
bfacbf8add Course details page defaults to levels tab for students 2015-10-07 15:18:09 -07:00
Matt Lott
d95cbc0627 Course instance redeem API returns 200 for double redeem
If a user has already redeemed course prepaid code, return 200 and the
related course instances.  Simplifies client-side experience.
2015-10-07 15:14:26 -07:00
Matt Lott
440bf9c6e0 /courses?_ppc=blah logged out message
Also trim /courses prepaid code input.
2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4 Separate URLs for /courses/students and /courses/teachers 2015-10-07 14:37:41 -07:00
Matt Lott
32441f1c8d Only generate lowercase prepaid codes
Will be easier to make them case-insensitive later if needed.
2015-10-07 14:06:09 -07:00
Nick Winter
5ff3b1606c Merge branch 'jhoon-translations-es' 2015-10-07 13:24:26 -07:00
Nick Winter
d651380040 Fix merge conflicts in es-419 2015-10-07 13:24:19 -07:00
Jhoon Saravia
beb8a425f0 Translated new sections and updated other translations 2015-10-07 10:54:49 -05:00
Matt Lott
0689e487dd Merge branch 'master' into production 2015-10-06 13:15:24 -07:00
Scott Erickson
2d2f4814f4 Add course membership required error to LevelLoadingView 2015-10-06 12:48:58 -07:00
Matt Lott
75b9cb50d9 Add /courses prepaid code query var
Update invite students link to go to /courses
2015-10-06 12:30:22 -07:00
Cat Sync
d09711be37 Added test for parallel subscription redeems, more informative redeem error messages, more robust prepaid update when redeeming 2015-10-06 15:23:47 -04:00
Matt Lott
9c7345fed0 Redeem course prepaid code on /courses page
Completes #54270566052118
2015-10-06 11:20:57 -07:00
Scott Erickson
ff69bb8c89 Add course level session creation permission checking to level_handler 2015-10-06 11:08:03 -07:00
Scott Erickson
ee138660da Tweak level schema to get WebStorm to stop thinking it's bad syntax 2015-10-06 11:06:41 -07:00
Nick Winter
e0918ec631 Added mountain -> glacier completion link 2015-10-05 16:19:43 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a Add invite link and capacity info to CourseDetailsView 2015-10-05 16:01:32 -07:00
Nick Winter
d0373e9823 Merge branch 'master' into production 2015-10-05 15:32:35 -07:00
Nick Winter
d200ac4a32 Fix #2926: handle missing sub-code/spoken-languages in docs 2015-10-05 15:32:02 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
Imperadeiro98
96605127c6 Merge pull request #3083 from tieskedh/patch-3
added some dutch translations
2015-10-04 15:32:03 +01:00
tieskedh
6a34e5b813 Update nl-NL.coffee 2015-10-04 15:45:31 +02:00
AkaKaras
88bb24fefd Merge remote-tracking branch 'codecombat/master' into translation 2015-10-03 16:50:05 -04:00
Imperadeiro98
403cfe2f53 Fixed previous merge 2015-10-03 19:58:12 +01:00
Imperadeiro98
43476ed87f Merge pull request #3082 from etem/master
Updated Bulgarian translation
2015-10-03 19:55:59 +01:00
Etem Hyusnev
42056fafdf Translated action_cooldown 2015-10-03 17:05:05 +03:00