codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
8868 commits 27 branches 0 tags 134 MiB
Commit graph

2784 commits

Author SHA1 Message Date
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
Nick Winter
213a66b2ab Implemented Arryn. 2015-05-12 16:59:30 -07:00
Matt Lott
dd35a1eb76 Include sponsored cancels in dashboard 
Also includes free teacher sub cancels, which should be an
insignificant number.
 2015-05-08 11:34:59 -07:00
Matt Lott
0353be4fc4 Add recent cancellations table to dashboard 2015-05-06 15:23:46 -07:00
Matt Lott
713f72f5e1 Merge pull request #2723 from Catsync/fixYellowArrow 
Yellow arrow shouldn't point to replayable levels
 2015-05-05 20:52:15 -07:00
Matt Lott
bf20d5f7be Add level to Inventory Play analytics event 2015-05-05 15:05:18 -07:00
Edvin Linge
707c098472 Added some Swedish translation 2015-05-03 18:55:34 +02:00
Cat Sync
42aaba6278 Yellow arrow shouldn't point to replayable levels 2015-05-02 00:15:42 -04:00
Matt Lott
dce8005169 Fix admin dashboard monthly churn 
Monthly churn = cancelled during last month / total at beginning of
month
 2015-05-01 17:26:22 -07:00
Nick Winter
def6709c52 Added /identify page. 2015-04-30 13:36:32 -07:00
Nick Winter
1a1da2924f Noticed Chrome 30 wasn't working for Gems in the Deep, so recommending 31+ instead of 25+. 2015-04-28 14:49:10 -07:00
Matt Lott
f7503f5dba Expanded progress private clans toggle 
Expand option for level bubbles in the private clan dashboard.
 2015-04-28 10:31:35 -07:00
Matt Lott
a995fb938b Update clans UI 
Update private clans dashboard to show level progression in order, and
visually indicate which levels are not completed/started/completed.
Update private clans blurb and screenshot.
Subscribe prompt on make private clan checkbox.
 2015-04-28 09:22:58 -07:00
Nick Winter
80af32180c Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error. 2015-04-25 17:29:02 -07:00
Matt Lott
f41b0bd4dd Sort clan members list alphabetically 2015-04-24 14:22:00 -07:00
Matt Lott
30d47621bf Confirm Clan remove hero 2015-04-23 14:33:13 -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
Nick Winter
155246173a Only showing general i18n coverage for languages with more than one family. 2015-04-22 13:13:24 -07:00
Matt Lott
cfe3e280e5 Clan delete confirm dialog 
Fixes #2696
 2015-04-21 13:41:31 -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
Nick Winter
e40ad5e1c7 Updating a couple logos. Opening item store to warrior tab when low level. 2015-04-20 16:02:06 -07:00
Matt Lott
c900310c8e Merge branch 'clans' 2015-04-20 14:42:48 -07:00
Matt Lott
9fffb80b3f Update clans private info blurb 2015-04-20 14:30:31 -07:00
Matt Lott
38cdb3d057 Update clan analytics 2015-04-20 14:16:44 -07:00
Nick Winter
63596aa6b5 Fixed #2450: added i18n for new items in the victory modal. 2015-04-18 21:10:35 -07:00
Nick Winter
a0057910ac Fixed #2597: press escape to abort simulation now, if your code is going to be slow. 2015-04-18 19:54:34 -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
b358296120 Fixed #2420. Fixed #2605. Can now change programming language from LadderPlayModal. 2015-04-18 16:57:02 -07:00
Nick Winter
485718b6e3 Fixed #2581: triggering window resize event when loading view unveils, in case window was resized before then and messed up our initial spell view height. 2015-04-18 16:33:40 -07:00
Nick Winter
86ae0979c5 Working on #2505; do we have TLS for the analytics server yet? 2015-04-18 16:02:18 -07:00
Nick Winter
7471b14c4d Fixed #2013: removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution. 2015-04-18 15:52:24 -07:00
Nick Winter
ea80e22dc6 Don't point out Lost Viking, since most players shouldn't attempt it. Adjust autocomplete default parameter from string to variable for Known Enemy. 2015-04-18 14:13:05 -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
d781500321 Fixed #2577: added feedback to diplomat email subscribe, takes you to Diplomat page afterward. 2015-04-13 15:14:36 -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
Popey Gilbert
03697ed34f Added Gygram back 2015-04-12 21:09:46 +01:00
Popey Gilbert
1ce628ccc6 Sort alphabetically 2015-04-12 20:40:24 +01:00
Nick Winter
4c008e4686 Fixed #2406. 2015-04-12 12:20:33 -07:00
Gygram
e227e48e86 Update DiplomatView.coffee 2015-04-12 21:00:02 +02:00
Matt Lott
4669d4cb0a Update admin subs dashboard 
Break up lengthy server calls to reduce timeouts in production.
 2015-04-11 10:36:03 -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
Matt Lott
5c40221ab2 Update admin subs dashboard 
Using invoices to aggregate totals which should provide a more accurate
growth rate.
 2015-04-10 11:27:59 -07:00
