codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9369 commits 27 branches 0 tags 134 MiB
Commit graph

1252 commits

Author SHA1 Message Date
Nick Winter
bf0422a9d6 Merge branch 'master' into production 2015-08-29 08:02:31 -07:00
Matt Lott
8de00767b3 Initial courses object model 2015-08-29 07:15:39 -07:00
Nick Winter
4ca476713e Merge branch 'master' into production 2015-08-28 10:45:19 -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
448f4fce88 Merge branch 'master' into production 2015-08-27 09:48:48 -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
264767e9e8 Add HipChat msg for Stripe payments 2015-08-26 15:37:58 -07:00
Matt Lott
761402b117 Add hipchat msg for year sub sale 2015-08-26 15:31:22 -07:00
Matt Lott
1c53b1b9df Merge branch 'master' into production 2015-08-24 10:54:38 -07:00
Matt Lott
9c492a2d4b 🐛Increment gems for year sale purchase 2015-08-24 10:54:06 -07:00
Matt Lott
36e337495d Merge branch 'master' into production 2015-08-23 17:14:04 -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
86b076fde0 Merge branch 'master' into production 2015-08-21 03:28:35 -07:00
Nick Winter
256b19d331 More improvements and fixes for league ladder pages. 2015-08-21 03:28:25 -07:00
Nick Winter
8c3f4d92d2 Merge branch 'master' into production 2015-08-20 15:21:52 -07:00
Nick Winter
96b838da03 Fixed league-based simulation randomness. 2015-08-20 05:54:10 -07:00
Nick Winter
f34dd7c70e Merge branch 'master' into production 2015-08-19 15:35:30 -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
d86aa747bc Merge branch 'master' into production 2015-08-19 12:24:33 -07:00
Matt Lott
0fee075470 🐛Fix sponsored subscription error logging bug 2015-08-17 15:49:49 -07:00
Nick Winter
6f2b1b2a41 Added back an index we need on LevelSession, but in code this time instead of just from the shell as 'weird query index'. 2015-08-15 12:44:19 -07:00
Nick Winter
32ca453dec Added /play/ladder/levelID/clan/clanID clan-specific ladder pages. 2015-08-15 06:45:38 -07:00
Nick Winter
bda2483738 Added league-based ladder game simulation. 2015-08-15 05:38:47 -07: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
Matt Lott
532c2a05e8 Merge branch 'master' into production 2015-08-13 11:13:55 -07:00
Matt Lott
05a9013164 Remove deprecated prepaid schema properties 2015-08-13 11:13:15 -07:00
Matt Lott
6fb5f270b3 Merge branch 'master' into production 2015-08-13 08:39:02 -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
b0cb3c8ab8 Merge branch 'master' into production 2015-08-12 11:55:39 -07:00
David Liu
7d64087e29 Fix the headless simulator 
Shims `lscache`, support io.js < v3.0.0. Make simulating `one-game`
possible.

Tested on Linux with Node.js v0.10.40 and v0.12.7; as well as io.js
v2.5.0.

It still won't work with io.js v3.0.0 because `webworker-threads`
doesn't compile properly, so that's another problem.
 2015-08-10 18:12:53 -07:00
Nick Winter
d101a427ba Merge branch 'master' into production 2015-08-08 12:26:33 -07:00
Nick Winter
cd0c252b14 Disabled some logging now that chinaVersion appears to be working. 2015-08-08 12:26:20 -07:00
Matt Lott
122fcc6e71 Merge branch 'master' into production 2015-07-31 16:20:28 -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
Nick Winter
721ae833e9 Merge branch 'master' into production 2015-07-31 14:42:08 -07:00
Nick Winter
fc0a6513f3 Fixing some bugs in the geoip and language detection stuff. 2015-07-31 14:32:32 -07:00
Matt Lott
0e272b8d86 Merge branch 'master' into production 2015-07-30 16:07:32 -07:00
Matt Lott
822d25984f Merge pull request #2910 from trotod/fix-clan-details-style 
Fix clan details style
 2015-07-29 10:22:36 -07:00
Matt Lott
f89bb8ac0f Subs dashboard perf 
Update sub sponsors API to use payments collection before users
collection to whittle down potential sponsors.
 2015-07-28 09:11:55 -07:00
Nick Winter
d07b087c7b Merge branch 'master' into production 2015-07-27 11:35:35 -07:00
Nick Winter
e43addf55b Debugging chinaVersion inconsistencies. 2015-07-27 11:35:20 -07:00
David Liu
b5d7791e84 Custom hero portraits 
Though missing the raider and necromancer from the spritesheet
 2015-07-26 12:40:55 -07:00
Nick Winter
85db686e74 Merge branch 'master' into production 2015-07-24 17:38:39 -07:00
Nick Winter
899aae5798 Consolidated extra resources. 2015-07-10 14:20:25 -07:00
Matt Lott
1688000770 Merge branch 'master' into production 2015-07-09 13:52:54 -07:00
Matt Lott
7620ba00ad 🐛Remove stripe_invoices API caching 2015-07-09 13:28:55 -07:00
Matt Lott
c25c5e8f97 Improve sub_sponsors API perf 2015-07-09 13:16:57 -07:00
Matt Lott
591c891b18 Merge branch 'master' into production 2015-07-09 12:21:58 -07:00