codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-04 21:01:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12478 commits 27 branches 0 tags 134 MiB
Commit graph

1346 commits

Author SHA1 Message Date
Nick Winter
26be2842ed Don't highlight Done button as much until winning replay has finished 2015-11-30 11:34:47 -08:00
Scott Erickson
0c45e3f96c Add ClassroomView, incomplete 2015-11-30 14:14:27 -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
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
Matt Lott
c385aaa414 Merge branch 'master' into courses-vhoc 2015-11-25 16:11:36 -08:00
Matt Lott
022cdf6d6e 🐛Fix homepage CSS on Windows 2015-11-25 12:27:42 -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
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
Scott Erickson
a98d0b1b2a Partial work on /courses view when signed in 2015-11-22 00:08:46 -08:00
Nick Winter
e1983f7556 Merge pull request #3191 from viettruong2194/text-overlap-contribute-page 
Change z-index of contribute tiles to prevent overlap between dropdowns for #3127
 2015-11-21 16:29:37 -08:00
Nick Winter
295a0e06e9 Merge pull request #3188 from viettruong2194/text-overlap-wooden-frame 
Fix top margin and height for game-menu for #2963
 2015-11-21 16:20:12 -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
aee1f6587a Add StudentSignUpModal to HourOfCodeView 2015-11-20 16:28:28 -08:00
Scott Erickson
7cd031064f Fix HourOfCodeView padding 2015-11-20 13:32:45 -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
Viet Truong
019995751f Change z-index of contribute tiles to prevent overlap between dropdowns for #3127 2015-11-19 23:59:43 -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
Viet Truong
62345aeb1d Fix top padding and margin for game-menu for #2963 2015-11-18 15:49:35 -08:00
Scott Erickson
7a6c42b89f Set up course-ladder level handling 
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
 2015-11-18 14:02:45 -08:00
Scott Erickson
6a54c7cf54 Add classroom name, description, and language editing, and classroom language infrastructure 2015-11-17 16:10:23 -08:00
Nick Winter
a725cd70d8 Update comment color to Robin's favorite blue 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
1603c72469 Move achievement popup to lower left to avoid covering up Continue button on small screens 2015-11-15 07:08:02 -08:00
Nick Winter
5d9d5c0ae6 Remove ProblemAlertView help button 2015-11-14 17:33:05 -08:00
Nick Winter
401d383ff4 Change gutter X to exclamation mark 2015-11-14 16:31:05 -08:00
Nick Winter
0dc0b51556 Hid loading intro scroll for now, bad scroll bars. 2015-11-11 05:53:01 -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
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
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
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
4c4b301925 Add functionality to TeacherCoursesView 2015-11-05 17:26:31 -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
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
Scott Erickson
a21d85c4ed Remove some vestigial commented out styling for AuthModal buttons 2015-10-28 14:40:07 -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
Scott Erickson
52395661f7 Fix SubscribeModal buttons on IE10 2015-10-28 11:48:15 -07:00
Scott Erickson
0228614ef6 Fix login icon placement on IE10 2015-10-28 11:34:00 -07:00
Rob Blanckaert
d26daf1dc0 Only show "press enter" for the selected line in autocomplete. 2015-10-26 15:39:22 -04: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
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
eda10a55ec Update /courses?_ppc= logged out instructions 2015-10-12 21:13:03 -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
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
a6f4085b13 Update course details progress colors 
Only show not started key when expanded progress.
 2015-10-08 06:10:12 -07:00