Nick Winter
6eeb29e8d4 Multiplayer levels go to ladder when you click Scores instead of to a blank single-player leaderboard. 2015-04-10 09:23:00 -07:00
Matt Lott
65e009330a Remove invalid bitcoin comment 2015-04-09 09:42:44 -07:00
Nick Winter
9ee0400c18 Updated to just send out tell-a-parent emails, no tell-a-friend emails. 2015-04-08 21:48:21 -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
6d9c13b7e1 Promoting Favorable Odds as the cool thing to do that all the cool kids are doing 'cause it's so cool. 2015-04-08 16:23:51 -07:00
Nick Winter
d082aa3754 Fixed leaderboard level projection issue. 2015-04-08 15:11:35 -07:00
Matt Lott
b500e5334a Update admin subs dashboard 2015-04-08 11:53:26 -07:00
Nick Winter
0f124bdddc Fixed i18n editor not allowing translation of level guides. 2015-04-08 09:51:54 -07:00
Nick Winter
817e382324 Updated VCS link/blurb for Lost Viking. 2015-04-08 09:44:15 -07:00
Nick Winter
2103c6b4e0 Shared ranks in case of ties for Zero Sum. 2015-04-07 21:10:41 -07:00
Nick Winter
497978b27d Preparing Zero Sum tournament results. 2015-04-07 20:56:24 -07:00
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
eef33f2ed5 Community popovers now pop to the top instead of to the bottom. 2015-04-07 13:58:04 -07:00
Nick Winter
b388d25435 Hooked up Viking Code School offer for players who beat Lost Viking. 2015-04-07 11:19:22 -07:00
Nick Winter
50adb7b982 Fixed previously started subscriber-only levels not being available to non-subscribers. 2015-04-07 10:18:04 -07:00
Nick Winter
8673cca96c Added Viking Helmet reward icon and removed Master Sword reward icon. Not showing Apocalypse particles after you have beaten it. Fixed #2580. 2015-04-07 09:05:13 -07:00
Nick Winter
c1ec1611ad Fixed style reversion for page loading bar showing over code area. 2015-04-07 08:55:33 -07:00
Matt Lott
51e077215e Add monthly growth to admin dashboard 2015-04-06 16:58:36 -07:00
Matt Lott
a77e9cafe9 Merge branch 'clans' 2015-04-06 11:18:08 -07:00
Matt Lott
43fb8ed462 Add clans link everywhere 
Top-level menu, world view, user profiles.
Will add to /teachers later.
 2015-04-06 11:17:13 -07:00
Matt Lott
7f0e9e73a8 Add latest achievements to clan details page 2015-04-06 10:19:35 -07:00
Nick Winter
1982d8d5f1 Merge pull request #2595 from nemoyatpeace/patch-5 
Update the shift-click insertion
 2015-04-06 07:53:01 -07:00
Matt Lott
b7fd2a89ee Add hero icons to clan details page 2015-04-03 16:44:35 -07:00
Matt Lott
b808fa5276 Add favorite language to clan details page 2015-04-03 15:52:16 -07:00
Matt Lott
565cd9cf50 Add clan invite link on details page 2015-04-03 14:48:00 -07:00
Matt Lott
5ae93cd6ab Add clan description field 2015-04-03 14:09:43 -07:00
Matt Lott
39990ee151 Sort and limit clan lists 
Clan lists sorted by member count, then created date.
Public clans lists limited to 100.
Member lists sorted by slug.
 2015-04-03 12:22:44 -07:00
Nick Winter
3913ae9909 Wizard Dude gets his own avatar from winning the Greed tournament. 2015-04-03 12:19:06 -07:00
Matt Lott
dfff871c58 Add achievements to clan details view 2015-04-03 11:05:37 -07:00
Matt Lott
f0bee3fd98 Normalize clan owner data 2015-04-03 09:52:25 -07:00
Matt Lott
56342ad993 Normalize clan members data 2015-04-02 17:00:28 -07:00
Matt Lott
df120bdea3 Delete clan 2015-04-02 11:44:18 -07:00
Matt Lott
d91a7d8d1a Clans remove member 2015-04-02 11:01:37 -07:00
Matt Lott
6c1e7b9560 Add 7 day net to admin subs count page 2015-04-01 20:23:05 -07:00
Matt Lott
bf38327578 Leave clan 
And add join clan plumbing to clan details page.
 2015-04-01 16:00:39 -07:00
Matt Lott
b48de3d74d Join clan 2015-04-01 15:24:45 -07:00
Matt Lott
482b66b8a4 Create and list clans 
Replace mock data with some real functionality.
 2015-04-01 11:56:48 -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
Matt Lott
14a6ad8564 🐛Fix doubling data in admin sub counts page 
Better data resetting to handle weird event firings.
 2015-03-30 11:59:14 -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
nemoyatpeace
b50c3fbc89 Update the shift-click insertion 
Insertion is now language specific.
 2015-03-29 01:14:13 +08:00
Matt Lott
532e8133c6 Add graph to sub counts admin page 2015-03-27 15:27:34 -07:00
Matt Lott
1dbb382318 Add auto-refresh 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
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
7ebb2d0200 Actually committing my Super Important Fixes. I must have been crazy yesterday. Also, populate i18n may work in the level editor now. 2015-03-24 15:39:35 -07:00