Nick Winter
591749de15
Fix some button child click and duplicate tag issues with e284ec79
2015-12-09 06:57:33 -08:00
Nick Winter
0945e3ee90
Merge pull request #3250 from Imperadeiro98/master
...
Courses i18n
2015-12-09 06:34:13 -08:00
Maka
31a508842e
Updating About page to include me
2015-12-08 23:56:57 -08:00
Maka
6bc8fe08b2
Adding Browserstack to our web page as we promised
2015-12-08 21:38:28 -08:00
Matt Lott
5ea9b6e8af
Update trial requests to be type course
2015-12-08 16:16:02 -08:00
Imperadeiro98
95efdcac1c
Added a line I removed
2015-12-08 20:58:53 +00:00
Imperadeiro98
e284ec7959
Courses i18n
...
Also, removed duplicated 'Continue' string
2015-12-08 20:05:08 +00:00
Matt Lott
78548b550f
Disable class language change after members > 0
2015-12-07 14:36:59 -08:00
Imperadeiro98
b0a1334eec
Removed play-level-modal
...
I think it is no longer used
2015-12-07 21:36:50 +00:00
Matt Lott
4ffe9a5035
Update /courses fwd/back links to be more consistent
...
Teachers, click here! is bit bigger.
2015-12-07 11:11:11 -08:00
Nick Winter
e375b8cdc8
Merge pull request #3185 from Imperadeiro98/the-branch
...
Refactor to use view in template
2015-12-07 09:28:26 -08:00
Matt Lott
13c75b3f1f
Condense class student progress list
2015-12-06 20:35:54 -08:00
Barry
3ef2be1a42
0px bottom margin on panel
2015-12-06 18:36:54 -05:00
Barry
74f692072e
Started repositioning buttons.Can't remove box-shadow from panel
2015-12-06 18:07:41 -05:00
Matt Lott
66f434adba
Update class progress colors
2015-12-06 15:00:00 -08:00
Matt Lott
cb4d8fee8c
Update /courses/purchase visuals
2015-12-06 14:26:35 -08:00
Matt Lott
45418dbfe3
Update /courses/purchase copy
2015-12-06 07:28:16 -08:00
Matt Lott
c4c4f42e74
Update class enroll modal visuals
2015-12-06 06:27:56 -08:00
Nick Winter
f38eea3590
Merged. Turn off chained rankings for now since they are slow and don't work anyway
2015-12-06 04:36:41 -08:00
Matt Lott
e5af4d857d
Update class management enroll and assign button copy
2015-12-05 19:10:46 -08:00
Matt Lott
b9af07c785
Classroom view logged out Ux
2015-12-04 16:37:13 -08:00
Scott Erickson
a573f49c98
Make unused enrollments section hidden for anonymous users in TeacherCoursesView
2015-12-04 15:02:58 -08:00
Scott Erickson
ed478e7c5e
Update enrollment terminology in ActivateLicensesModal, change enroll button color on disabled
2015-12-04 14:53:43 -08:00
Scott Erickson
9edd28b67a
Update more terminology in classroom view
2015-12-04 14:53:43 -08:00
Scott Erickson
dabf317688
Update enrollment terminology in PurchaseCoursesView
2015-12-04 14:53:43 -08:00
Scott Erickson
afb26d535b
Update ClassroomView with new enrollment terminology
2015-12-04 14:53:43 -08:00
Matt Lott
70b1a05435
Display course name in class details view
...
Instead of campaign name
2015-12-04 14:32:22 -08:00
Scott Erickson
6ac659b571
Add explanatory copy to TeacherCoursesView
2015-12-04 14:17:24 -08:00
Nick Winter
b21c20c08d
Update free-trial-approved copy to not reference the confirmation email
2015-12-04 14:03:30 -08:00
Nick Winter
c36bed8103
Fix classroom handling of sessions with no state yet
2015-12-04 11:59:51 -08:00
Matt Lott
4778cf5535
/hoc analytics
2015-12-04 11:31:49 -08:00
Nick Winter
417d4802ee
Don't show teacher name for single-player course
2015-12-04 11:04:18 -08:00
Scott Erickson
97c28e1c8a
Improve slow level loading on CampaignView
...
* Fix LevelSetupManager to call onLevelSync asynchronously if level is not loaded on init
* Show a progress bar in level-info-container while level is loading asynchronously
2015-12-04 10:26:09 -08:00
Scott Erickson
6a48f3697a
Add link to student and teacher course pages on course details page
2015-12-04 09:40:25 -08:00
Scott Erickson
8d70b5d53f
Remove course mocks
2015-12-04 09:29:14 -08:00
Scott Erickson
f72070d36b
Remove #levels from link to course details view from student courses view
2015-12-04 09:26:49 -08:00
Matt Lott
89aeac9424
Rename courses teacher resource pdfs
2015-12-03 16:30:50 -08:00
Matt Lott
c610ce6ffd
Remove progress tab from course details view
2015-12-03 16:25:33 -08:00
Scott Erickson
d874569b27
Add stats to ClassroomView
2015-12-03 14:51:38 -08:00
Scott Erickson
b2ed489197
Make sure LadderView displays a valid link back to levels for course arenas
2015-12-03 13:46:50 -08:00
Scott Erickson
3ac8f16d28
Fix ClassroomView sparse progress handling
2015-12-03 13:32:22 -08:00
Scott Erickson
afbfc69fd5
Hide teacher controls in ClassroomView when a student is viewing
2015-12-03 13:16:57 -08:00
Scott Erickson
3fefdfa0a7
Add student total playtime to ClassroomView
2015-12-03 12:29:30 -08:00
Scott Erickson
1bdefb3927
Fix links bleeding into course names in ClassroomView
2015-12-03 12:10:08 -08:00
Scott Erickson
1df87fa685
Add detailed progress and links to ClassroomView
2015-12-03 12:10:08 -08:00
Nick Winter
b0e9670453
Fixed course indexing for first levels in courses
2015-12-03 12:04:49 -08:00
Matt Lott
25213c5342
Add teachers guide to /courses/teachers
2015-12-02 17:28:25 -08:00
Matt Lott
fab5388a42
🐛 Fix teachers getting started guide link
2015-12-02 17:22:28 -08:00
Matt Lott
f3be69799c
Don't link to user profiles from course details
2015-12-02 16:22:10 -08:00
Scott Erickson
90ac6baa67
Fix course instance generation for classrooms
2015-12-02 16:07:54 -08:00
Matt Lott
d51f42b2ec
Update /courses/teachers with getting started pdf
2015-12-02 15:19:52 -08:00
Matt Lott
e2b2a6d396
Update /teachers
2015-12-02 15:19:52 -08:00
Scott Erickson
f43c3b0160
Add language icons to choose language modal
2015-12-02 14:37:09 -08:00
Scott Erickson
750086cac8
Tweak logout link copy
2015-12-02 14:30:28 -08:00
Scott Erickson
f88f4ee9ff
Tweak buttons on /hoc
2015-12-02 14:28:40 -08:00
Scott Erickson
8cc37ed034
Add recovery link to StudentLogInModal
2015-12-02 14:25:08 -08:00
Scott Erickson
c0b979a572
Migrate join classroom url to /courses from /courses/students
2015-12-02 12:05:54 -08:00
Scott Erickson
7f2ddba089
Add remove student modal to ClassroomView
2015-12-02 11:56:38 -08:00
Nick Winter
a0e5126ab7
Prompt for school name on course completion
2015-12-02 10:59:55 -08:00
Nick Winter
0d65d73024
Finish merging master into courses-vhoc
2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2
Add course complete visual state for student CourseDetailsView
...
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
2015-12-02 09:52:52 -08:00
Nick Winter
88ee363576
Add schoolName field to AuthModal
2015-12-01 17:44:03 -08:00
Nick Winter
3728b2dc4e
Added completion notice to course details
2015-12-01 17:32:32 -08:00
Matt Lott
93010f771a
Update available courses screenshots
2015-12-01 17:32:32 -08:00
Matt Lott
e290bf56bd
🐛 Fix /courses view class link
2015-12-01 17:32:32 -08:00
Matt Lott
b3fb8e98c2
No start new game for logged in /hoc
2015-12-01 17:32:32 -08:00
Matt Lott
56dadbf35a
Hide course details progress from anonymous
2015-12-01 17:32:32 -08:00
Nick Winter
26e321d9e7
Add schoolName field to StudentSignupModal
2015-12-01 17:32:24 -08:00
Nick Winter
8e1143b519
Add schoolName field to AuthModal
2015-12-01 17:32:02 -08:00
Matt Lott
ea1996809c
/courses/teachers add students modal
2015-12-01 13:41:45 -08:00
Scott Erickson
af136764de
Add enabling users to ClassroomView
2015-12-01 15:27:12 -06:00
Scott Erickson
cbdef392c5
Add invite modal to ClassroomView
2015-12-01 15:17:21 -06:00
Matt Lott
0b59d73650
Update classroom settings Learn Python copy
2015-12-01 12:43:40 -08:00
Matt Lott
d1a2b0944f
Add teachers link to /hoc
2015-12-01 12:38:54 -08:00
Matt Lott
8f7146449b
Update /courses teacher link based on logged in state
...
Go to /teachers if logged out
Go to /courses/teachers if logged in
2015-12-01 12:36:39 -08:00
Nick Winter
6b1c859e91
Preserve SuperModel when navigating between course levels
2015-12-01 12:23:01 -08:00
Nick Winter
ae6eca583a
Present 'Play Classroom Version' before playing a campaign level when appropriate
2015-12-01 11:24:16 -08:00
Matt Lott
68e2b5bf8f
🐛 Fix /courses classroom aceConfig reference
2015-12-01 10:34:28 -08:00
Matt Lott
6418562ba2
/courses/teachers screenshot duration stars
2015-12-01 07:01:17 -08:00
Matt Lott
7efb3518a6
/courses/teachers free ribbon
2015-12-01 06:13:52 -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
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
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
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
Scott Erickson
0c45e3f96c
Add ClassroomView, incomplete
2015-11-30 14:14:27 -05:00
Nick Winter
ecfd982847
Note PayPal payment method. End limited-time year sale.
2015-11-30 10:50:34 -08:00
Nick Winter
31e7b36310
Add link to /acccount/subscription from /account/settings
2015-11-30 09:19:53 -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
Scott Erickson
11e9a40645
Finish hooking up ChangeCourseLanguageModal into /courses
2015-11-29 18:25:57 -05:00
Scott Erickson
87c7bafd57
Add join-class functionality to /courses
2015-11-29 18:13:31 -05:00
Matt Lott
edc05facfe
Update /courses/purchase
...
Updating to latest UI designs.
2015-11-29 14:45:36 -08:00
Scott Erickson
5a72d32f60
Fix HOC complete text in /courses
2015-11-29 17:23:55 -05:00
Scott Erickson
405785bafe
Add completion stats to /courses
2015-11-29 17:18:24 -05:00
Scott Erickson
47acfc93d0
Fix course buttons and level links in /courses
2015-11-29 15:26:17 -05:00
Scott Erickson
ea0c274a3c
Fix /courses initial implementation
2015-11-29 15:26:17 -05:00
Matt Lott
33599c8632
Update /teachers based on latest visual design
2015-11-29 07:02:45 -08:00
Nick Winter
9dccf73af0
'Click to view attempt' for incomplete student solutions
2015-11-27 12:12:32 -08:00
Matt Lott
c385aaa414
Merge branch 'master' into courses-vhoc
2015-11-25 16:11:36 -08:00
Matt Lott
4ba3c47367
🐛 Fix courses view jade typo
2015-11-25 15:13:43 -08:00
Matt Lott
7b01fd7b65
Add course name to victory modal
2015-11-25 14:23:35 -08:00
Matt Lott
e716952f5f
Add HoC trial special to /teachers
2015-11-25 08:39:56 -08:00
Matt Lott
24345cf296
Course victory modal current and next level names
2015-11-24 16:46:27 -08:00
Matt Lott
4cc71bd0e6
Add HoC links to homepage
2015-11-24 15:28:37 -08:00
Nick Winter
7cba3f3725
Don't show code language selector for course ladders
2015-11-24 13:52:37 -08:00
Nick Winter
9f0a843593
Enable auto-submission to ladder for Wakka Maul
2015-11-24 13:35:15 -08:00
Nick Winter
67f14c7928
Try putting AI players in league ladders
2015-11-24 13:18:38 -08:00
Matt Lott
f261c1466a
Update /teachers
...
Stop forwarding to HoC
Update copy with courses info.
2015-11-24 10:59:14 -08:00
Matt Lott
d7a66722b9
Update teacher surveys
...
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
Nick Winter
ec7f17a149
Show level indexes in courses
2015-11-24 08:56:28 -08:00
Scott Erickson
2adb3362ed
Add ChangeCourseLanguageModal to CoursesView
2015-11-23 11:52:15 -06:00
Scott Erickson
ea4a98af86
Add rest of CoursesView, untested, unhooked to server
...
On a plane, so skipping my usual iterative testing.
Bugs are undoubtedly everywhere.
2015-11-23 08:46:08 -08:00
Nick Winter
e0011ee5d0
Classroom invite codes are now real words like BigFrogFarm
2015-11-22 07:47:28 -08:00
Scott Erickson
a98d0b1b2a
Partial work on /courses view when signed in
2015-11-22 00:08:46 -08:00
Scott Erickson
5aff591a8b
Set up courses view for anonymous users
2015-11-21 11:38:34 -08:00
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
Imperadeiro98
c4f0f07994
Fix
2015-11-18 19:36:30 +00:00
Imperadeiro98
db6166d22c
Some changes
2015-11-18 19:33:26 +00:00
Imperadeiro98
a19225013b
Refactor to use view in template
2015-11-18 19:16:44 +00: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
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
Nick Winter
b1fd171a27
Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards.
2015-09-08 06:44:26 -07:00
Nick Winter
b3496cbf6b
A couple tweaks for the duel stats view.
2015-09-04 17:01:06 -07:00
Nick Winter
73f3e7cdd9
League now preserved throughout ladder navigation flow. Mirror match support for submitting to both sides at once.
2015-09-04 16:21:45 -07:00
Nick Winter
d92ca389d6
Switched ladder views to display red/blue team instead of humans/ogres.
2015-09-03 15:46:56 -07:00
Matt Lott
9131d8668f
Course enroll page
...
Will add a prepaid purchase once the prepaid-v2 branch is merged into
master.
2015-09-03 11:04:52 -07:00
Nick Winter
46ee12ff9d
Updated some timestamps.
2015-09-03 08:33:48 -07:00
Nick Winter
02676dc59f
Fixed #2988 .
2015-09-03 05:10:06 -07:00
Nick Winter
6463b04c5c
Not trying to play a certain sound we don't have yet.
2015-09-02 05:32:45 -07:00
Matt Lott
8de00767b3
Initial courses object model
2015-08-29 07:15:39 -07:00
Matt Lott
545567a24b
Courses UI: Add teachers mode button to landing page
2015-08-28 11:33:37 -07:00
Matt Lott
a1927bf8cc
Courses UI: Update tabs on details page
2015-08-28 10:53:24 -07:00
Matt Lott
066d6e7fc1
Courses UI: Add FAQ popup to landing page
2015-08-27 16:52:02 -07:00
Matt Lott
a27c17ef0a
Courses UI: Add image to sales blurb and quote
2015-08-27 16:19:37 -07:00
Matt Lott
24fb52a8d9
Update year sub sale copy
2015-08-27 10:54:52 -07:00
Matt Lott
5faeb82d17
Extend terminal sub with year sub purchase
2015-08-27 09:45:10 -07:00
Matt Lott
b6ddb41df6
Add sale end date to year sub page
2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3
Add new heroes to year sub sale page
2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5
Add feature list to year sub sale landing page
2015-08-26 11:16:25 -07:00
Matt Lott
4392da1c20
Redirect to world selector after year sub purchase
2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b
Add teacher banner image to year sub sale page
...
Also updating sale copy.
2015-08-25 10:38:12 -07:00
Matt Lott
58ff820d7d
Prompt for login on year subscription sale page
2015-08-25 10:12:11 -07:00
Matt Lott
7d419c1615
Courses UI: add screenshot to landing page course blocks
2015-08-24 06:11:11 -07:00
Matt Lott
f42f34c96f
🐛 Fix subs dashboard 30 day churn
2015-08-23 20:54:39 -07:00
Matt Lott
b171a55876
Use real cancellations for 1st month on subs dashboard
...
We have the data now, so no need to approximate anymore.
2015-08-23 15:32:44 -07:00
Matt Lott
e8a4fd9336
Courses UI: update purchase/continue flow
...
Don’t show unlock code entry to teachers
Don’t show existing class selection or purchase course to students
Update copy to make it clearer what’s going on
2015-08-23 14:33:07 -07:00
Matt Lott
69f874a31d
Courses UI: Add student option to courses landing page
2015-08-23 13:48:52 -07:00
Matt Lott
f966b8a2fc
Courses UI: Add course details condensed progress view
...
Defaulting to condensed view, with checkbox to expand details.
2015-08-21 17:00:44 -07:00
Matt Lott
e85d5eac6f
Courses UI: Add student summary stats
2015-08-21 12:37:54 -07:00
Matt Lott
5961f14d2c
Courses UI: Update details page copy
2015-08-21 12:18:05 -07:00
Matt Lott
9e222d0873
Add subscription sale
...
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
Nick Winter
256b19d331
More improvements and fixes for league ladder pages.
2015-08-21 03:28:25 -07:00
Nick Winter
20c6248dba
Added rough army power indicator to DuelStatsView.
2015-08-20 15:21:05 -07:00
Nick Winter
78605ef459
Added DuelStatsView for ladder matches.
2015-08-20 11:57:47 -07:00
Nick Winter
da0b7d3e64
Merge pull request #2955 from codecombat/leagues
...
Leagues!
2015-08-19 15:34:54 -07:00
Nick Winter
f4d796a717
More ladder page support for leagues. Linking to clan league pages from clans pages.
2015-08-19 15:30:37 -07:00
Nick Winter
11f9238a91
Added Robot Ragnarok limited time challenge.
2015-08-19 12:16:48 -07:00
Nick Winter
32ca453dec
Added /play/ladder/levelID/clan/clanID clan-specific ladder pages.
2015-08-15 06:45:38 -07:00
Nick Winter
52aa877f46
Cleaned up an old file.
2015-08-13 08:30:18 -07:00
Nick Winter
49dc71a157
Added a Bloc coupon code after A Mayhem of Munchkins.
2015-08-12 10:25:56 -07:00
Nick Winter
7ee155278d
Not showing the 'Course: ' in course level names to teachers/players in the obvious places.
2015-08-10 12:01:03 -07:00
Nick Winter
79ea3258f1
Added GitHub link to community page.
2015-08-08 10:26:13 -07:00
Nick Winter
4d697a43ab
Added kids coding on homepage.
2015-08-08 05:35:08 -07:00
Matt Lott
985cfa2c56
Courses UI - Update free course button copy
2015-08-07 10:12:11 -07:00
Nick Winter
69e7c68784
Hide Kithgard Mastery from slow/young players, and highlight it once for fast/old players. Fix clan button link.
2015-08-07 07:33:30 -07:00
Nick Winter
66212b0559
Don't show victory text for hero levels. New Clans button. Floor stretching support for firn cliff.
2015-08-05 16:17:27 -07:00
Matt Lott
697b0e9e42
Courses UI - Clean up details page summary
2015-08-05 10:58:12 -07:00
Matt Lott
579f63c059
Courses UI - Clean up course details page titles
2015-08-05 09:53:54 -07:00
Matt Lott
d47f41548c
Courses UI - Show progress to students by default
2015-08-05 09:44:19 -07:00
Matt Lott
ea90b93bd2
Courses UI - Consolidate class settings into single modal
2015-08-05 09:35:18 -07:00
Matt Lott
1b21a677dc
Courses UI - Updating copy on landing page
2015-08-04 20:01:13 -07:00
Matt Lott
38efeb119c
Courses UI - take class size as buy input instead of bucketizing
2015-08-04 15:33:02 -07:00
Matt Lott
60e21600b8
Course details - use given instance
2015-08-04 15:33:02 -07:00
Matt Lott
55a58ef0b3
Courses UI - update button text based on enrolled or not
2015-08-04 15:33:02 -07:00
Matt Lott
36cc9b5f18
Update courses landing page sales copy
2015-08-04 15:33:02 -07:00
Matt Lott
9547bd1021
Add sales copy to beginning of courses landing page
2015-08-04 15:33:02 -07:00
Nick Winter
3f323d27d0
Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels.
2015-08-04 11:35:10 -07:00
Matt Lott
4ef6d471ee
Course UI - bold enrolled marker on course tiles
2015-08-04 11:30:06 -07:00
Matt Lott
bfd4b4f0ca
Courses UI - Update landing page flow
...
Simplify initial options, add course instance selection.
2015-08-04 11:21:02 -07:00
gnerkus
835074e5e6
chore (coding tips): Add more quotes for #710
2015-07-31 21:58:10 +01:00
Matt Lott
8fe189f915
Course details page student level progress popups
2015-07-30 16:04:13 -07:00
Matt Lott
59c730ef20
Add aggregate student progress to course details page
2015-07-30 15:30:36 -07:00
Matt Lott
14b4b83148
Move course purchase details off buy button
2015-07-30 13:54:02 -07:00
Matt Lott
c3430ff3e1
Add free teacher trial to course purchase page
2015-07-30 13:54:02 -07:00
Matt Lott
1eb9162463
Add more course info gameplay screenshots
2015-07-29 16:11:06 -07:00
Matt Lott
c5efdb97e1
Course details mock UI edit dialogs
2015-07-29 16:11:06 -07:00
Matt Lott
2baf18ef56
Course mock UI redeem code dialog
2015-07-29 16:11:06 -07:00
Matt Lott
822d25984f
Merge pull request #2910 from trotod/fix-clan-details-style
...
Fix clan details style
2015-07-29 10:22:36 -07:00
Matt Lott
30e8fc2397
Courses: Link to campaigns, add intro course instances
...
Courses will now use campaign levels instead of mock data if available.
At the moment only the first intro course has a campaign specified
(‘intro’).
2015-07-29 09:51:01 -07:00
David Liu
3bf3321411
Fix weird styling on clans details page
...
- add `display: table-cell` on hero portrait cell
- middle align more things
- `Name` should be a table header
2015-07-26 12:39:43 -07:00
Sean P. Kane
6205ff26ae
Add a tip for the loading screen #710
2015-07-25 14:05:32 -07:00
Nick Winter
15ecc92abc
Adding 'course' type levels. Removing 'campaign' type levels.
2015-07-24 17:37:42 -07:00
Imperadeiro98
015ed33dbe
Updated i18n of delta.jade
2015-07-23 17:35:22 +01:00
Cat Sync
11aeb05e66
Limit to showing 6 concepts. For now, show the last 6 in the array.
2015-07-21 13:28:13 -04:00
Matt Lott
e70b8b8652
Add sorting to course details mock UI
2015-07-10 17:11:16 -07:00
Matt Lott
49a75d2d42
Update course info mock UI
2015-07-10 17:11:16 -07:00
Nick Winter
899aae5798
Consolidated extra resources.
2015-07-10 14:20:25 -07:00
Matt Lott
0b714e98d1
Update course info mock UI
2015-07-10 11:04:52 -07:00
Matt Lott
57f869379d
Add student view to course details mock UI
2015-07-10 10:37:41 -07:00
Matt Lott
0a2248393d
Update course details mock UI
...
Add student concepts progress.
Add level status and concepts covered.
Add mostly working level Play button.
2015-07-09 17:53:35 -07:00
Matt Lott
6831355649
🐛 Fix subs dashboard monthly churn and perf
...
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
Nick Winter
be19edb7a1
Merge pull request #2881 from Vikasgupta09/master
...
fix #2867 added i18n to some words of lvl save form
2015-07-07 16:09:53 -07:00
Nick Winter
45c249ac27
Not asking for resubscription in buy gems modal if already subscribed.
2015-07-07 11:50:55 -07:00
Nick Winter
07f81755b0
Added deprecation message to old arenas, highlighting new hero arenas instead.
2015-07-07 11:43:38 -07:00
Matt Lott
0c427ff440
Update teachers and sales copy with latest level and hour counts
2015-07-03 13:07:25 -07:00
Matt Lott
8d258c6943
Update private clans preview image and copy
2015-07-02 18:44:13 -07:00
Matt Lott
6a53237e65
Add member sorting to premium clan dashboard
2015-07-02 15:17:34 -07:00
Imperadeiro98
8a4645ebc6
Updated i18n of 'Status' in clan-details.jade
2015-07-02 21:50:28 +01:00
Matt Lott
a316924576
Add member concept maps to private clans
2015-07-02 13:23:26 -07:00
Vikas Gupta
4776ff8325
fix #2867 added i18n to some words of lvl save form
2015-07-02 11:40:37 +05:30
Matt Lott
af612afcdd
Mock course UI show last expanded complete level
2015-07-01 15:36:33 -07:00
Matt Lott
bee5d53457
Fix clan details html indentation
...
And reorder progress key.
2015-07-01 15:16:21 -07:00
Matt Lott
254d6a9d6b
Add course mock UI for student level progress
2015-07-01 15:16:20 -07:00
Matt Lott
71fd13276f
Update mock course details page
...
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
2015-06-30 16:53:37 -07:00
Imperadeiro98
0ef6dfcc30
Updated i18n in add-thangs-view.jade
2015-06-30 20:33:03 +01:00
Nick Winter
b0c7b50761
Added programming concept tags to campaign and level editor.
2015-06-30 11:27:58 -07:00
Nick Winter
be2f47c79a
Merge pull request #2857 from laituan245/for2806_teacher_survey
...
Fixes #2806 (radio buttons of teacher survey page)
2015-06-29 19:37:06 -07:00
Imperadeiro98
e1e1328906
Updated i18n in account-settings-root-view.jade
2015-06-29 20:26:45 +01:00
Matt Lott
e36cf0ca3f
Initial courses mock UI
...
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00
Nick Winter
39f8a8a8af
Fixed #2870 .
2015-06-29 11:13:15 -07:00
Nick Winter
d7f88c3d95
Merge pull request #2856 from laituan245/for2854
...
Fixes #2854
2015-06-29 11:03:47 -07:00
Imperadeiro98
f4e54d4f54
Updated i18n in add system
2015-06-28 11:43:53 +01:00
Imperadeiro98
737dd56754
Updated i18n in save-version-modal.jade
2015-06-27 12:40:41 +01:00
Imperadeiro98
d868894845
Updated i18n in play-account-modal.jade
2015-06-27 12:39:42 +01:00
Lai Tuan
1453c132fe
Fixes #2806
2015-06-25 23:58:12 +09:00
Lai Tuan
29d19ffc37
Fixes #2854
2015-06-25 23:30:13 +09:00
Nick Winter
270340a79f
Removed Learnable.
2015-06-24 09:18:13 -07:00
Nick Winter
aa1150768f
Propagated i18n.
2015-06-22 11:59:28 -07:00
Imperadeiro98
cbf65ff352
Removed unnecessary i18n from about page
2015-06-22 19:18:18 +01:00
Lai Tuan
39fc882303
Require user password for deleting accounts #2842
2015-06-20 23:12:26 +09:00
Nick Winter
593f7a9dd7
Some improvements for handling new art.
2015-06-16 13:50:33 -07:00
Matt Lott
8df49b036b
Merge pull request #2831 from trotod/fix-achievement-dates
...
Show correct achievement earned dates on user page - fixes #2524
2015-06-15 13:21:23 -07:00
Lai Tuan
aabae7082e
Add Contact section to About page #2822
2015-06-15 19:11:48 +09:00
David Liu
1c633a8ee4
Show correct achievement earned dates on user page
...
fixes #2524
2015-06-14 15:40:14 -07:00
Nick Winter
a85d52ebe2
Made a tabbed interface for Programmaticon V's Vector and standard library documentation.
2015-06-10 15:18:37 -07:00
Nick Winter
4e08d453b7
Added some code for the glacier world.
2015-06-08 13:20:54 -07:00
Matt Lott
021ff541e4
Add separate school field for teacher survey
2015-06-08 06:39:30 -07:00
Matt Lott
9b37c9f18a
🐛 Fix trial request onclick
2015-06-08 06:27:40 -07:00
Imperadeiro98
198806bfc9
Removed hard-coded strings...
...
... from teachers-free-trial.jade
2015-06-08 14:16:24 +01:00
Matt Lott
12b28234a7
Update teacher trial copy
2015-06-05 15:18:47 -07:00
Imperadeiro98
df9a115eb0
Added i18n to teachers-free-trial.jade
2015-06-05 20:49:03 +01:00
Imperadeiro98
10937bfaf8
Minor changes to teachers.jade
2015-06-05 20:46:32 +01:00
Matt Lott
d7cddcb136
Teacher trial subscription form
...
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
2015-06-05 06:48:19 -07:00
Imperadeiro98
32b4a7d76f
Updated i18n (part 3)
2015-05-16 19:31:40 +01:00
Imperadeiro98
bfd18471a5
Updated i18n (part 2)
2015-05-16 19:24:49 +01:00
Imperadeiro98
a2b846e3fd
Updated i18n
2015-05-16 14:45:51 +01:00
Imperadeiro98
74380cc94a
Updated i18n (part 1)
2015-05-16 14:31:24 +01:00
Imperadeiro98
482d795146
Updated i18n
2015-05-16 14:16:13 +01:00
Imperadeiro98
ec9906c9ae
Updated i18n
2015-05-16 13:58:23 +01:00
Imperadeiro98
8a1bbec80e
Updated i18n
2015-05-16 13:57:46 +01:00
Imperadeiro98
6dbb9dd72b
Updated i18n
2015-05-16 13:55:41 +01:00
Nick Winter
c7c27d3208
Added missing half of recent loading quotes addition.
2015-05-14 11:30:14 -07:00
Matt Lott
81ec591b50
Swap teachers and blog menu links
2015-05-12 15:24:03 -07:00
Matt Lott
959fe434ea
Update /teachers site license copy
...
We don’t support site licenses yet, but can do one-time bulk purchases.
2015-05-12 15:18:42 -07:00
Matt Lott
6dc51e27e4
🐛 Admin dashboard deleted users
...
Also disabling invoice caching to see if that is what causes invalid
sub end counts.
2015-05-11 10:37:44 -07:00
Matt Lott
0353be4fc4
Add recent cancellations table to dashboard
2015-05-06 15:23:46 -07:00
Imperadeiro98
27b2b53943
Added a spr to replace a spl
2015-05-06 18:07:17 +01:00
Matt Lott
e2f18de220
Update /teachers page copy
...
Add blurb about one-time purchase site license option.
2015-05-05 20:33:37 -07:00
Matt Lott
103abdbfb0
Add teachers forum link to /teachers page
2015-05-05 15:35:22 -07:00
Matt Lott
901c0ed085
Update managed subscriptions copy
...
Add blurb about recipients needing to be existing CodeCombat users
2015-05-05 15:18:35 -07:00
Matt Lott
dce8005169
Fix admin dashboard monthly churn
...
Monthly churn = cancelled during last month / total at beginning of
month
2015-05-01 17:26:22 -07:00
Matt Lott
5305d80887
Add conversion info to admin dashboard
2015-05-01 09:37:47 -07:00
Nick Winter
def6709c52
Added /identify page.
2015-04-30 13:36:32 -07:00
Matt Lott
03bf357a84
Update /teachers copy
2015-04-28 11:35:24 -07:00
Matt Lott
f7503f5dba
Expanded progress private clans toggle
...
Expand option for level bubbles in the private clan dashboard.
2015-04-28 10:31:35 -07:00
Matt Lott
a995fb938b
Update clans UI
...
Update private clans dashboard to show level progression in order, and
visually indicate which levels are not completed/started/completed.
Update private clans blurb and screenshot.
Subscribe prompt on make private clan checkbox.
2015-04-28 09:22:58 -07:00
Nick Winter
80af32180c
Fixed #1638 : detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.
2015-04-25 17:29:02 -07:00
Matt Lott
1e688f1d61
Clan details view solution
...
Click on a level progression cell to observe the level session in a new
tab.
2015-04-23 14:31:21 -07:00
Matt Lott
59de47069a
Add sponsored subs to admin dashboard
2015-04-23 13:34:43 -07:00
Imperadeiro98
f4ecdfeb98
Changed some spr and spl...
...
... in add-thang-components-modal.jade
2015-04-23 20:58:57 +01:00
Imperadeiro98
fb63b0b240
Removed unnecessary spl's...
...
... from community page
2015-04-23 20:47:09 +01:00
Nick Winter
155246173a
Only showing general i18n coverage for languages with more than one family.
2015-04-22 13:13:24 -07:00
Matt Lott
502a47e912
Admin dashboard perf
...
Find subscription cancellations via events API instead of walking each
customer and their subscriptions.
2015-04-21 15:58:45 -07:00
Matt Lott
5eb65e49fe
Add private clans to /teachers copy
2015-04-21 11:41:48 -07:00
Matt Lott
b918408061
Add private clans to subscribe modal
2015-04-21 11:14:49 -07:00
Matt Lott
c9a7f6773d
Speed up clan details page
...
Only fetch level sessions and achievements for 200 members.
Display members with more data first.
Show average clan achievements instead of total achievements.
General css cleanup.
2015-04-20 16:20:52 -07:00
Matt Lott
c900310c8e
Merge branch 'clans'
2015-04-20 14:42:48 -07:00
Matt Lott
f80a73ae9b
Decouple clan type from dashboard details
...
Adding dashboardType field, private clans automatically set this to
‘premium’.
2015-04-20 14:04:22 -07:00
Nick Winter
63596aa6b5
Fixed #2450 : added i18n for new items in the victory modal.
2015-04-18 21:10:35 -07:00
Nick Winter
b358296120
Fixed #2420 . Fixed #2605 . Can now change programming language from LadderPlayModal.
2015-04-18 16:57:02 -07:00
Nick Winter
86ae0979c5
Working on #2505 ; do we have TLS for the analytics server yet?
2015-04-18 16:02:18 -07:00
Nick Winter
7471b14c4d
Fixed #2013 : removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution.
2015-04-18 15:52:24 -07:00
Nick Winter
1952a8ea23
Fixed #2305 : removed CSS initial keyword usage.
2015-04-17 11:42:38 -07:00
Nick Winter
2eb95c32df
Propagated i18n.
2015-04-16 18:35:40 -07:00
Matt Lott
45c070209b
Update private clans dashboard
2015-04-16 15:26:14 -07:00
Matt Lott
2f8831ea72
Show clan type in My Clans list
2015-04-15 11:12:35 -07:00
Matt Lott
2b29e755fe
Make clan name and description editable
2015-04-15 11:09:43 -07:00
Nick Winter
75b3361efe
Fixed #2390 . Fixed #2391 . Added hero-ladder and replayable particles to campaign level banners, plus replayable difficulty indicators.
2015-04-13 17:07:13 -07:00
Nick Winter
a7bb97e5f2
Fixed #2649 : made leaderboard buttons more obvious.
2015-04-13 16:26:58 -07:00
Nick Winter
8649383a8c
Fixed #2416 : LadderTabView now shows hero portraits.
2015-04-13 16:17:22 -07:00
Matt Lott
6d892359c7
Private clans UI
...
Add private checkbox for clan creation.
Add info popover for private clans.
Subscribe prompt for create/join if necessary.
Don’t list private clans in public list.
2015-04-10 14:33:16 -07:00
Nick Winter
7e2caddd02
Fixed #2579 by moving parent button popover content to jade.
2015-04-10 13:47:06 -07:00
Matt Lott
5c40221ab2
Update admin subs dashboard
...
Using invoices to aggregate totals which should provide a more accurate
growth rate.
2015-04-10 11:27:59 -07:00
Nick Winter
2eec3e7831
Simplified share progress email to just share with parents, not friends.
2015-04-08 18:31:13 -07:00
Matt Lott
b500e5334a
Update admin subs dashboard
2015-04-08 11:53:26 -07:00
Imperadeiro98
ce56312120
Changed some spr and spl in contact form
2015-04-08 19:31:52 +01:00
Nick Winter
e6c200b64d
eye-open instead of eye-close for non-English leaderboard view buttons.
2015-04-08 09:46:55 -07:00
Nick Winter
817e382324
Updated VCS link/blurb for Lost Viking.
2015-04-08 09:44:15 -07:00
Nick Winter
2103c6b4e0
Shared ranks in case of ties for Zero Sum.
2015-04-07 21:10:41 -07:00
Nick Winter
497978b27d
Preparing Zero Sum tournament results.
2015-04-07 20:56:24 -07:00
Matt Lott
f3c973b945
Add payment methods to subscribe dialog
...
And update level counts in subscription breakdown.
2015-04-07 15:54:59 -07:00
Nick Winter
8e715560c2
Using a watch button instead of an eye icon for leaderboards in English.
2015-04-07 15:32:41 -07:00
Matt Lott
3c755d39e6
Add recent subscribers to admin dashboard
2015-04-07 15:00:53 -07:00
Imperadeiro98
ef19612ab2
Changed some spr and spl in community page...
...
... so that links don't get over-underlined
2015-04-07 21:51:57 +01:00
Nick Winter
3ec2d776e6
Improved style for programming concept display in campaign view.
2015-04-07 13:32:18 -07:00
Nick Winter
b388d25435
Hooked up Viking Code School offer for players who beat Lost Viking.
2015-04-07 11:19:22 -07:00
Nick Winter
7f41ad6c52
Added OSTraining and Breakout Mentors resources.
2015-04-07 09:25:42 -07:00
Nick Winter
8673cca96c
Added Viking Helmet reward icon and removed Master Sword reward icon. Not showing Apocalypse particles after you have beaten it. Fixed #2580 .
2015-04-07 09:05:13 -07:00
Nick Winter
f1d14d5bcb
Updated Zero Sum tournament blurb now that it has ended.
2015-04-06 17:05:39 -07:00
Matt Lott
51e077215e
Add monthly growth to admin dashboard
2015-04-06 16:58:36 -07:00
Matt Lott
7cd71b6146
Add clans blurb to /teachers
2015-04-06 16:11:54 -07:00
Matt Lott
a77e9cafe9
Merge branch 'clans'
2015-04-06 11:18:08 -07:00
Matt Lott
43fb8ed462
Add clans link everywhere
...
Top-level menu, world view, user profiles.
Will add to /teachers later.
2015-04-06 11:17:13 -07:00
Nick Winter
08ea51d1d9
Updated default hero costs for the bug where it didn't load them properly. Probably fixed typo in Polish teachers blurb thing.
2015-04-06 10:52:55 -07:00
Matt Lott
7f0e9e73a8
Add latest achievements to clan details page
2015-04-06 10:19:35 -07:00
Matt Lott
d4aa9882a9
Update clan buttons UI
...
And remove temporary test logging.
2015-04-06 10:07:16 -07:00
Matt Lott
cc7bb406ec
Add language icon to clan details page
2015-04-03 17:21:30 -07:00
Matt Lott
b7fd2a89ee
Add hero icons to clan details page
2015-04-03 16:44:35 -07:00
Nick Winter
a426f34b55
A couple tweaks to the Polish blurb.
2015-04-03 16:22:45 -07:00
Nick Winter
1d5b1f1c6c
Added Polish IT Leader Club blurb.
2015-04-03 16:21:31 -07:00
Matt Lott
b808fa5276
Add favorite language to clan details page
2015-04-03 15:52:16 -07:00
Matt Lott
565cd9cf50
Add clan invite link on details page
2015-04-03 14:48:00 -07:00
Matt Lott
5ae93cd6ab
Add clan description field
2015-04-03 14:09:43 -07:00
Matt Lott
db1e8f0cb4
Update clan copy to chieftain and heroes
2015-04-03 13:22:07 -07:00
Matt Lott
39990ee151
Sort and limit clan lists
...
Clan lists sorted by member count, then created date.
Public clans lists limited to 100.
Member lists sorted by slug.
2015-04-03 12:22:44 -07:00
Matt Lott
dfff871c58
Add achievements to clan details view
2015-04-03 11:05:37 -07:00
