Scott Erickson
f1d4a9d53b
Remove vestigial code from hour of code view template
2015-11-21 11:33:32 -08:00
Scott Erickson
9292396dad
Add logout link to HourOfCodeView when signed in
2015-11-20 18:22:52 -08:00
Scott Erickson
aee1f6587a
Add StudentSignUpModal to HourOfCodeView
2015-11-20 16:28:28 -08:00
Matt Lott
9d329d4a1d
Migrate external trial requests to database
...
Added created field to ~2800 older trial.requests
Inserted ~700 external requests from Google forms
2015-11-20 15:53:00 -08:00
Scott Erickson
f7f405b774
Remove colons from template, unused formValues from view
2015-11-20 14:52:13 -08:00
Scott Erickson
f8cf3212dc
Remove unneeded .input-border wrapper
2015-11-20 14:47:35 -08:00
Scott Erickson
b88a817e25
Fix login button text
2015-11-20 14:44:17 -08:00
Scott Erickson
f8a5baa4f6
Finish StudentLoginModal implementation
2015-11-20 13:59:43 -08:00
Scott Erickson
70a3a199a0
Remove login button when you are logged in, refactor HOC view to always use a well
2015-11-20 13:36:50 -08:00
Scott Erickson
9dbd4d296a
Merge branch 'master' into courses-vhoc
2015-11-20 13:28:43 -08:00
Scott Erickson
bcb869594d
Add start of StudentLoginModal
2015-11-20 07:52:35 -08:00
Scott Erickson
1a4a143340
Initial build of /hoc, no login/create account modals yet
2015-11-19 15:26:45 -08:00
Nick Winter
2fecaf9618
Show AI flare in ladders. Show more players for league ladders.
2015-11-19 15:18:53 -08:00
Nick Winter
c8ceca4d3d
Add user.courseInstances, use it for course ladders
2015-11-19 10:41:31 -08:00
Scott Erickson
ee1e484dda
Have play buttons show 'Compete!' for arena levels on CourseDetails levels list
2015-11-18 14:08:25 -08:00
Scott Erickson
7a6c42b89f
Set up course-ladder level handling
...
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
2015-11-18 14:02:45 -08:00
Scott Erickson
890d528d80
Fix level session stats in CourseDetailsView
2015-11-17 16:54:04 -08:00
Matt Lott
bc454191ec
Update accounts prepaid list
...
Needed clearer total and remaining columns.
2015-11-17 16:21:08 -08:00
Scott Erickson
6a54c7cf54
Add classroom name, description, and language editing, and classroom language infrastructure
2015-11-17 16:10:23 -08:00
Nick Winter
a5fc31dbb3
Allow multiplayer levels to earn achievements
2015-11-17 15:23:35 -08:00
Nick Winter
0abb9a38ad
Use nanoscroller to allow intro doc scrolling
2015-11-15 08:23:12 -08:00
Nick Winter
5d9d5c0ae6
Remove ProblemAlertView help button
2015-11-14 17:33:05 -08:00
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