Commit graph

3223 commits

Author SHA1 Message Date
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Matt Lott
a851b7129a 🐛Fix teacher course management null check 2015-11-30 10:41:57 -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
11e9a40645 Finish hooking up ChangeCourseLanguageModal into /courses 2015-11-29 18:25:57 -05:00
Scott Erickson
8662fb057f Fix /courses when not joining 2015-11-29 18:20:38 -05:00
Scott Erickson
87c7bafd57 Add join-class functionality to /courses 2015-11-29 18:13:31 -05:00
Scott Erickson
405785bafe Add completion stats to /courses 2015-11-29 17:18:24 -05:00
Scott Erickson
07ad8382cc Project sessions loaded in /courses 2015-11-29 16:17:55 -05:00
Nick Winter
ee6be55a9d Don't load sounds from level while muted 2015-11-29 12:32:04 -08:00
Nick Winter
95c703a7df Simulate games in background while playing levels if we think there's extra compute power 2015-11-29 12:30:19 -08: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
46e738a737 Collapse sets of achievements in achievements list 2015-11-28 08:39:05 -08:00
Rob
e6afb51085 First pass at showing indention guides. 2015-11-27 20:46:55 -05:00
Nick Winter
a6f980dab1 Support for pre-configuring hero on Assembly Speed 2015-11-27 12:12:58 -08:00
Scott Erickson
d4540af780 Merge branch 'master' into courses-vhoc 2015-11-27 10:43:15 -05:00
Nick Winter
d465a3080d Merge branch 'master' of https://github.com/codecombat/codecombat 2015-11-25 16:51:27 -08:00
Nick Winter
88cca795c6 Don't try to autorank anonymous users playing autoranked ladder levels 2015-11-25 16:51:12 -08:00
Nick Winter
8d444e7ce8 Fix returning to course-ladder in HeroVictoryModal when arrived at via next-level button 2015-11-25 16:50:42 -08:00
Matt Lott
c385aaa414 Merge branch 'master' into courses-vhoc 2015-11-25 16:11:36 -08:00
Matt Lott
7b01fd7b65 Add course name to victory modal 2015-11-25 14:23:35 -08:00
Matt Lott
24345cf296 Course victory modal current and next level names 2015-11-24 16:46:27 -08:00
Nick Winter
b44714a60b Fix achievement loads never happening if you didn't earn any of them 2015-11-24 13:49:38 -08:00
Nick Winter
9f0a843593 Enable auto-submission to ladder for Wakka Maul 2015-11-24 13:35:15 -08:00
Imperadeiro98
01c7efb78a Merge pull request #3205 from criptonauta/patch-3
Update DiplomatView.coffee
2015-11-24 21:20:06 +00:00
Nick Winter
67f14c7928 Try putting AI players in league ladders 2015-11-24 13:18:38 -08:00
criptonauta
fddd11f9b4 Update DiplomatView.coffee 2015-11-24 18:16:10 -03: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
Nick Winter
d675e14f59 Fix issue returning to ladder when playing course-ladder levels outside of a course arena 2015-11-24 08:36:57 -08:00
Nick Winter
65890130bb Change how goals are expanded/collapsed at beginnings of levels 2015-11-24 08:28:05 -08:00
Scott Erickson
2adb3362ed Add ChangeCourseLanguageModal to CoursesView 2015-11-23 11:52:15 -06:00
Scott Erickson
03a38f6129 Remove some logs 2015-11-23 08:53:13 -08: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
Matt Lott
1f962e7667 Fix analytics /db GET URL 2015-11-22 09:26:35 -08:00
Nick Winter
21810be8eb End an A/B test 2015-11-22 07:53:49 -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
9292396dad Add logout link to HourOfCodeView when signed in 2015-11-20 18:22:52 -08:00
Scott Erickson
27b21d0c4e Add classroom code handling to StudentSignUpModal 2015-11-20 18:02:02 -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
65dd571041 Fix StudentLoginModal when email or password is not included 2015-11-20 15:17:04 -08:00
Scott Erickson
f7f405b774 Remove colons from template, unused formValues from view 2015-11-20 14:52:13 -08:00
Scott Erickson
f8a5baa4f6 Finish StudentLoginModal implementation 2015-11-20 13:59:43 -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
Nick Winter
7ede7928ca Fix typo in course ladder links 2015-11-20 07:17:16 -08:00
Nick Winter
be00cae1df Fix returning to course ladder from arena modals 2015-11-19 16:36:29 -08:00
Nick Winter
9049d2498e Fix #3179: pending patches collections using _ instead of . 2015-11-19 15:41:20 -08:00
Nick Winter
7fdd6d5180 Fix #3174: save button triggering on delete/reset account form fields 2015-11-19 15:37:37 -08:00
Nick Winter
9ccd03f8d6 Make /teachers -> /courses/teachers?hoc=true more reliable 2015-11-19 15:32:52 -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
e80544e215 Don't show Capture Their Flag clan ladder yet 2015-11-19 14:47:41 -08:00
Nick Winter
93fccaa23f Show humans vs. ogres for Wakka Maul ladder 2015-11-19 14:47:25 -08:00
Imperadeiro98
480a310313 Add sound to Facebook login 2015-11-19 21:36:57 +00:00
Nick Winter
ef7618497f Fix #3184: get more of our campaign overworld properties we need 2015-11-19 13:20:42 -08:00
Nick Winter
3926204f47 Don't do course arena league for solo course ladders 2015-11-19 13:20:21 -08:00
Nick Winter
c8ceca4d3d Add user.courseInstances, use it for course ladders 2015-11-19 10:41:31 -08:00
Imperadeiro98
094743c4f5 Fix #2916 2015-11-19 17:05:00 +00: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
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
6a54c7cf54 Add classroom name, description, and language editing, and classroom language infrastructure 2015-11-17 16:10:23 -08:00
Nick Winter
a0038602a1 Fix some course level submit button behavior, also help mirror session scoring 2015-11-17 15:26:10 -08:00
Nick Winter
a5fc31dbb3 Allow multiplayer levels to earn achievements 2015-11-17 15:23:35 -08:00
Nick Winter
01c9948b5b Favor complete over incomplete sessions in CampaignView flag status 2015-11-17 15:23:34 -08:00
Rob
7a86f754df Add flavor to overworld. 2015-11-17 11:27:08 -08:00
Rob
991fead0f6 Create specific campaign view for campaign selection screen. 2015-11-17 11:15:56 -08:00
Nick Winter
0abb9a38ad Use nanoscroller to allow intro doc scrolling 2015-11-15 08:23:12 -08:00
Nick Winter
ef72286864 Don't autoplay hero or course levels by default. Fix Course: Known Enemy autocomplete string format. 2015-11-15 07:59:20 -08:00
Nick Winter
5d9d5c0ae6 Remove ProblemAlertView help button 2015-11-14 17:33:05 -08:00
Nick Winter
aee2f7c219 Add loading indicators, hide UI pre-load for /play 2015-11-14 17:30:37 -08:00
Nick Winter
b31e5fc93a Fix user.code.problem routes to use . instead of _ 2015-11-14 16:32:21 -08:00
Rob
c0d9c231bc Normalize some URLs that used both .s and _s to use only .s 2015-11-13 15:16:03 -05:00
Matt Lott
c7a7a9d3ac Redirect /teachers to /courses/teachers?hoc=true
Will update /teachers soon with relevant information, but at the moment
it is too outdated.
2015-11-13 10:30:37 -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
356f65561c Add ladder banner images to ladder home 2015-11-12 16:30:56 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Matt Lott
e6e0617945 Tracking property for admin added course headcount 2015-11-12 12:16:40 -08:00
Nick Winter
910dd8e6b6 Use course access control for shared course hero levels 2015-11-12 11:00:54 -08:00
Nick Winter
cb101c7905 Replace simple loops while while True in course level sample code 2015-11-12 11:00:51 -08:00
Nick Winter
fe05e66458 Give Campaigns types so that course campaigns can share hero levels 2015-11-12 10:25:25 -08:00
Nick Winter
f7f7cd683e Allow using hero levels as course levels. Refactor current course tracking to use GET parameters. 2015-11-12 10:25:25 -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
Matt Lott
df57e99957 Don't block videos in guide for course levels
https://app.asana.com/0/54269205393657/61779149610165
2015-11-12 06:05:21 -08:00
Nick Winter
29892a9619 Add user country to contact messages
https://app.asana.com/0/54275583589675/64698696631078/f
2015-11-11 15:43:25 -08:00
Nick Winter
fae1411e3a Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes 2015-11-11 09:07:16 -08:00
Nick Winter
f6307ac04e Made while True snippets work in course levels 2015-11-11 07:41:52 -08:00
Nick Winter
42b53dff20 Fix camera and spectate bugs with new loading intro behavior 2015-11-11 06:42:12 -08:00
Matt Lott
1c0550ff9f 🐛Fix admin analytics date bugs 2015-11-10 17:26:15 -08:00
Scott Erickson
d9d5dce2e0 Merge branch 'master' into course-correction 2015-11-10 16:34:33 -08:00
Nick Winter
7e433b9e12 Use ?intro=true to show intro screen even after level completion 2015-11-10 16:09:21 -08:00
Nick Winter
2259076800 LoadingScreen -> level intro behavior 2015-11-10 15:22:09 -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
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
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
Scott Erickson
f7a41dc91a When a student joins a classroom, they also join all course instances for that classroom which are free to join 2015-11-09 13:29:49 -08: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
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
Nick Winter
ad240152c6 Fix #3159 2015-11-06 13:00:23 -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
Rob
39a97135de Explicitly check for selection when overriding return. 2015-11-05 10:14:53 -08:00
Rob
cde3b252da Don't load user sessions on non premium dashboards. 2015-11-04 16:57:48 -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
Nick Winter
34715befcc Increment user's concept stats on level completion 2015-11-04 13:42:09 -08: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
d987b644a9 Merge remote-tracking branch 'origin/master' 2015-11-04 10:54:59 -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
Nick Winter
1b4f6262cb Exclude non-selected code language documentation blocks from level guides 2015-11-04 10:46:16 -08:00
Nick Winter
0caf9c3547 Fix avatars not showing up in HUD.
Asana 54271591170319
2015-11-04 10:26:54 -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
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
Scott Erickson
429f2c2839 Fix renderSelectors to handle selectors with multiple targets 2015-10-30 11:05:24 -07:00
Nick Winter
504e65ec27 Commit client-side code for acdfe7c 2015-10-30 09:43:05 -07:00
Nick Winter
f100d6dba6 Merge pull request #3118 from codecombat/soffes/ipad
[WIP] Changes for iPad app
2015-10-29 16:24:39 -07:00
Rob
e048848d6b Add 50% more room for fingers in the autocomplete box. 2015-10-29 18:16:58 -04:00
Rob
75c63a0ace When pressing enter with an active selection, just make a new line under it. 2015-10-29 18:16:23 -04:00
Matt Lott
8b254164c9 Free course enrollment for admins 2015-10-29 14:09:19 -07:00
Rob
f0e1fc1f77 Let API properties declare their return values should be captured.
Auto complete will know when to add a variable asingment.
2015-10-29 15:07:19 -04:00
Scott Erickson
48c10d214d Make highlight pointer disappear immediately and move off screen when hidden
It causes problems in IE10 and lower, because the css property pointer-events
does not work in those browsers. So fixed that by moving the arrow out of the way.
2015-10-28 14:01:37 -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
Nick Winter
20f2abfb37 Propagate i18n 2015-10-28 06:26:01 -07:00
Rob
da92e15bfb Give some API properties priority in autocomplete. 2015-10-27 23:23:43 -04:00
Scott Erickson
6e1cb8a1d1 Add owner name to course details page 2015-10-27 17:47:48 -07:00
Scott Erickson
9e04d425cc Levels link in ControlBarView goes to last visited course instance page for course levels 2015-10-27 17:04:07 -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
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
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
Nick Winter
afa410a370 Added Ace of Coders tournament rankings. 2015-10-26 13:30:49 -07:00
Scott Erickson
3df4f26293 Remove a test wrench thrown into CommunityView 2015-10-23 10:50:21 -07:00
Scott Erickson
fad9d0a757 Remove auto-reload delay, see if we can do without it now
According to a comment now deleted, we had auto reload delay 300ms for race
conditions, mainly onCompile tweaking source map file sourceMappingURL values.
That only happens in production now, though, so let's try removing it for development.

