Commit graph

2674 commits

Author SHA1 Message Date
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
Matt Lott
4f3fcf385c 🐛Fix subscribe prevented by no preferredLanguage 2015-03-24 15:19:20 -07:00
Matt Lott
7e340fcd41 Update purchase tracking to work with GA goals
Need an integer value field.
2015-03-24 15:02:57 -07:00
Nick Winter
3af8fb6218 Suppress selection sounds in the level editor. 2015-03-23 17:37:49 -07:00
Nick Winter
5502deb9f6 Merge pull request #2548 from nixel2007/ForkModal
Clean i18n when forking an object
2015-03-23 16:52:00 -07:00
Nikita Gryzlov
20884f8b5d Update ForkModal.coffee. Unset i18nCoverage on Fork 2015-03-24 02:39:03 +03:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -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
Nick Winter
e288b95543 Fixed #1961 (castDrainLife -> cast('drain-life') in the docs). 2015-03-20 13:43:00 -07:00
nixel2007
7cda4e65e3 Update ForkModal. Clean i18n on fork 2015-03-20 23:19:38 +03:00
Nick Winter
8760725b8d Unholy Tome III instead of IV for Zero Sum. 2015-03-20 11:07:41 -07:00
Nick Winter
bae7612703 Disabled pinned docs clicks for now, since their CSS is wonky. 2015-03-20 09:03:36 -07:00
Nick Winter
0e0d2830be Zero Sum mirror match using Golden Wand and Unholy Tome IV now. 2015-03-19 21:37:47 -07:00
Nick Winter
d5b69cb811 Merge pull request #2545 from Vlevo/patch-1
Update ControlBarView.coffee
2015-03-19 15:15:18 -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
Vlevo
49b32a8ff1 Update ControlBarView.coffee
added a clause for the "older campaigns"
2015-03-19 16:02:53 -06:00
Nick Winter
aae44c2064 Further fix for DiplomatView including Esperanto. 2015-03-19 10:18:53 -07:00
Imperadeiro98
e1a6156345 Requiring Esperanto in Diplomat page...
... so that it doesn't break. It would be nice if the languages could be loaded from locale/locale.
2015-03-19 16:26:00 +00:00
Nick Winter
c6cd7b032d Fixed Alipay auto locale detection. 2015-03-18 17:17:30 -07:00
Nick Winter
f9d9b0985b Merge pull request #2540 from nixel2007/master
Add "Translated Name" to /i18n
2015-03-18 16:21:34 -07:00
Nick Winter
585fa40a8c Added first draft of campaign info to campaign selector screen. 2015-03-18 16:20:30 -07:00
nixel2007
9b509fa83e Add "Translated Name" to /i18n 2015-03-19 01:44:23 +03:00
Imperadeiro98
4b7f9366dc Removed "Experimental" from Lua...
... and added to CoffeeScript
2015-03-18 17:58:29 +00:00
Nick Winter
792e65767d I could try to compile it first, I guess. 2015-03-17 22:04:30 -07:00
Nick Winter
8af94209b4 Lua is not experimental any more. (But CoffeeScript is.) 2015-03-17 22:02:15 -07:00
Nick Winter
3236abc5da Added emphasis for Apocalypse. 2015-03-17 21:20:26 -07:00
Nick Winter
7e97c5dd58 Merge pull request #2532 from nixel2007/patch-1
Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show
2015-03-16 19:24:57 -07:00
nixel2007
38275dd2a9 Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show 2015-03-17 01:15:13 +03:00
Nick Winter
d6cba0de67 Enabled Alipay support. Updated to latest version of Stripe checkout.js. 2015-03-16 10:50:15 -07:00
Nick Winter
89bdb3b790 Fixed #2518. 2015-03-14 09:57:31 -07:00
Nick Winter
57e77a0cd7 Upcoming ladder level Zero Sum equalizes all players' heroes and equipment. 2015-03-14 09:39:43 -07:00
Matt Lott
5264fc6181 🐛Fix subscription view just subscribed alert message 2015-03-13 15:51:47 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
3ff41f5619 Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues. 2015-03-12 11:08:58 -07:00
Nick Winter
83a72d3030 Merge pull request #2514 from Catsync/mountain-generator
Added mountain terrain generator
2015-03-12 10:42:48 -07:00
Cat Sync
90d7159501 Added mountain terrain generator 2015-03-12 13:31:21 -04:00
Jorge Klemm
a6c39714aa Adding me as a Diplomat. 2015-03-12 10:52:09 -03:00
Nick Winter
3458f2069b Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller. 2015-03-11 20:21:54 -07:00
nixel2007
e5c8fc4a1c More humane view of i18n-editor
Change the layout to
Description
en
non-en
2015-03-11 16:45:35 +03:00
Nick Winter
8fc893dd6f Fixed a couple issues with errors during incompletely loaded levels or weird child window global situations using level editor. 2015-03-10 14:37:12 -07:00
Nikita Gryzlov
321ca1eb2b Fix Issue #2495 2015-03-10 20:16:43 +03:00
Nick Winter
9c99fc455a A few poll fixes. 2015-03-10 09:45:21 -07:00
Matt Lott
5a0a4d1446 No auto-fullscreen for admins 2015-03-09 12:57:10 -07:00
Nick Winter
e58734894a Tweaked style on space-disabling and default-locking by player level. 2015-03-09 10:50:00 -07:00
Nick Winter
f5633f05dc Merge pull request #2414 from h3yduck/lock_issue
Only lock spacebar and default code when the player is lower level (issue 2406)
2015-03-09 10:37:40 -07:00
Nick Winter
efe1b77e9e First poll should be askable. 2015-03-09 09:51:15 -07:00
Nick Winter
495845a633 Storing certain poll results in User object. Showing a poll once per day. 2015-03-09 09:30:51 -07:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
Nick Winter
10f2df3480 Added extra lesson resource links to the Guide. 2015-03-05 08:58:11 -08: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
Nick Winter
60db16b1c3 Making all code languages load for level editor to avoid busted level previews. Added CoffeeScript compiler to web worker so we can use Referee extraCode. 2015-03-04 11:29:03 -08:00
Nick Winter
2d18bcf9f0 Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level. 2015-03-03 09:04:53 -08:00
Nick Winter
bb80db9cd5 Server now thinks it's production whenever it's not localhost:3000, rather than whenever it is codecombat.com. 2015-03-01 22:19:01 -08:00
Nick Winter
dc56a50b75 Handling empty context objects in i18n edit view. 2015-03-01 09:40:14 -08:00
Nick Winter
44008be95f Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level. 2015-02-27 21:37:55 -08:00
Matt Lott
86d167394e Remove Segment analytics dependency
Call Google Analytics, Errorception, and Inspectlet directly.
2015-02-27 16:07:41 -08: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
Szabolcs Gelencser
dde3e8cf8f Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired 2015-02-27 17:33:38 +01:00
Nick Winter
b4e9ee67f0 Added one-minute in-memory server caching for a bunch of common queries. 2015-02-26 17:20:27 -08:00
Nick Winter
9b34d4e166 Ooops, that was just for testing. 2015-02-26 16:04:57 -08:00
Szabolcs Gelencser
b138001205 for issue #2406 2015-02-26 23:42:37 +01: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
32a95afbd0 Allowing reordering of levels in Campaign. Reversing CampaignEditor levels before save so that when the save magically reverses them again, the order is preserved. 2015-02-26 11:33:07 -08:00
Nick Winter
df4b98a9bf Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power. 2015-02-25 18:41:39 -08:00
Nick Winter
7e889a2a80 Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory. 2015-02-25 18:09:55 -08:00
Nick Winter
c8c76e6b74 Trying to track down the cause of InventoryModal loading without a hero assigned. 2015-02-25 16:19:49 -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
15ca65f226 Further disabled employer portal for now. 2015-02-25 12:38:51 -08:00
Nick Winter
a66e1c5389 Retoring next level highlight arrow for players who are very new when they click off a selected level. 2015-02-25 11:58:03 -08:00
Nick Winter
13f9d71cca You can now use bitcoin to buy gems. 2015-02-25 11:33:51 -08:00
Nick Winter
1ab8274c43 Added a clear storage button to the campaign editor. 2015-02-25 11:09:15 -08:00
Nick Winter
9dd07b024e Fixed item shop not loading items with later letters of the alphabet, since there are now so many items. 2015-02-24 12:15:35 -08:00
Nick Winter
e48d996a60 Fixed #2286. 2015-02-24 11:45:50 -08:00
Nick Winter
4cbbcdad6d Merge pull request #2359 from laituan245/master
Added ability to delete account
2015-02-24 09:30:22 -08:00
laituan245
a588a3b2c8 Some updates to the PR #2359 2015-02-25 02:12:39 +09:00
laituan245
eb53381083 Don't delete the User object, just remove all the properties except for _id 2015-02-24 22:36:12 +09:00
Aman Kumar
0df2dea469 Issue #2387: Accounts setting toggle all fix 2015-02-24 17:25:18 +05:30
Nick Winter
4d35c2cefc Merged. 2015-02-23 15:05:54 -08:00
Nick Winter
0f6404fea1 Being a tiny bit more idiomatic about CoffeeScript ranges. 2015-02-23 15:03:48 -08:00
Nick Winter
6d9e7a76ce Merge pull request #2389 from amankr/bug/duplicates
Issue #2267: Removed duplicates from TreemaData
2015-02-23 15:02:20 -08:00
Nick Winter
fb10de5023 Merge pull request #2376 from amankr/login
Issue #2082: Campaign editor login fixed
2015-02-23 14:54:15 -08:00
Nick Winter
1513e20486 Merge pull request #2370 from amankr/newfeature
Issue #1785: Empty level editor folders removed
2015-02-23 14:53:08 -08:00
Aman Kumar
d8a4803268 Issue #2267: Removed duplicates from TreemaData 2015-02-24 03:18:35 +05:30
Nick Winter
63b24b9bf1 Properly showing the back of wizards' robes. 2015-02-22 21:50:56 -08:00
divyanshu013
5ad23fc354 Fix for Campaign editor login not working for #2082
Overiding the login and signup listener clicks in CampaignEditorView so that
the child can call them.
2015-02-23 01:34:33 +05:30
Nick Winter
7d7db5dafe Thang Editor can now drag Thangs to adjust registration points. Fixed missing terrain save property on ThangTypes. Fixed text search test. Added new Talus (mountain floors) to floor ThangType list for proper stretching. 2015-02-22 11:07:56 -08:00
Matt Lott
7e46b819c4 Stripe API version update fixes
Using customer sources instead of cards so we can update our API
version:
https://stripe.com/docs/upgrades?since=2014-11-05#api-changelog
2015-02-22 07:54:36 -08:00
Aman Kumar
7f442a32a3 Issue #2082: Campaign editor login fixed 2015-02-22 20:26:13 +05:30
Aman Kumar
436594555c Issue #1785: Empty level editor folders removed 2015-02-22 05:11:02 +05:30
Nick Winter
40ff7d4116 Harmonized enter shortcut for PlayHeroesModal. 2015-02-21 14:22:51 -08:00
Nick Winter
0e135ac07f Fixed blank language selector row. 2015-02-20 15:20:44 -08:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
Nick Winter
8355ba5a6d Replayable level awards now count up from where they were last time instead of from 0. 2015-02-18 18:01:22 -08:00
Nick Winter
f2a5c4bc5a Merge pull request #2353 from amankr/sound
Volume bug fix #2202
2015-02-18 13:36:59 -08:00
Nick Winter
a81663f06a CampaignView shouldn't use localStorage backups unless it's in editor mode. 2015-02-18 13:35:47 -08:00
Aman Kumar
e4a3890f39 fixed volume bug #2202 2015-02-19 02:05:41 +05:30
Aman Kumar
a74c2a58e2 fixed volume bug #2202 2015-02-19 01:58:24 +05:30
Nick Winter
178082d4e8 Fixed bug with dragging an item to unequip it not updating rest of state. 2015-02-18 09:57:03 -08:00
laituan245
0cf16e157c Fix issue #1832 2015-02-18 16:12:19 +09:00
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
Nick Winter
141e11f918 Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master 2015-02-16 17:13:24 -08:00
Ryan Marren
1a60b004a7 added achievement editor for #2304 2015-02-16 17:12:05 -05:00
Nick Winter
c0f738d736 Fixed bug with Campaign i18n not showing fullNames properly. 2015-02-16 09:21:59 -08:00
Imperadeiro98
d575bb2992 Small spacing fix 2015-02-16 13:33:44 +00:00
Nick Winter
7f2e5c4404 Achievements list now shows proper amount of gems and exp for repeatable achievements. 2015-02-13 18:55:23 -08:00
Nick Winter
c29bb432e1 Merge pull request #2314 from laituan245/master
A small fix to the PR #2313
2015-02-13 13:46:45 -08:00
Matt Lott
81678e81d9 Merge pull request #2315 from amankr/autocomplete2
Autocomplete bug fix #2233 - method 2

Thanks @amankr!
2015-02-13 13:12:22 -08:00
Aman Kumar
85a024546b Autocomplete bug fix #2233 2015-02-14 02:21:54 +05:30
Aman Kumar
224213ccb0 Autocomplete bug fix #2233 2015-02-14 02:11:00 +05:30
laituan245
93bbedd02d A small fix to the PR #2313 2015-02-14 05:27:58 +09:00
Aman Kumar
80fb124772 Autocomplete bug fix #2233 2015-02-14 01:56:05 +05:30