Matt Lott
b3362c8d0d
Add courses to top menu
...
Bumping about to bottom menu, removing clans.
2015-11-13 11:33:03 -08:00
Matt Lott
c7118d69e5
Redirect 2014 HoC link to 2015 HoC link
...
https://app.asana.com/0/54276215890539/65805646890763
2015-11-13 10:17:05 -08:00
Nick Winter
9e61928080
Add reset progress feature in account settings
2015-11-12 15:27:28 -08:00
Scott Erickson
8b00c38350
Merge pull request #3168 from Imperadeiro98/use-view
...
Refactor to use view in template for issue #3138
2015-11-12 09:58:49 -08:00
Nick Winter
b9deb363d2
Add Brazil office address
2015-11-11 10:33:21 -08:00
Scott Erickson
d9d5dce2e0
Merge branch 'master' into course-correction
2015-11-10 16:34:33 -08:00
Nick Winter
2259076800
LoadingScreen -> level intro behavior
2015-11-10 15:22:09 -08:00
Nick Winter
4497334e6d
Update a couple team avatar and descriptions
2015-11-10 15:21:34 -08:00
Matt Lott
e33323e7eb
Add line charts to admin analytics dashboard
...
https://app.asana.com/0/54276215890539/64369256136957
2015-11-10 14:55:48 -08:00
Scott Erickson
cddf000276
Add way for admins to grant users course prepaids
2015-11-10 14:33:27 -08:00
Josh Callebaut
c4779468bd
Adds Josh C's image and updates the about page.
2015-11-10 13:46:48 -08:00
Scott Erickson
a0212da789
Improve StudentCoursesView
...
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
2015-11-10 12:08:44 -08:00
Scott Erickson
0c5b39e029
Merge branch 'master' into course-correction
...
Some package scripts got in the way of each other
2015-11-09 18:18:02 -08:00
Scott Erickson
12b3947448
Tweak wording on TeacherCoursesView
2015-11-09 18:14:42 -08:00
Scott Erickson
c8fc893ef1
Adjust CourseDetailsView for classrooms
...
* Disable settings modal
* Show classroom name instead of course instance name if available
2015-11-09 18:08:39 -08:00
Scott Erickson
628ed9a990
Remove add students tab from CourseDetailsView
2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3
Fixes for courses, hoc
...
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2
Initial setup of the hoc page
2015-11-09 16:45:12 -08:00
Imperadeiro98
28363f780a
Small tweaks
2015-11-09 21:35:33 +00:00
Imperadeiro98
8e8a3103d5
Refactor to use view in template for issue #3138
...
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Scott Erickson
91b8f9bb40
Switch back active tab, was switched for testing
2015-11-09 12:41:55 -08:00
Scott Erickson
1f37f12cc5
Fix auto course-instance creation
...
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c
Add courses tab to teacher courses page
2015-11-09 11:48:40 -08:00
Matt Lott
95b61c2f83
Add recurring revenue to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-08 17:00:24 -08:00
Matt Lott
7861faaf93
Add active classes to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-06 14:11:39 -08:00
Scott Erickson
7daff0861f
Add functionality to StudentCoursesView
2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925
Add functionality to TeacherCoursesView
2015-11-05 17:26:31 -08:00
Scott Erickson
b36bf7b171
Add PurchaseCoursesView
2015-11-05 15:30:57 -08:00
Nick Winter
995459e1d5
Merge pull request #3156 from Imperadeiro98/some-updates
...
Remove a lot of unused strings
2015-11-05 08:25:32 -08:00
Scott Erickson
00ce821939
Add InviteToClassroomModal, begin join class in StudentCoursesView
2015-11-04 16:54:13 -08:00
Rob
75532e3a79
Use generated member count instead of pulling a list of all members from mongo when we get the public clans list.
2015-11-04 16:00:54 -08:00
Imperadeiro98
89521e2dbe
Remove a lot of unused strings
2015-11-04 21:45:15 +00:00
Matt Lott
722540f3be
Remove old user analytics page
2015-11-04 10:59:10 -08:00
Matt Lott
d445024cb6
Add admin analytics page with MAUs
...
Includes updating analytics insert script used to inject aggregated
data into production database.
2015-11-04 10:59:10 -08:00
Scott Erickson
669ab416e5
Fix SubscriptionView to keep emails when emails are erroneous
2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc
Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
...
# Conflicts:
# app/views/account/SubscriptionView.coffee
2015-11-04 10:47:39 -08:00
Scott Erickson
66432990f4
Add framework for new courses pages
2015-11-03 16:41:06 -08:00
Nick Winter
964b3f534c
Remove Bloc offer
2015-11-03 15:45:05 -08:00
Nick Winter
05e95923c2
Add Carlos to /about
2015-11-02 16:15:43 -08:00
Josh Callebaut
8b26c8a8b5
Merge remote-tracking branch 'upstream/master'
2015-11-02 16:03:32 -08:00
Josh Callebaut
c0ddbd2df1
Uniquifies the i18n tag for Josh C
2015-11-02 15:26:03 -08:00
Josh Callebaut
05f74a2fcd
Adds Josh Callebaut to the about.jade file.
2015-11-02 15:21:05 -08:00
Nick Winter
caab006c5e
Merge pull request #3149 from dillonforrest/master
...
Change visible references of 'HipChat' to 'Slack'.
2015-11-02 10:32:48 -08:00
Scott Erickson
fa4355f946
Add programming language to options in course instances
2015-10-30 15:56:43 -07:00
Scott Erickson
0da66bd468
Refactor CourseEnrollView to use view in template
2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4
Make redeem coupon network errors on /courses happen within modal
2015-10-30 11:05:24 -07:00
dillon
493d302a0d
Change visible references of 'HipChat' to 'Slack'.
2015-10-30 00:07:58 -07:00
Matt Lott
8b254164c9
Free course enrollment for admins
2015-10-29 14:09:19 -07:00
Imperadeiro98
f2ca1dbd63
Updates to i18n
2015-10-29 15:57:22 +00:00
Scott Erickson
7b54a04d33
Fix reload code button in play view on IE9
2015-10-28 15:45:34 -07:00
Scott Erickson
f95426dbd9
Fix done button in LevelPlayView in IE9
...
It had no background.
2015-10-28 15:24:08 -07:00
Scott Erickson
fb51d40cb4
Switch AuthModal buttons to use btn-illustrated classes, for browser compatibility
...
They were white boxes in IE9 with their custom setup.
2015-10-28 14:37:59 -07:00
Nick Winter
a970f322f9
Merge pull request #3132 from Imperadeiro98/i18n-updates
...
Updated i18n across some files
2015-10-28 06:41:35 -07:00
Scott Erickson
6e1cb8a1d1
Add owner name to course details page
2015-10-27 17:47:48 -07:00
Imperadeiro98
e1b10183eb
Some cleanups to subscription-view.jade
2015-10-27 21:57:49 +00:00
Scott Erickson
af7bb08dc3
List courses you are in at the top of /courses
2015-10-27 13:58:45 -07:00
Scott Erickson
a5793630c2
Stop showing ChooseHero tab in GameMenu for course and course-ladder levels
2015-10-27 13:21:39 -07:00
Scott Erickson
7641216fd0
Make not supported mobile message on /courses landing page
2015-10-27 12:43:54 -07:00
Scott Erickson
66afb10f91
Fix a useful trailing whitespace that was removed
...
My work machine editor's settings were changed, but not my home editor.
Both have now been fixed. I reviewed the template and this was the only significant
whitespace that was removed, I believe.
2015-10-27 12:29:32 -07:00
Scott Erickson
b736feb017
Refactor ArticleEditView to use view in template
2015-10-27 12:09:36 -07:00
Scott Erickson
2e666073f1
Refactor SubscriptionView to use view in template
2015-10-27 12:07:16 -07:00
Imperadeiro98
a7b35305de
Fixed .spr in cla.jade
2015-10-27 15:07:39 +00:00
Scott Erickson
0869b11f53
Refactor DeltaView to use view in template
2015-10-26 17:00:52 -07:00
Scott Erickson
c10d11f61b
Refactor DiplomatView to use view in template
2015-10-26 14:46:35 -07:00
Scott Erickson
45044d06a4
Refactor CLAsView to use view in template
2015-10-26 14:35:42 -07:00
Scott Erickson
58eaec8e6b
Refactor MainLadderView to use view in template
2015-10-26 14:23:06 -07:00
Matt Lott
48786372d8
🐛 Prevent parallel managed sub unsubscribes
...
Our unsubscribe API does not support this. Removing option from
subscription UI.
Fixes #2976
2015-10-26 13:45:38 -07:00
Nick Winter
afa410a370
Added Ace of Coders tournament rankings.
2015-10-26 13:30:49 -07:00
Imperadeiro98
6ee44bd6cc
Fixed i18n in infinite_loop.jade
2015-10-26 12:46:06 +00:00
Imperadeiro98
169627af82
Added a missing spr in CLA.jade
2015-10-23 20:49:15 +01:00
Scott Erickson
3df4f26293
Remove a test wrench thrown into CommunityView
2015-10-23 10:50:21 -07:00
Scott Erickson
921054d53f
Improve brunch re-compile speed by updating bunch libraries
...
Also fixed a couple templates newer brunch complained about.
2015-10-23 10:09:34 -07:00
Imperadeiro98
09422910f7
Updated i18n
2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41
Refactor InvoicesView to use view in template
2015-10-22 15:26:52 -07:00
Scott Erickson
cd065f3ba6
Refactor TeachersFreeTrialView to use view in template
2015-10-22 15:23:04 -07:00
Scott Erickson
9de50ac181
Refactor CLAView to use view in template
2015-10-22 15:16:32 -07:00
Scott Erickson
ddf351aac7
Refactor PaymentsView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285
Refactor AccountSettingsView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
9a29c26cc8
Refactor HomeView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
452e6467b4
Refactor PrepaidView to use new event callback naming guideline
...
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794
Refactor AccountSettingsView to use new event callback naming guideline
...
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:02:04 -07:00
Rob
1ff97243ad
Hello, yes this is Rob.
2015-10-21 08:46:12 -07:00
Nick Winter
d5288a254b
Remove Ace of Coders tournament blurb from home page
2015-10-16 14:55:58 -07:00
Imperadeiro98
3d1e5f1e34
i18n account dropdown 'Prepaid Codes'
2015-10-15 21:41:47 +01:00
Nick Winter
e15b30893f
Note tournament end, undo tournament simulation bias
2015-10-15 06:32:52 -07:00
Jlit1001
a788533d13
1. simplify regex for email testing
...
2. keep valid emails in text area
2015-10-14 22:29:15 -07:00
Scott Erickson
844bc942b3
Fix #2785
2015-10-14 16:01:09 -07:00
Scott Erickson
cbf6032c68
Merge branch 'origin/spritesheets'
2015-10-14 15:03:34 -07:00
Scott Erickson
305cffb5ea
Finish hooking up prerendered spritesheets with LayerAdapter
2015-10-14 14:33:26 -07:00
Imperadeiro98
a4d8aec2a7
Added i18n to contributor signup
2015-10-14 21:06:23 +01:00
Imperadeiro98
9184566d67
Update pt-PT and standardize new tip
2015-10-13 21:07:21 +01:00
Nick Winter
537ede7740
Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups
...
Added i18n to some strings
2015-10-13 12:27:58 -07:00
Nick Winter
0c7169f5c0
Merge pull request #3088 from javatlacati/patch-1
...
Update level_loading.jade
2015-10-13 12:21:19 -07:00
Nick Winter
d776809e1c
Update Hour of Code student flow and tracking, remove signup requirement
2015-10-13 08:12:07 -07:00
Imperadeiro98
fbfb80d4bf
Added i18n to some strings
2015-10-13 16:05:47 +01:00
Matt Lott
eda10a55ec
Update /courses?_ppc= logged out instructions
2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2
Merge remote-tracking branch 'origin/master'
2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9
Add spriteSheets to ThangType, export modal to Thang Editor
...
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
2015-10-12 16:47:48 -07:00
Matt Lott
e1e2be574c
Add teacher HoC instructions to /courses
2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166
Add HoC blurb to top of /teachers pages
...
Replacing courses beta testing blurb.
2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b
Route /hoc to courses
...
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -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
Nick Winter
5dde55c1f3
Add premium server recognition for Brazil
2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
5ff287a511
Update level_loading.jade
2015-10-09 09:35:30 -05:00
Jlit1001
e0be8e94ea
1. email validation when subscribing other users
2015-10-08 21:59:12 -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
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
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
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
1c1a5d4295
/courses student mode when _ppc present
2015-10-08 06:10:12 -07:00
Matt Lott
2767bbb639
Skip seat count selection for free courses
...
Default to 9999 instead.
2015-10-07 17:08:22 -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
440bf9c6e0
/courses?_ppc=blah logged out message
...
Also trim /courses prepaid code input.
2015-10-07 14:56:10 -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
Matt Lott
9c7345fed0
Redeem course prepaid code on /courses page
...
Completes #54270566052118
2015-10-06 11:20:57 -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
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
Matt Lott
5095eac4ac
Purchase prepaid on course instance creation
...
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.
Completes #54270567235517
2015-10-01 15:23:20 -07:00
Matt Lott
1557b7b442
🐛 Fix jade i18n errors in courses pages
...
Uncaught TypeError: Cannot read property 'i18n' of undefined
2015-09-28 16:13:27 -07:00
Nick Winter
bf8ba8cbe1
Merge pull request #3064 from Driphter/master
...
Fixed level/thang editor table for issue #3052
2015-09-28 06:06:48 -07:00
Nick Winter
4582a4499f
Merge pull request #3059 from Imperadeiro98/master
...
Added i18n to courses
2015-09-27 19:52:52 -07:00
Driphter
3b0bafd325
Fixed level/thang editor table for issue #3052
2015-09-26 20:07:36 -04:00
Matt Lott
95319ecc3e
Redirect /careers to Lever page
2015-09-25 15:49:00 -07:00
Matt Lott
5eadd926b3
Move redeem prepaid code UI out of modal
2015-09-25 15:21:51 -07:00
Imperadeiro98
4cb885faf3
Small change
2015-09-25 20:54:21 +01:00
Imperadeiro98
446b193f8c
Added i18n to courses
2015-09-25 20:51:51 +01:00
Matt Lott
928f72e2cf
Merge branch 'prepaid-v2' into master
2015-09-25 10:28:27 -07:00
Matt Lott
71538b0ac9
Remove 'do not localize' comment from courses UI
...
It’s ok to localize / i18n these now.
2015-09-24 17:56:12 -07:00
Matt Lott
feef9c0ac6
🐛 Fix instance selection on /courses page
2015-09-24 17:52:00 -07:00
Matt Lott
b4d59ced3e
Update course details progress level cell popups
2015-09-24 14:48:54 -07:00
Matt Lott
238ea49090
Add stats to course details page
2015-09-24 07:28:43 -07:00
Matt Lott
cbaac98556
Course details page no instances selected UI
2015-09-23 16:27:49 -07:00
Nick Winter
c2c3ae4c4c
Add /careers and Ace of Coders links to home page
2015-09-21 12:40:33 -07:00
Nick Winter
dc10dc3b61
Add skip button to Bloc offer
2015-09-18 08:27:37 -07:00
Nick Winter
cae95f5952
Tweak /careers copy
2015-09-18 05:31:03 -07:00
Nicholas Winter
5151ab9091
Describe Ace of Coders tournament
2015-09-15 16:36:50 -07:00
Matt Lott
3ad13c9a0d
Add /careers page
2015-09-14 17:38:18 -07:00
Matt Lott
b68e5e209b
Update course details page
2015-09-12 22:02:03 -07:00
Nicholas Winter
a4c1a599da
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-09-12 06:54:32 -07:00
Nicholas Winter
3eeb9a6a26
Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas.
2015-09-12 06:54:14 -07:00
Matt Lott
a2577cc521
Update courses landing page
2015-09-10 10:39:21 -07:00
Matt Lott
9041646ecc
Update teacher copy
2015-09-09 13:20:23 -07:00
