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

6310 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
09252948a9 Merge branch 'master' into production 2014-12-01 14:13:26 -08:00
Matt Lott
35adea61e0 Update trackPageView integrations call 
Based on feedback from segment.io support.  Was unclear from
documentation how to provide only name and options object.
 2014-12-01 13:58:21 -08:00
Nick Winter
b49d880fd9 Merge branch 'master' into production 2014-12-01 13:53:40 -08:00
Nick Winter
ffcfec0a6a Trying to shut the server up about some anonymous user who is simulating. 2014-12-01 13:53:17 -08:00
Nick Winter
ca6c95b0f7 Migrated getting nextLevelURL to the new campaign organization. 2014-12-01 13:46:55 -08:00
Nick Winter
74e97ecb7b Merge pull request #1827 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-01 13:41:37 -08:00
Imperadeiro98
6036d2bd74 Update pt-PT.coffee 2014-12-01 20:45:29 +00:00
Imperadeiro98
1e4d6b3bd5 Update pt-PT.coffee 2014-12-01 20:27:52 +00:00
Scott Erickson
1b12eee3ac Fixed signup in victory modals and ContributeClassView. 2014-12-01 10:49:38 -08:00
Scott Erickson
57b154810b Added a placeholder me for iPad which inspects the object once the page loads. 2014-12-01 10:45:19 -08:00
Scott Erickson
43ac0e8572 Proxied 'lib/auth' to 'core/auth' for the iPad which can't be updated so quickly. 2014-12-01 10:35:45 -08:00
Nick Winter
f9b239ded7 Fixed #1820. 2014-12-01 08:18:38 -08:00
Nick Winter
aeda3bbf08 Merge pull request #1826 from bkimminich/patch-2 
Update de-DE.coffee
 2014-12-01 07:39:24 -08:00
Björn Kimminich
4d1130a9c6 Update de-DE.coffee 2014-12-01 14:00:36 +01:00
Matt Lott
23e60116d5 A/B test hiding locked levels in world map 2014-11-30 22:11:39 -08:00
Nick Winter
b89f893c03 Merge branch 'master' into production 2014-11-30 19:56:29 -08:00
Nick Winter
c9a6949a15 Build, curse ye! 2014-11-30 19:56:22 -08:00
Nick Winter
59bcabf2f0 Merge branch 'master' into production 2014-11-30 19:45:49 -08:00
Nick Winter
748fcf2a65 Fixed not showing locked items in inventory modal. 2014-11-30 19:45:40 -08:00
Nick Winter
bbdbc85932 Merge branch 'master' into production 2014-11-30 19:43:33 -08:00
Nick Winter
29694e2973 Maybe don't brunch non-JS compiled files. 2014-11-30 19:43:17 -08:00
Nick Winter
88849d6dfb Propagated i18n. 2014-11-30 18:13:30 -08:00
Nick Winter
3c95b4f796 Merge pull request #1824 from bkimminich/patch-1 
added some german translations
 2014-11-30 18:12:04 -08:00
Björn Kimminich
5432be27f5 added some german translations 2014-12-01 03:11:28 +01:00
Nick Winter
68b3144b46 Merge branch 'master' into production 2014-11-30 18:03:36 -08:00
Nick Winter
35f1ed1e82 Implemented George's new level loading view design. 2014-11-30 18:02:45 -08:00
Nick Winter
1cada9dd77 Hack to fix source map URLs in production brunch. 2014-11-30 17:06:21 -08:00
Nick Winter
d007f5337e Fixed up inventory slot images for minions and wrists, and added Wizard/Ranger placeholder images. 2014-11-30 16:13:39 -08:00
Matt Lott
153c39b30b Reverting larger currently-executing-line pointer 
Not compatible with Firefox, and not clear how to make it work in both
browsers.
 2014-11-30 16:03:23 -08:00
Matt Lott
2ecda7dbbf Fix trackPageView options initialization 2014-11-30 15:28:01 -08:00
Nick Winter
44282cb946 Hooked up new menu music loop. 2014-11-30 14:57:34 -08:00
Matt Lott
070d3ec6c2 Fix Firefox code area border 2014-11-30 14:42:51 -08:00
Nick Winter
d7700a7154 Merge branch 'master' into production 2014-11-30 14:38:13 -08:00
Nick Winter
cf25b5c6ed Made sure we can see the whole world map background, even though it looks bad when we stretch it. 2014-11-30 14:35:24 -08:00
Matt Lott
02eb254eba Add virtual pageviews for level load and complete 2014-11-30 14:14:47 -08:00
Nick Winter
50eed15eed Can now equip a second ring slot. 2014-11-30 14:12:07 -08:00
Nick Winter
9471beafd9 A few fixes for PlayHeroesModal and InventoryModal. 2014-11-30 14:00:29 -08:00
Nick Winter
68559a3aa5 Re-enabled top hero preloading on WorldMapView, but only when it makes sense. 2014-11-30 13:23:25 -08:00
Michael Schmatz
3cf80c895e Removed log infos, iPad language selection 2014-11-30 16:19:01 -05:00
Nick Winter
8cb6c09889 Properly show paper doll equipment when inventory modal first loads. 2014-11-30 13:00:45 -08:00
Nick Winter
bd494dd513 Adding in what will eventually be our App Store URL. 2014-11-30 12:44:18 -08:00
Nick Winter
77a4cea387 Improvements for mobile layouts and mobile and iPad browser detection. 2014-11-30 12:27:34 -08:00
Matt Lott
066b1798ab Make default code read-only 2014-11-30 11:47:54 -08:00
Scott Erickson
fd04eb4dc5 Fixed treema compilation in brunch config. 2014-11-30 11:01:09 -08:00
Scott Erickson
85f3972bfc Fixed #1821 2014-11-30 10:57:17 -08:00
Matt Lott
94ae4bf6aa Updating analytics integration selection 
Context property has been renamed from providers to integrations.
https://segment.com/docs/libraries/analytics.js/#selecting-integrations
 2014-11-29 22:16:18 -08:00
Scott Erickson
be809337c4 Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it. 2014-11-29 17:51:40 -08:00
Scott Erickson
a1ce2fbf32 Put difflib/view in the correct vendor.js anymatch set. 2014-11-29 17:51:40 -08:00
Nick Winter
0d4a384787 Merge branch 'master' into production 2014-11-29 17:35:41 -08:00
Nick Winter
412955c6be Got rid of some CSS filters that were making the PlayItemsModal take way too much memory. 2014-11-29 17:34:59 -08:00