mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-11-01 09:09:51 +00:00
000ef47e8f
* master: (73 commits) Updating iOS for iOS 6 and the new iPhone 5. Fixing typos in iOS app. Fixing a bunch of feed fetch errors. Fixing these damn Link: text urls in story modifications. Unloading the story iframe when changing feeds. Fixing sent emails for new premiums. Adding folder collapse for blurblogs. Forcing all munin graphs to start at 0. Ordering and smoothing munin graphs. Showing total fetches in task munin graph. Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs. Cleaning analytics as a beat task. Fixing server status codes in munin, and removing app feed fetches from analytics. Fixing paths munin. Normalizing paths and adding graphs for browser breakdowns, paths, and task feed status codes. Permissions on munin. Fixing typo in munin task config. Changing munin names for better graphs. New Munin views: task server breakdowns by feeds fetched, total time taken per server, and aggregate stats in the pipeline. Fixing JS issues around stories with no feeds clobbering the river view. Finishing off new feed selector. Now scrolls to matched feed, correctly loads top feed, handles errors, and handles esc. ... Conflicts: .gitignore
53 lines
936 B
Text
53 lines
936 B
Text
logs/*.log
|
|
logs/*.log.*
|
|
logs/*.pid
|
|
*.pyc
|
|
static/*
|
|
local_settings.py
|
|
celerybeat-schedule
|
|
celerybeat.pid
|
|
media/iphone/NewsBlur/build
|
|
media/iphone/build
|
|
build/
|
|
.DS_Store
|
|
**/*.perspectivev*
|
|
data/
|
|
config/certificates/*
|
|
**/*.xcuserstate
|
|
UserInterfaceState.xcuserstate
|
|
UserInterfaceState\.xcuserstate
|
|
*.xcuserstate
|
|
xcuserdata
|
|
.xcodeproj/ push.xcodeproj/project.pbxproj
|
|
*.mode1v3
|
|
*.pbxuser
|
|
media/maintenance.html
|
|
media/maintenance.html.unused
|
|
config/settings
|
|
static.tgz
|
|
media/css/circular
|
|
config/settings
|
|
config/secrets
|
|
|
|
# ----------------------
|
|
# Android
|
|
# ----------------------
|
|
# built application files
|
|
*.apk
|
|
*.ap_
|
|
|
|
# files for the dex VM
|
|
*.dex
|
|
|
|
# Java class files
|
|
*.class
|
|
|
|
# generated files
|
|
media/android/NewsBlur/bin/
|
|
media/android/NewsBlur/gen/
|
|
media/android/NewsBlurTest/bin/
|
|
media/android/NewsBlurTest/gen/
|
|
|
|
# Local configuration file (sdk path, etc)
|
|
media/android/NewsBlur/local.properties
|
|
media/android/NewsBlurTest/local.properties
|