Matt Lott
a6e3110549 Update course details completed level/concept to light blue 2015-10-07 17:30:16 -07:00
Scott Erickson
2d2f4814f4 Add course membership required error to LevelLoadingView 2015-10-06 12:48:58 -07:00
Scott Erickson
3a90356f59 Add class invite system 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
Driphter
3b0bafd325 Fixed level/thang editor table for issue #3052 2015-09-26 20:07:36 -04:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
Nick Winter
c2c3ae4c4c Add /careers and Ace of Coders links to home page 2015-09-21 12:40:33 -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
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
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
Matt Lott
ad079f1ff9 🐛Fix trial requests approval page width overflow 2015-08-31 05:40:07 -07:00
Matt Lott
a1927bf8cc Courses UI: Update tabs on details page 2015-08-28 10:53:24 -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
a27c17ef0a Courses UI: Add image to sales blurb and quote 2015-08-27 16:19:37 -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
7d419c1615 Courses UI: add screenshot to landing page course blocks 2015-08-24 06:11:11 -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
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
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
11f9238a91 Added Robot Ragnarok limited time challenge. 2015-08-19 12:16:48 -07:00
Nick Winter
303c19a2dd Pulled in kids coding on homepage image to be visible on screens as small as 1280px wide. 2015-08-10 11:02:19 -07:00
Nick Winter
79ea3258f1 Added GitHub link to community page. 2015-08-08 10:26:13 -07:00
Nick Winter
e9e2866863 Added custom backgrounds for equip buttons. Shrunk equip text to fit for languages where it was overflowing. 2015-08-08 06:31:53 -07:00
Nick Winter
4d697a43ab Added kids coding on homepage. 2015-08-08 05:35:08 -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
1b21a677dc Courses UI - Updating copy on landing page 2015-08-04 20:01:13 -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
bfd4b4f0ca Courses UI - Update landing page flow 
Simplify initial options, add course instance selection.
 2015-08-04 11:21:02 -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
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
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
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07: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
Matt Lott
0b714e98d1 Update course info mock UI 2015-07-10 11:04:52 -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
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
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
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
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07: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
UltCombo
cc8b8fa8be fix #2828 2015-06-28 00:32:08 -03:00
David Liu
1716359fdf Limit multiplayer leaderboard name width even more 
adjusted max-width to 100px, fixes #2373
 2015-06-19 07:35:35 -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
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
d0f9456024 Admin dashboard width 100% 2015-06-05 06:48:19 -07:00
Nick Winter
9e2c29403b Re-fixed #2753. 2015-05-26 17:02:59 -07:00
Matt Lott
ee2540dcf2 🐛Fix choose hero icon widths 
Fixes #2753
 2015-05-12 20:49:08 -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
Matt Lott
0a6e2be7dd Update admin dashboard css 
Squish table columns.
 2015-04-23 21:00:33 -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
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
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
Nick Winter
0d81f658ae Fixed #2452: handling four and even five-digit gem/xp totals in victory screen. 2015-04-18 19:40:53 -07:00
Nick Winter
1952a8ea23 Fixed #2305: removed CSS initial keyword usage. 2015-04-17 11:42:38 -07:00
Matt Lott
45c070209b Update private clans dashboard 2015-04-16 15:26:14 -07:00
Nick Winter
4de9071f1a Added a projection to Clans getMemberSessions to help with the gargantuan fetch running us out of memory. 2015-04-16 08:03:19 -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
Nick Winter
588b7c9834 Fixed #2564: level info underlapping too-large game control buttons on tiny screens. 2015-04-13 15:53:02 -07:00
Nick Winter
e7df703d36 Fixed #2651: indicate better that sample code is locked when it won't let them type in there. 2015-04-13 15:04:42 -07:00
Nick Winter
e85c53ea42 Programming is good for your childrens's careerses, O dear parents. 2015-04-10 14:35:13 -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
Nick Winter
2eec3e7831 Simplified share progress email to just share with parents, not friends. 2015-04-08 18:31:13 -07:00
Nick Winter
f02a8b54f3 Fixed #2596. Stopped bless-brunch from using its cacheBuster feature. Set no-cache header for /db/model.type/slug so that we can use Cloudflare on /db/model.type/object-id. Fixed a coffeelint warning. 2015-04-07 19:03:35 -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
Matt Lott
3c755d39e6 Add recent subscribers to admin dashboard 2015-04-07 15:00:53 -07:00
Nick Winter
bf86b2f9cd Not including levels that are unlocked in later campaigns in level counts for earlier campaigns until they are started. 2015-04-07 14:32:51 -07: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
Matt Lott
51e077215e Add monthly growth to admin dashboard 2015-04-06 16:58:36 -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
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
32b48a3c4c Clans v1 UI with mock data 
Main clans view shows public list, user’s clans, and create clan form.
Clan details view shows clan details and members list.
 2015-03-31 13:28:57 -07:00
