codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-14 17:51:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10788 commits 27 branches 0 tags 134 MiB
Commit graph

3181 commits

Author SHA1 Message Date
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
Nick Winter
98b0bcfc75 Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs. 2015-09-03 15:05:10 -07:00
Nick Winter
df60ecd09c Added multiplayer win/loss notice at end of level. 2015-09-03 13:32:20 -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
e6f61b545e ControlBarView handling playing non-latest versions of levels. 2015-09-02 14:54:44 -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
aa16348ded Remove target subs line from subs dashboard 2015-08-31 05:46:13 -07:00
Nick Winter
b383c6ac00 Updated inventory for Ace of Coders. 2015-08-30 07:28:35 -07:00
Nick Winter
88f6e528b1 Implementing goliath. Configuring goliath for Ace of Coders. 2015-08-29 08:02:20 -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
Nick Winter
d412a7d5ee Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users. 2015-08-28 10:45:07 -07:00
Matt Lott
066d6e7fc1 Courses UI: Add FAQ popup to landing page 2015-08-27 16:52:02 -07:00
Matt Lott
e10c5d9646 Allow year sub purchases on top of monthly subs 
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
 2015-08-27 09:45:10 -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
4392da1c20 Redirect to world selector after year sub purchase 2015-08-25 10:59:06 -07:00
Matt Lott
58ff820d7d Prompt for login on year subscription sale page 2015-08-25 10:12: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
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
Imperadeiro98
9cf4c06301 Added menu opening sound to PlayHeroesModal 2015-08-20 20:43:04 +01: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
3cfabf8122 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-08-19 12:16:23 -07:00
Nick Winter
36494acc5a Merge pull request #2949 from trotod/fix-interface-audio 
Fix some campaign interface audio
 2015-08-18 16:19:38 -07:00
Imperadeiro98
56291fc417 Use playSound in PlayItemsModal.coffee 2015-08-17 20:34:34 +01:00
David Liu
a242c41557 Play sound on Buy Gems press 
Partial solution to #2916.
 2015-08-16 18:59:21 -07:00
David Liu
18ac0e06a2 Cut out extra sound on Items/Achievements press 
Removes event listener on supermodel 'loaded-all' event.

Fixes #2915
 2015-08-16 18:59:21 -07:00
Nick Winter
32ca453dec Added /play/ladder/levelID/clan/clanID clan-specific ladder pages. 2015-08-15 06:45:38 -07:00
Lai Tuan
5795399aaa Fixed #2729 2015-08-15 04:04:00 +09:00
Nick Winter
f757f220be Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods. 2015-08-13 11:17:38 -07:00
Nick Winter
621e143544 Fixed bug with game menu not highlighting guide tab. 2015-08-13 11:09:26 -07:00
Nick Winter
a52e9a3189 Fixed #2939. 2015-08-13 05:58:46 -07:00
Matt Lott
9c39bf7656 Update prepaids to support multiple redeemers for a single code 
Will remove deprecated properties after updating production.
 2015-08-12 15:51:18 -07:00
Nick Winter
49dc71a157 Added a Bloc coupon code after A Mayhem of Munchkins. 2015-08-12 10:25:56 -07:00
David Liu
817d790fea Fix poll keys when key is a number 
jQuery converts data strings into a possible JavaScript value, so keys
like '0' and '1' get converted into numbers, which fails the validation
(it expects a string for a key).
 2015-08-08 08:50:18 -07:00
Matt Lott
ab9e3d39ee 👕Fix courses view linter warning 
warn: Linting of app/views/courses/mock1/CoursesView.coffee: warn:
ensure_comprehensions at line 72.

May be a linter bug, have filed an issue here:
https://github.com/clutchski/coffeelint/issues/482
 2015-08-07 12:03:09 -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
ea90b93bd2 Courses UI - Consolidate class settings into single modal 2015-08-05 09:35:18 -07:00
Matt Lott
c90fcada7d Update course names 2015-08-04 20:03:30 -07:00
Nick Winter
7ad16683ce Fixed error for non-course hero victory modals. 2015-08-04 17:41:42 -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
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
b53e4707d8 Update course names 
Trying different formats.
 2015-08-04 11:26:18 -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
Matt Lott
da6cf60381 Target specific levels with InspectletJS 
Currently targeting cupboards-of-kithgard.
 2015-08-03 15:52:52 -07:00
Nick Winter
8d09357a7a Fixed #2914: no disabling spaces for Clojure and other advanced/experimental languages. 2015-08-02 14:12:15 -07:00
Nick Winter
2eb3cfb93a Added Myanmar language (Burmese) stub. 2015-08-02 07:42:27 -07:00
Matt Lott
0768b533e2 Subs dashboard perf 
Caching older (at least 16 days) Stripe invoices in analytics
collection, which will be updated once a day via the analytics server
cron job.
 2015-07-31 16:19:40 -07: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
260d062014 🐛Fix courses jquery css typo 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
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
Matt Lott
48512060d5 🐛Fix subs dashboard fetch state typos 2015-07-28 15:51:09 -07:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Nick Winter
107f94a08b Fixed another cause of the bug fixed in 0d99b07b with modified levels still granting rewards. 2015-07-24 08:56:20 -07: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
Nick Winter
bcbffd1f65 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-07-10 12:54:25 -07:00
Nick Winter
929455b234 Fixed bug with heroes not loading the proper amount of gems. 2015-07-10 11:13:31 -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
Nick Winter
7173fd367f Re-enabled gutter highlights for executing code. 2015-07-10 09:39:08 -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
Nick Winter
36d3b8e910 Highlighting entry points is working pretty well, at least in Python through the forest. 2015-07-09 15:05:35 -07:00
Nick Winter
4f443efd8b First draft of logic to work out where the code entry points should be. 2015-07-09 12:47:07 -07:00
Nick Winter
dfa0de7521 Bad testing version of code entry point arrow numbering. 2015-07-09 11:45:11 -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
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -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
Matt Lott
a316924576 Add member concept maps to private clans 2015-07-02 13:23:26 -07:00
Matt Lott
a62e0a8fe6 👕Fix linter warning in mock course details view 
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
 2015-07-02 10:54:22 -07:00
