Samuel Clay 8ef2bf31b1 Merge branch 'master' into social ... * master: Re-styling the crap out of all taskbar buttons. Much more streamlined now. Tweaking the living crap out of the intelligence control's colors. Lightened. User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral. Correcting typo in dupe feed resolution. Local settings in fabfile. Fixing up a minor detail in the new intelligence control. Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense. Trying to fix IE troubles by forcing single requests per read story. Fixing nginx conf to support ssl. Adding PID files to gitignore. Ignoring files. Adding certificates to ignore. Adding https to nginx. Conflicts: media/css/reader.css media/js/newsblur/common/assetmodel.js		2012-02-10 09:24:48 -08:00
..
fixtures	Adding PIL and boostrapped feed to readme.	2011-07-17 21:29:25 -07:00
munin	Stubbing in social feed count calculations.	2012-02-08 12:20:05 -08:00
.aliases	Adding full bootstrapping to fabfile.	2011-02-09 15:45:41 -05:00
com.mongo.mongod.plist	Adding mongo autostartup for mac os x. Also adding network icons for iphone app.	2011-10-07 11:01:30 -07:00
gitconfig.txt	Desperate attempt to fix amqp server, which is refusing to accept messages. (Actually, it acts like it does, then doesn't know where they went. UGH!)	2011-03-19 19:24:14 -04:00
gunicorn_conf.py	Increasing timeout on gunicorn to 2 min.	2012-01-08 20:47:34 -08:00
hosts	Simplifying ufw ports in fabfile. Adding env.user.	2011-12-13 17:50:33 -08:00
logrotate.conf	Adding Original page for social shared feeds.	2012-01-31 10:15:11 -08:00
logrotate.mongo.conf	Separating nginx configuration into a setup and a configure, since one half is much more common than the other.	2011-03-31 18:51:23 -04:00
mongodb.dev.conf	Fixing the feed chooser to show total # of feeds. Also fixing a unicode issue in normalizing urls.	2011-08-26 19:58:06 -07:00
mongodb.prod.conf	New mongoDB config for production. Uses replica sets.	2011-08-27 14:17:20 -07:00
monit.conf	Adding Monit.	2011-03-28 10:07:45 -04:00
motd_app.txt	Ahahaha, adding motd's for each server. Also adding rabbitmq config and fixing up gunicorn config.	2011-03-17 19:26:21 -04:00
motd_db.txt	Ahahaha, adding motd's for each server. Also adding rabbitmq config and fixing up gunicorn config.	2011-03-17 19:26:21 -04:00
motd_task.txt	Ahahaha, adding motd's for each server. Also adding rabbitmq config and fixing up gunicorn config.	2011-03-17 19:26:21 -04:00
munin.conf	Adding Read It Later support on stories.	2011-02-15 21:31:33 -05:00
nginx-init	Using the correct location of the nginx 'sbin'aries in the init.d script.	2011-08-18 21:48:06 -07:00
nginx.conf	Toning down the aggresiveness on feed fetching.	2011-03-23 17:18:57 -04:00
nginx.newsblur.conf	Trying to fix IE troubles by forcing single requests per read story.	2012-02-08 16:22:21 -08:00
pgbouncer.conf	Simplifying pgbouncer config.	2011-09-07 22:35:20 -07:00
pgbouncer_userlist.txt	Fixing empty recommendations for new servers. Also adding firewall information and fixing up fabfile.	2011-03-19 18:35:44 -04:00
pystartup.py	Updating fabric file to fulfil the entire deployment of a new box with no hiccups. Still needs a hosts file, and maybe some envvars for hostname.	2011-03-15 10:02:13 -04:00
redis-init	Adding fabfile config for redis.	2011-11-06 15:19:58 -08:00
redis.conf	Finishing up realtime for testing on prod.	2011-11-06 16:05:42 -08:00
requirements.txt	Moving requirements.txt -> config	2011-09-03 23:10:57 -07:00
server_migration_forwarding.txt	Fixing empty recommendations for new servers. Also adding firewall information and fixing up fabfile.	2011-03-19 18:35:44 -04:00
ssh.conf	Ading pull to refresh on feed detail in iphone app. Not done, but also added extra parameter in feed canonical model that gives seconds since last update.	2011-08-18 09:56:52 -07:00
staging.conf	Statistics graph.	2011-04-15 11:34:41 -04:00
supervisor_celeryd.conf	Ahahaha, adding motd's for each server. Also adding rabbitmq config and fixing up gunicorn config.	2011-03-17 19:26:21 -04:00
supervisor_gunicorn.conf	Ahahaha, adding motd's for each server. Also adding rabbitmq config and fixing up gunicorn config.	2011-03-17 19:26:21 -04:00
supervisor_node.conf	Fixing #42: a long-time bug of drag-and-drop not respecting order.	2012-01-14 18:54:59 -08:00
toprc	Safe recommend feed titles. Also updating fabfile.	2011-03-27 20:56:21 -04:00
tumblr.conf	Adding links to static pages (about, faq, privacy, tos, api, etc).	2011-04-01 15:10:54 -04:00
zshrc	Toning down updates on infrequently updated feeds.	2011-11-07 12:57:06 -08:00