Nick Winter
0b1bb6a4aa Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490. Fixed #2515. Fixed #2304. 2015-03-28 13:54:44 -07:00
Matt Lott
532e8133c6 Add graph to sub counts admin page 2015-03-27 15:27:34 -07:00
Matt Lott
53de6c6134 Add current subscription counts view under the admin page 2015-03-27 15:27:34 -07:00
Nick Winter
155eb4a4a8 Fixed missing disabled success button illustrated image reference. 2015-03-27 14:47:59 -07:00
Nick Winter
3137eb05f0 Fix for extra-wide Zero Sum graphic in level info popover. 2015-03-27 11:50:08 -07:00
Nick Winter
ceb81494a0 Preparing for Zero Sum tournament starting tomorrow morning. 2015-03-26 21:05:46 -07:00
Nick Winter
7dff105cdf Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs. 2015-03-25 16:47:31 -07:00
Nick Winter
19e68f7c05 Improvements to spectate for big screens, allowing spectating of chosen top matches. 2015-03-20 15:32:35 -07:00
Matt Lott
fb8e184819 Update teachers page 2015-03-20 09:18:34 -07:00
Matt Lott
fec3ac38e9 Prepaid subscriptions 
Admins can generate a prepaid code, which a user can use to subscribe
for free via the account/subscription page.
The subscription will be identical to the normal monthly subscription
(e.g. 3500 gems per month), except they won’t be charged.
Does not require the recipient to enter billing information.
Can be applied to an existing subscription, which will be converted to
free.
Prepaid code can only be used once.
Prepaid subscription cannot be unsubscribed via the UI.
 2015-03-19 15:04:15 -07:00
Nick Winter
585fa40a8c Added first draft of campaign info to campaign selector screen. 2015-03-18 16:20:30 -07:00
Nick Winter
3236abc5da Added emphasis for Apocalypse. 2015-03-17 21:20:26 -07:00
Nick Winter
5e80bb60d0 Fixed scrolling issue on background on i18n edit pages. 2015-03-17 16:30:59 -07:00
Imperadeiro98
9913a155c7 Some styling updates to account-settings-view.sass 2015-03-17 18:57:16 +00:00
Nick Winter
8c28247906 Merge pull request #2509 from Imperadeiro98/master 
Some cleanup to play-items-modal.sass file
 2015-03-16 13:55:02 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
3458f2069b Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller. 2015-03-11 20:21:54 -07:00
Imperadeiro98
9fedd1f838 Some cleanup to play-items-modal.sass file 2015-03-11 22:13:16 +00:00
nixel2007
01c2cfce7c Update play-heroes-modal.sass for ru 2015-03-11 15:41:39 +03:00
laituan245
ae07a69bd7 Fixed issue #2497 2015-03-11 13:01:15 +09:00
laituan245
599f18344e Fixed issue #2497 for 'ru', 'pt-PT', and 'pt-BR' 2015-03-11 12:16:03 +09:00
Nick Winter
4ff4306366 Added latest i18n keys to de-DE.coffee again. Added some bottom margin on Component configuration screen for dropdowns. 2015-03-10 16:13:34 -07:00
Imperadeiro98
a2665258da Better styling for pt-PT in subscribe modal 2015-03-10 22:00:09 +00:00
Nick Winter
f2ab176fd6 Merge pull request #2418 from divyanshu013/master 
A small fix for confusing Hero Modal weaopons list for #1774
 2015-03-10 14:42:31 -07:00
Nick Winter
9c99fc455a A few poll fixes. 2015-03-10 09:45:21 -07:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
Matt Lott
cd59b90e37 Add custom payments 
Example:
https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip
tions
 2015-03-04 15:40:53 -08:00
divyanshu013
ae5aafb24a Added /account link to logged in username for #1635 
Clicking on the username should point to /account page of the logged in user.
 2015-03-02 01:38:47 +05:30
Nick Winter
26c5c17eab Fixed #2427. 2015-03-01 07:51:24 -08:00
divyanshu013
e66d94c59f Bug fix for layout problem in German subscribe for #2409 
A small fix adjusting the font sizes.
 2015-03-01 20:08:14 +05:30
laituan245
7a19c616c3 Fixed issue #2430 2015-03-01 06:19:35 +09:00
Nick Winter
45d4b25c60 Fixed #1048 because I accidentally closed it and then didn't want to reopen it, so figured I might as well fix it as if I meant to do that the whole time. 2015-02-27 09:28:26 -08:00
Nick Winter
77bca72002 Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white. 2015-02-26 14:24:00 -08:00
Nick Winter
a2a78286da Fixed #2407 by implementing styles for new subscribe-in-gem-shop design. 2015-02-25 14:24:32 -08:00
Nick Winter
714ff0a249 Merge pull request #2408 from laituan245/master 
Update hero-victory-modal.sass (Issue 1917)
 2015-02-25 13:59:52 -08:00
laituan245
e73208f8e8 Update hero-victory-modal.sass 2015-02-26 06:03:17 +09:00
Nick Winter
1ab8274c43 Added a clear storage button to the campaign editor. 2015-02-25 11:09:15 -08:00
Nick Winter
be625cbfbe Merge pull request #2403 from divyanshu013/master 
Bug fix for long hero button text in Russian for #1918
 2015-02-24 12:56:55 -08:00