Original comment added: 5104f0a1e7
Michael deleted it :( 6d7864c415
2015-10-23 10:47:01 -07:00
Imperadeiro98
8a8d8c9d23 Fixed use of i18n in popover 2015-10-23 16:54:42 +01: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
Nick Winter
4af6162c5c Replace simple loop docs with while-true docs in course levels 2015-10-22 10:29:10 -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
57c5384ec1 Refactor editor:save-new-version from a mediator event to a normal Backbone event
Part of a push to move away from global subscriptions when 'local' ones will do.
2015-10-21 15:34:07 -07:00
Scott Erickson
6636051765 Refactor HomeView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:18:13 -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
Matt Lott
3ed755076b Enable while True auto yielding for all level types 2015-10-20 06:42:46 -07:00
Nick Winter
b03091c35d Merge pull request #3123 from UltCombo/iframe-style
Remove iframe borders using CSS instead of DOM
2015-10-20 06:15:54 -07:00
UltCombo
2c97238a7f Remove iframe borders using CSS instead of DOM
This patch makes iframe borders render identically in all supported browsers (i.e. no border).

Although Chrome does not displays borders around iframes by default, Firefox and Edge (IE) had visible iframe borders prior to this patch. This is because, as [previously mentioned](https://github.com/codecombat/codecombat/pull/3122#discussion_r42338590), the DOM property was mistyped as `frameborder` when it should be `frameBorder`.

As this is presentational issue, it feels more appropriate to fix it using CSS. Therefore, I've removed the buggy JS code and added a generic CSS solution to reset iframes' border styling.
2015-10-19 22:58:51 -02:00
Matt Lott
cc642e7254 Auto yield while True loops for course levels 2015-10-19 16:46:53 -07:00
UltCombo
c02b311efa Allow embedded help videos to go fullscreen 2015-10-19 03:44:19 -02:00
Nick Winter
5f8ab8a212 Added support for test campaigns that don't save their levels/achievements 2015-10-16 16:06:53 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -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
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
Scott Erickson
1085731fdd Fix colorConfig prerendered sprite sheet data, comparison 2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e Have LayerAdapter use prerendered spritesheets (unfinished) 2015-10-13 16:43:56 -07:00
Nick Winter
74763f0614 Fix experience/gems not showing in HeroVictoryModal 2015-10-13 13:44:25 -07:00
Scott Erickson
3fc7b71f7a Remove log 2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498 Remove vestigial test code 2015-10-13 12:30:18 -07:00
Nick Winter
7584872c9f Fix #3106 introduced by b38a6c50 2015-10-13 08:22:13 -07:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -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
Scott Erickson
b38a6c5060 Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context 2015-10-12 16:46:30 -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
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Matt Lott
8fce82ce72 Update trial requests approval page query to grab latest
Used to be limited to first 2000 requests, which was hit on 10/7/15.
2015-10-09 14:26:04 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622 1. set periodEnd to the next month if subscription cancelled at periodEnd 2015-10-08 19:43:13 -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
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses
Default to 9999 instead.
2015-10-07 17:08:22 -07:00
Matt Lott
440bf9c6e0 /courses?_ppc=blah logged out message
Also trim /courses prepaid code input.
2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4 Separate URLs for /courses/students and /courses/teachers 2015-10-07 14:37:41 -07:00
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
Nick Winter
e0918ec631 Added mountain -> glacier completion link 2015-10-05 16:19:43 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a Add invite link and capacity info to CourseDetailsView 2015-10-05 16:01:32 -07:00
Nick Winter
d200ac4a32 Fix #2926: handle missing sub-code/spoken-languages in docs 2015-10-05 15:32:02 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
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
Nick Winter
4582a4499f Merge pull request #3059 from Imperadeiro98/master
Added i18n to courses
2015-09-27 19:52:52 -07:00
Matt Lott
5eadd926b3 Move redeem prepaid code UI out of modal 2015-09-25 15:21:51 -07:00
Nick Winter
f9b9ac8f86 Fix error in playing victory sound 2015-09-25 15:19:44 -07: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
18d64e64fb Merge pull request #3009 from Imperadeiro98/master
Use playSound across the code
2015-09-25 06:21:08 -07:00
Imperadeiro98
4f054fa31a Fixed issue with string interpolation 2015-09-25 14:00:03 +01:00
Imperadeiro98
4cd8d95c72 Removed an unnecessary console log 2015-09-25 13:12:06 +01:00
Matt Lott
feef9c0ac6 🐛Fix instance selection on /courses page 2015-09-24 17:52:00 -07:00
Matt Lott
d7d6694ee9 Update course level routing 2015-09-24 17:12:18 -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
3253ae456e Fix #3050: undefined simulation debugging tooltips 2015-09-23 08:24:35 -07:00
Nick Winter
144d6cfb32 Further disable social services in ladder 2015-09-21 14:16:23 -07:00
Nick Winter
1819911551 A/B/C test the first subscription prompt level 2015-09-18 08:28:04 -07:00
Nick Winter
dc10dc3b61 Add skip button to Bloc offer 2015-09-18 08:27:37 -07:00
Nick Winter
7a56ecfe4d Disabled auto-submit for Ace of Coders ranking. 2015-09-17 14:42:13 -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
Imperadeiro98
bd4063ed3a Use playSound across the code 2015-09-09 22:36:05 +01:00
Nick Winter
35ef48b108 Mirror ladder levels now copy source code to other side, too, not just transpiled code. Mirror sessions don't submit if there's a user code error. 2015-09-08 16:34:20 -07:00
Nick Winter
0153f8078d Disabled Io language choice until/unless someone finishes its parser. 2015-09-08 14:50:07 -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
6d5ddb65ea Not automatically showing melee ranges on action docs. 2015-09-08 06:31:19 -07:00
Nick Winter
0d2d1ddad0 A couple mirror match ladder tweaks. Made programmableMethods other code languages use proper code formatting. 2015-09-07 18:00:48 -07:00
Nick Winter
3768783ceb Don't be making LadderSubmissionViews in the CastButtonView unless it's a mirror match. 2015-09-04 18:11:19 -07:00
Nick Winter
a13ccb7360 Fixed DuelStatsView power totals including future units. 2015-09-04 17:21:33 -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
Nick Winter
89c644e084 Spectate mode starts paused until loading is done, and starts at time 1, so there is less stuttering during playback. 2015-09-03 15:22:25 -07:00