Matt Lott
af612afcdd Mock course UI show last expanded complete level 2015-07-01 15:36:33 -07:00
Matt Lott
254d6a9d6b Add course mock UI for student level progress 2015-07-01 15:16:20 -07:00
tahmidshahriar
62b050f6d8 Merge remote-tracking branch 'upstream/master' 2015-07-01 10:54:37 -07:00
tahmidshahriar
f6dd3ce0c8 minimize changes 2015-07-01 10:22:25 -07:00
tahmidshahriar
60e27d386f add close buttonn to payment methods 2015-07-01 10:20:14 -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
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07:00
Nick Winter
8df32b47d0 Some tweaks to #2876. 2015-06-30 10:31:52 -07:00
Nick Winter
1d6f777b58 Merge pull request #2876 from tahmidshahriar/master 
Fixed email requirement
 2015-06-30 10:13:50 -07:00
tahmidshahriar
56b81f175e Fix email 2015-06-30 09:35:45 -07:00
Nick Winter
8155d6fba0 Merge pull request #2873 from UltCombo/gh-2740 
updateLevelRequiredItems: special-case rings, fixes #2740
 2015-06-29 19:46:55 -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
UltCombo
7d7d2d5f0e updateLevelRequiredItems: special-case rings, fixes #2740 
Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped.
If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.
 2015-06-29 21:25:43 -03: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
Matt Lott
8c6fd49f43 Clans view class name typo 2015-06-29 11:51:38 -07:00
Nick Winter
11d69880f7 Merge pull request #2868 from UltCombo/required-rings 
Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740
 2015-06-29 11:19:04 -07:00
Nick Winter
39f8a8a8af Fixed #2870. 2015-06-29 11:13:15 -07:00
UltCombo
63299c4d80 Improved updateLevelRequiredItems logic regarding rings, fixes #2740 
This fixes the main issue of #2740, allowing the player to play the level if the required ring is equipped on either ring slot.

There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.
 2015-06-27 22:22:37 -03:00
Lai Tuan
1453c132fe Fixes #2806 2015-06-25 23:58:12 +09:00
tahmidshahriar
f6a35f1fd4 Fixed not found page (got rid of NotFoundView in core) 2015-06-24 14:49:26 -07:00
tahmidshahriar
6ac3ea9f5f Fixed not found page 2015-06-24 14:46:59 -07:00
Lai Tuan
7c680e4efa Removed 'this' and 'tempThis' 2015-06-21 02:09:44 +09:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Matt Lott
d632119a6c Add 6 month graph to admin dashboard 2015-06-19 13:49:19 -07:00
Nick Winter
8ef4a9ddde Merge pull request #2830 from arthurnn/master 
i18N press enter on spell view
 2015-06-18 18:37:24 -07:00
Nick Winter
6a4efa9a21 Switching to Boom and Bust as first level of the forest. 2015-06-17 18:17:14 -07:00
Matt Lott
5fb8b18a31 🐛Fix managed subs next payment UI 2015-06-17 16:35:30 -07:00
Nick Winter
593f7a9dd7 Some improvements for handling new art. 2015-06-16 13:50:33 -07:00
Arthur Neves
6cb673e228
i18N press enter on spell view 2015-06-14 23:20:49 +02:00
Nick Winter
7d637a0a27 Added a couple levels' next-campaign links. 2015-06-14 11:07:21 -07:00
Imperadeiro98
2f9e9b1b67 Merge pull request #2818 from Zleep-Dogg/da-translation 
A bit of Danish translation pt. 2
 2015-06-11 11:24:26 +01:00
Esben Madsen
db25007765 A bit of Danish translation pt. 2 2015-06-11 00:35:56 +02: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
bb417e9a97 Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812. 2015-06-09 11:23:05 -07:00
nemoyatpeace
e0e62271b4 Added Ice Level to terrain generator 2015-06-09 18:30:40 +08: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
Nick Winter
0d99b07bc3 Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar. 2015-06-05 17:02:37 -07:00
Nick Winter
ccd96122e1 Tweaked Nalfar's hero modal positioning. 2015-06-05 15:13:22 -07:00
Matt Lott
02095a8ddd Update teacher survey email validation 
Removing restrictive regex matching.
 2015-06-05 11:47:12 -07: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
Matt Lott
54623f5e30 🐛Fix admin dashboard target line 2015-06-02 07:06:31 -07:00
Cat Sync
a3588b2801 Yellow arrow shouldn't point to disabled levels 2015-06-01 17:39:55 -04:00
Nick Winter
86d7b6c625 Added Uzbek (uz) language stub. 2015-05-25 16:00:32 -07:00
Imperadeiro98
1af308424f Merge pull request #2774 from Atomk/patch-2 
Added my username in Italian translators
 2015-05-24 12:18:02 +01:00
Cat Sync
b38c7b4978 Next Level arrow shouldn't point to Kithgard Mastery 2015-05-21 11:30:37 -04:00
Marco Fras
6db448b6c6 Added my username in Italian translators 
Just red on the diplomat forum to do this..
 2015-05-20 15:15:34 +02:00
Matt Lott
a881443bf2 🐛Fix admin dashboard typo 2015-05-15 09:56:06 -07:00