Commit graph

12307 commits

Author SHA1 Message Date
Matt Lott
68e2b5bf8f 🐛Fix /courses classroom aceConfig reference 2015-12-01 10:34:28 -08:00
Rob
d0f3aeec91 Draw visual indent marker by hand so it's more stylish. 2015-12-01 12:22:48 -05:00
Rob
db060e9816 Fix visual indents when document row doesn't match screen row. 2015-12-01 12:02:56 -05:00
Imperadeiro98
ce92f11b27 Small fixes for last merge 2015-12-01 15:57:39 +00:00
Imperadeiro98
940483fb9c Merge pull request #3223 from tinavincent/master
Master
2015-12-01 15:53:33 +00:00
tinavincent
6863a3b303 Översatt en massa
Första gången jag testar. Hoppas att jag gjort rätt.
2015-12-01 16:40:58 +01:00
tinavincent
aec1b81070 Merge remote-tracking branch 'refs/remotes/codecombat/master' 2015-12-01 16:38:03 +01:00
Matt Lott
6418562ba2 /courses/teachers screenshot duration stars 2015-12-01 07:01:17 -08:00
Imperadeiro98
4050e0b498 Revert commit 480a310 2015-12-01 14:52:17 +00:00
Matt Lott
7efb3518a6 /courses/teachers free ribbon 2015-12-01 06:13:52 -08:00
tinavincent
40139dffd3 Merge remote-tracking branch 'refs/remotes/codecombat/master' 2015-12-01 15:09:48 +01:00
Nick Winter
c44dccd59b Merge branch 'master' into production 2015-12-01 06:05:50 -08:00
UltCombo
08143ce955 Fix dev server (npm run dev) on Windows, fixes #3219
Reference: #3219

Also trim some trailing whitespace.
2015-12-01 00:00:11 -02:00
Matt Lott
29fcbd86c4 Update /courses/teachers concept style 2015-11-30 16:53:11 -08:00
Nick Winter
851e3a092e Play button goes to /courses if that's all the player has played 2015-11-30 16:43:33 -08:00
Matt Lott
97114e6fe3 Update /courses teacher link
Go to /courses/teachers instead of /teachers
2015-11-30 16:43:24 -08:00
Matt Lott
6de5a6b773 Update /courses/teachers
Rearrange available courses section to be closer to latest visual
design.
2015-11-30 16:40:14 -08:00
Matt Lott
171e4f888e Update /courses/teachers
Adding edit class settings modal
Adding create new class modal
Repurposing ClassroomSettingsModal for create new class too.
2015-11-30 16:20:24 -08:00
Nick Winter
a8eaa79db3 Always shows level intro doc scrollbars 2015-11-30 15:33:50 -08:00
Nick Winter
457b9d0dbf Simple AI -> Simple CPU, since players read it as 'AL' (who is SIMPLE AL?) 2015-11-30 15:27:52 -08:00
Nick Winter
3a4c8d40f6 Made LadderPlayModal buttons look more like buttons with a tasteful giant animated box-shadow 2015-11-30 15:07:01 -08:00
Nick Winter
22af180a86 Move gold display to DuelStatsView for Wakka Maul and remove army power display for non-army ladders 2015-11-30 14:58:36 -08:00
Matt Lott
e8fc90de23 Update /courses/teachers
Still incomplete: edit class modal, create new class modal, updated
available courses list UI
2015-11-30 14:39:46 -08:00
Rob
fa21f9ef68 Add an extra indent line if the line following a range is only whitespace. 2015-11-30 17:23:29 -05:00
Nick Winter
cc3a62febd Fix loss of editor focus when clicking error messages and property docs popovers 2015-11-30 14:18:42 -08:00
Nick Winter
252b9a66e9 Don't encourage skip (esc) when in full-screen mode where esc exits full-screen mode 2015-11-30 14:10:34 -08:00
Nick Winter
97043c4a25 Autoplay when observing others' replays 2015-11-30 14:01:39 -08:00
Scott Erickson
5e733d1517 Add ActivateLicensesModal to ClassroomView 2015-11-30 16:59:22 -05:00
Nick Winter
8fd47535d1 Put video into its own guide tab, fix intro tabs 2015-11-30 13:54:13 -08:00
Nick Winter
69379fb54f Show floating hero player names in course-ladder levels 2015-11-30 13:05:34 -08:00
Nick Winter
2588bfb08b Reduce some writes during HoC to help scaling 2015-11-30 13:05:34 -08:00
Imperadeiro98
60f40bb859 Add closing sound to InventoryModal 2015-11-30 20:53:52 +00:00
Nick Winter
26be2842ed Don't highlight Done button as much until winning replay has finished 2015-11-30 11:34:47 -08:00
Scott Erickson
0c45e3f96c Add ClassroomView, incomplete 2015-11-30 14:14:27 -05:00
Rob
716f759e11 Be more helpful when opening a new indent. 2015-11-30 14:13:07 -05:00
Nick Winter
bf4593f5d4 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-11-30 11:00:17 -08:00
Nick Winter
4dde508570 Merge pull request #3190 from Imperadeiro98/fix-2916
Fix #2916
2015-11-30 10:59:22 -08:00
Rob
855fe0631d Caps. 2015-11-30 13:58:59 -05:00
Nick Winter
fcd970dbe2 Propagate i18n 2015-11-30 10:57:45 -08:00
Rob
99a8193492 Give assets time to copy before reloading page. 2015-11-30 13:56:03 -05:00
Rob
79fe249291 Merge branch 'visual-indent' 2015-11-30 13:55:25 -05:00
Rob
1b43c3e54f Clean up visual idents, limit to players under level 20 or with indentGuides turned on. 2015-11-30 13:54:50 -05:00
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Matt Lott
61cb5a325a Merge branch 'master' into production 2015-11-30 10:42:21 -08:00
Matt Lott
a851b7129a 🐛Fix teacher course management null check 2015-11-30 10:41:57 -08:00
Nick Winter
31e7b36310 Add link to /acccount/subscription from /account/settings 2015-11-30 09:19:53 -08:00
Nick Winter
75ca6b9092 Merge branch 'master' into production 2015-11-30 07:49:23 -08:00
Nick Winter
542cd98329 Fix #3221 2015-11-30 07:23:33 -08:00
Scott Erickson
d255802e38 Set up /courses for individuals without any course instances 2015-11-29 18:41:57 -05:00
Scott Erickson
b734beb852 Revert test changes 2015-11-29 18:26:42 -05:00