divyanshu013
f2459f1b39 Bug fix for long hero button text in Russian for #1918 2015-02-25 02:08:08 +05:30
Nick Winter
4cbbcdad6d Merge pull request #2359 from laituan245/master 
Added ability to delete account
 2015-02-24 09:30:22 -08:00
Nick Winter
4d35c2cefc Merged. 2015-02-23 15:05:54 -08:00
Nick Winter
61831e83c2 Merge pull request #2368 from rmarren1/master 
Slight cleanup to level indicator code
 2015-02-23 14:49:13 -08:00
Nick Winter
63b24b9bf1 Properly showing the back of wizards' robes. 2015-02-22 21:50:56 -08:00
divyanshu013
dc953431ec Fix for long names in leader board for #2373 
Reduced the max-width component to fit ellipsis properly.
 2015-02-23 01:03:35 +05:30
Ryan Marren
320e8c401a level indicator code cleanup 2015-02-21 17:30:32 -05:00
Ryan Marren
a7dadc34aa Added level indicator 2015-02-20 23:50:42 -05:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
Nick Winter
dc703c40b0 Merge pull request #2336 from divyanshu013/master 
Added some Hindi localizations for hi.coffee
 2015-02-17 15:26:41 -08:00
divyanshu013
d8716ed40b Added CodeCombat navigation from /play to / for #2044 2015-02-17 23:49:34 +05:30
Nick Winter
ae07a25657 Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical. 2015-02-17 09:29:21 -08:00
divyanshu013
036b72ca19 Font size tweak for #2324 
Also reduced the size for tbody data to fit properly
 2015-02-17 00:44:08 +05:30
