Commit graph

6745 commits

Author SHA1 Message Date
Nick Winter
155ead86cf Removed unneede catiline lib. Trying speedups for updating HUD property values and Lank Thang inventory. 2014-11-29 13:09:38 -08:00
Scott Erickson
17f2d76512 Undid some apparent changes from the last commit. 2014-11-29 12:53:57 -08:00
Scott Erickson
9b5228afd9 Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match. 2014-11-29 12:46:04 -08:00
Scott Erickson
1c33842125 Refactored core templates into a core folder. 2014-11-29 11:39:37 -08:00
Scott Erickson
3e0394d0d8 Fixed the latest version handler to handle invalid original id inputs. 2014-11-29 11:11:40 -08:00
Scott Erickson
42c7fca055 Tweaked the error middleware to proxy and be silent about client errors. 2014-11-29 11:06:02 -08:00
Nick Winter
528dfaa583 Merge branch 'master' into production 2014-11-29 10:52:59 -08:00
Nick Winter
912df310a2 Disabled GitHub login for now, since it's too buggy and also makes the server mad slow. 2014-11-29 10:52:53 -08:00
Scott Erickson
1bd70591a0 Added new mongodb versions to be allowed.
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Nick Winter
b8d4f00cd4 Merge pull request #1813 from ebirkenes/tmp
Fix for #1795
2014-11-29 10:40:48 -08:00
Nick Winter
38c092c914 Merge branch 'master' into production 2014-11-29 10:39:11 -08:00
Nick Winter
98199ac72e Propagated i18n. 2014-11-29 10:38:55 -08:00
Nick Winter
891b78eb44 Hiding some ThangTypes from view in level editor. 2014-11-29 10:34:04 -08:00
Nick Winter
306f599673 Merge pull request #1815 from ewertonorg/translate-to-pt-br
Update pt-BR.coffee
2014-11-29 10:33:22 -08:00
Scott Erickson
0bbcdd5698 Made all of lib into a wad. Fixed AuthModal. 2014-11-29 08:54:18 -08:00
Nick Winter
d2aabbdacc A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading. 2014-11-29 08:43:40 -08:00
Nick Winter
53cd491843 Merge branch 'master' into production 2014-11-29 06:51:04 -08:00
Nick Winter
dbbcfe3789 Fixed a couple requires needed for level editor. 2014-11-29 06:50:50 -08:00
ewertonorg
4b7fc0322c Update pt-BR.coffee 2014-11-29 11:53:27 -02:00
Scott Erickson
82e2344fa5 Fixed new module loading system when optimized. 2014-11-29 00:34:55 -08:00
Nick Winter
1d51100130 Merge branch 'master' into production 2014-11-28 19:49:38 -08:00
Nick Winter
89af30f436 Using home play i18n tag instead of common play tag. 2014-11-28 19:49:13 -08:00
Nick Winter
383f215b36 Merge branch 'master' into production 2014-11-28 19:40:00 -08:00
Nick Winter
8400eb6016 Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring. 2014-11-28 19:39:51 -08:00
Scott Erickson
31214e854e Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways. 2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Scott Erickson
12b3428aee Got rid of some styling in the achievement edit view that was messing with the new site chrome. 2014-11-28 16:38:56 -08:00
Nick Winter
32a271d17e Updated to new paper doll positioning. 2014-11-28 14:23:44 -08:00
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Matt Lott
fc2c68a7af Update Tracker.trackEvent
Mechanics have changed a bit: first param is an action string, second
param has specific properties if Google Analytics.
Updating some of the trackEvent calls to use correct actions and
categories.
2014-11-28 15:06:25 -05:00
Michael Schmatz
980b5f7580 Merge branch 'master' into production
Conflicts:
	server_setup.coffee
2014-11-28 14:40:07 -05:00
Michael Schmatz
6cb46aafa8 Link to Papertrail logs in error messages 2014-11-28 14:37:55 -05:00
Nick Winter
71d7ac5e11 Merge pull request #1814 from ebirkenes/translation
Translated the Legal page to norwegian.
2014-11-28 10:34:16 -08:00
Erlend Birkenes
6efb03ec40 Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little. 2014-11-28 19:30:41 +01:00
Michael Schmatz
897fe6c63e Improved error handling 2014-11-28 11:44:03 -05:00
Michael Schmatz
2574549a78 Improved error handling 2014-11-28 11:37:31 -05:00
Michael Schmatz
3475770f13 Merge branch 'master' into production 2014-11-28 11:09:07 -05:00
Michael Schmatz
0ac0065753 Fixed payments 2014-11-28 11:07:37 -05:00
Erlend Birkenes
744b856092 Fixed padding on language-dropdown 2014-11-28 12:10:57 +01:00
Matt Lott
fead762d04 Stopping tracking analytics for admins 2014-11-27 23:55:28 -05:00
Nick Winter
575358d3c1 Merge pull request #1811 from ebirkenes/translation
Added myself as translator on norwegian nb
2014-11-27 11:52:43 -08:00
Erlend Birkenes
434b71c887 Added myself as translator on norwegian nb 2014-11-27 20:45:27 +01:00
Nick Winter
4be9050ac4 Merge pull request #1810 from ebirkenes/translation
Translated the entire contributing page plus some other stuff to norwegian
2014-11-27 11:29:24 -08:00
Erlend Birkenes
5f7f1c2b65 Translated the entire contributing page plus some other stuff to norwegian. 2014-11-27 20:17:33 +01:00
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -08:00
Nick Winter
b5c7a4e0f2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-27 07:28:31 -08:00
Nick Winter
f54377dbaf Merge pull request #1807 from ebirkenes/translation
More norwegian translations.
2014-11-27 07:27:51 -08:00
Erlend Birkenes
37601efa17 More norwegian translations.
Conflicts:
	app/locale/nb.coffee
2014-11-27 16:11:13 +01:00
Nick Winter
81495fd722 Added suspect code fragment to Known Enemy. 2014-11-26 19:30:23 -08:00
Nick Winter
0499702e10 Translated IFC Videira description to English, and added an image. 2014-11-26 19:22:39 -08:00