Nick Winter
de11743df9 Merge pull request #2326 from laituan245/master 
Add type (warrior/ranger/wizard)  to hero selector modal (Issue #2307)
 2015-02-16 10:29:26 -08:00
Imperadeiro98
a73ccbc037 Changed language specific style in home.sass 
So that it only affects pt-BR instead of pt-PT.
 2015-02-16 18:23:42 +00:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Matt Lott
c4f46faf25 🐛Fix leaderboard level popup stacked buttons 
CSS initial keyword isn’t supported in IE.

Fixes #2301
 2015-02-12 14:19:19 -08:00
Matt Lott
d937feb3de 🐛Fix share progress title wrap on IE11 
Fixes #2301
 2015-02-12 13:38:55 -08:00
Nick Winter
106ba5acda Fixed #2280. 2015-02-10 12:49:28 -08:00
Nick Winter
86fa8dd59d Merge pull request #2281 from divyanshu013/master 
Fixed the issue with the Leaderboard view to fit properly for #2254
 2015-02-10 12:45:54 -08:00
divyanshu013
2b090a9841 Fixed the issue with the Leaderboard view to fit properly for #2254 
The leaderboard view fits properly while scrolling down.
 2015-02-10 23:27:23 +05:30
Nick Winter
7b34f90230 Added rough draft of subscribe button in gem shop. 2015-02-09 09:22:18 -08:00
divyanshu013
4269f6a652 Improved upon the Buy Gems Window for #2238 
Added the header and close button for the Buy Gems Window.
 2015-02-09 02:31:03 +05:30
Nick Winter
cf09f01b03 Some style fixes to prettify the new background image avatars in user dropdown for #2247. 2015-02-06 18:10:12 -08:00
Nick Winter
9a29f898a9 Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug 2015-02-06 18:01:25 -08:00
Nick Winter
8ab6f36364 Crude initial version of ASCII representation for blind players. 2015-02-06 16:54:55 -08:00
Matt Lott
972c3d0d6f Share progress modal 
Shown after forgetful-gemsmith
 2015-02-06 14:49:50 -08:00
Nick Winter
2bd7c86638 Added bottom footer background texture. 2015-02-06 11:17:48 -08:00
Nick Winter
3da36ccc5d Added new level loading bar art. Using illustrated Start Level button. 2015-02-06 10:26:38 -08:00
Nick Winter
3cbf11d404 Added a back button to hit campaign selector view. 2015-02-05 15:40:45 -08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
h3yduck
a3b0a11c94 Update site-chrome.sass 2015-02-05 20:01:18 +01:00
Matt Lott
c842f45786 Update subscribe modal with parent help button 2015-02-04 13:54:38 -08:00
Nick Winter
35c04974dd Added a difficulty badge when going to play a replayable level. 2015-02-04 13:42:49 -08:00
Nick Winter
5542bd8a89 Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed. 2015-02-03 18:25:38 -08:00
Nick Winter
762192a4a7 A few visual improvements to leaderboadrs. 2015-02-03 17:07:15 -08:00
Nick Winter
86aa265679 Added campaign label banner art. 2015-02-03 09:56:27 -08:00
Nick Winter
60d68ca23c Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings. 2015-02-02 18:02:57 -08:00
Nick Winter
3f78071e5e A few small fixes. 2015-02-02 11:50:25 -08:00
Nick Winter
59a6d369a3 Merge pull request #2183 from rishiloyola/patch-7 
Update hero-victory-modal.sass
 2015-02-02 09:00:27 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Imperadeiro98
24529d0d7c Update legal.sass 2015-01-31 12:11:09 +00:00
Rishi
106d5f640e Update hero-victory-modal.sass 2015-01-31 17:40:34 +05:30
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
5addacddf0 First draft of ParticleMan particle emitters for showing hidden levels in CampaignView. 2015-01-29 16:11:13 -08:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Matt Lott
8b51c3cb5d Stop subscribe modal A/B test 
Group A (original) wins.
 2015-01-28 16:20:10 -08:00
Nick Winter
bf3c997d9d Merge pull request #2139 from katemamba/long-name 
#2125 Long player names overflow
 2015-01-28 08:56:26 -08:00
Nick Winter
2e09a94736 Asking for feedback when cancelling subscriptions. 2015-01-26 16:48:32 -08:00
Matt Lott
48a8ed109d Update campaign editor analytics 
Add line graphs to level view.
 2015-01-26 13:19:10 -08:00
Pavan Kate
2004e91e38 #2125 Long player names overflow 2015-01-25 06:03:41 +05:30
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Matt Lott
e49c74259b Update campaign editor analytics 
Adding shown and purchased subscription counts.
Locking down analytics to admin-only.
 2015-01-21 13:41:38 -08:00
Matt Lott
f38a67b96a Update campaign editor analytics 
Add playtime bar graphs.
 2015-01-20 11:43:13 -08:00
Matt Lott
d0a0c95623 Update campaign editor analytics 
Display little level completion line graphs in the level completion
table cells.
 2015-01-19 21:59:25 -08:00
Matt Lott
499e7c2999 Update campaign editor analytics 
Color in level name based on number of users remaining.
 2015-01-19 15:21:42 -08:00
Matt Lott
05f028d944 Update campaign editor analytics 
Adding ‘left game’ counts to overall campaign view.  This is the number
of players that left the game after playing the given level.
 2015-01-18 16:29:47 -08:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Matt Lott
770d3f5229 Add playtimes to overall campaign editor analytics 2015-01-15 16:07:26 -08:00
Nick Winter
beb61ba8d4 Merge pull request #2094 from rishiloyola/patch-6 
Update spell_palette_entry.sass
 2015-01-13 11:06:50 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Rishi
8a4b6eebf4 Update spell_palette_entry.sass 2015-01-13 15:30:37 +05:30
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Nick Winter
45b90804ec Noting some TODOs to fix soon. 2015-01-05 20:49:59 -08:00
Matt Lott
61180c640d Add completion % to campaign analytics 2015-01-05 10:28:56 -08:00
Scott Erickson
15be292573 Added a little focus styling to treemas in editors so it's easier to copy/paste. 2015-01-04 09:26:40 -08:00
Nick Winter
6ec7066309 Using a couple more percentage margins/paddings in spell palette. 2015-01-04 09:08:59 -08:00
Imperadeiro98
c529c3d874 Update spell_palette.sass 2015-01-04 12:41:16 +00:00
Nick Winter
c2d74a812d Updates to require/restrict level logic. 2015-01-02 15:44:43 -08:00
Matt Lott
b5969e0abc Update campaign analytics level ordering 
Reading campaign levels from database.  Assumes database order is
roughly progression order.
 2015-01-02 13:31:50 -08:00
Matt Lott
e65887ec79 Add campaign drop-offs analytics to editor 2015-01-01 12:01:51 -08:00
Nick Winter
1440584633 Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting. 2014-12-29 12:47:53 -08:00
Nick Winter
913de5dc8c Additional tweak for #2005. 2014-12-28 15:26:04 -08:00
Imperadeiro98
9018e41c2c Fixed a issue 2014-12-28 22:43:08 +00:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
2df1318e1b Hooked up i18n for redesigned contribute view. 2014-12-19 15:35:18 -08:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00