mirror of
https://github.com/viq/NewsBlur.git
synced 2025-04-13 09:38:09 +00:00
8efefc6cdb
* master: Fixing hub url change subscription. Adding failed push feeds to munin. Showing correctly real-time status if feed is push. Showing correct real-time status if feed is push. Emergency fix to not have to reverse url in task fetchers. Setting up push feeds for removal. Adding munin graph for pushed feed queue and nginx conf. Logging real-time. Resubscribing to real-time feeds on add/remove feed. Adding push feeds queue. Ignoring fat ping, since it might not match URLs. Cleanup Forgive push subscription errors. Adding # of push feeds to munin. Correcting a double-encoding bug for story permalinks that was from way back when. Fixing the shit out of the feed fetcher's deleted feed handling. Also fixing PuSH support to correctly give parameters to PuSH server. Checking for push hub links safetly. Adding subscription callbacks for PuSH. Stubbing in PuSH support. Need to work it in with Feeds and upgrade rel='hub'. Conflicts: apps/reader/models.py media/js/newsblur/reader/reader.js settings.py utils/feed_fetcher.py
44 lines
2.1 KiB
Python
44 lines
2.1 KiB
Python
from django.conf.urls.defaults import include, url, patterns
|
|
from django.conf import settings
|
|
from apps.reader import views as reader_views
|
|
from apps.static import views as static_views
|
|
|
|
urlpatterns = patterns('',
|
|
url(r'^$', reader_views.index, name='index'),
|
|
(r'^reader/', include('apps.reader.urls')),
|
|
(r'^add/?', reader_views.index),
|
|
(r'^try/?', reader_views.index),
|
|
(r'^site/.*?', reader_views.index),
|
|
(r'^social/\d+/.*?', reader_views.index),
|
|
(r'^user/.*?', reader_views.index),
|
|
(r'^null/.*?', reader_views.index),
|
|
(r'^rss_feeds/', include('apps.rss_feeds.urls')),
|
|
(r'^classifier/', include('apps.analyzer.urls')),
|
|
(r'^profile/', include('apps.profile.urls')),
|
|
(r'^import/', include('apps.feed_import.urls')),
|
|
(r'^api/', include('apps.api.urls')),
|
|
(r'^recommendations/', include('apps.recommendations.urls')),
|
|
(r'^statistics/', include('apps.statistics.urls')),
|
|
(r'^social/', include('apps.social.urls')),
|
|
(r'^oauth/', include('apps.oauth.urls')),
|
|
(r'^mobile/', include('apps.mobile.urls')),
|
|
(r'^m/', include('apps.mobile.urls')),
|
|
(r'^push/', include('apps.push.urls')),
|
|
url(r'^about/?', static_views.about, name='about'),
|
|
url(r'^faq/?', static_views.faq, name='faq'),
|
|
url(r'^api/?', static_views.api, name='api'),
|
|
url(r'^press/?', static_views.press, name='press'),
|
|
url(r'^feedback/?', static_views.feedback, name='feedback'),
|
|
url(r'^iphone/?', static_views.iphone, name='iphone'),
|
|
url(r'zebra/', include('zebra.urls', namespace="zebra", app_name='zebra')),
|
|
)
|
|
|
|
if settings.DEVELOPMENT:
|
|
urlpatterns += patterns('',
|
|
(r'^media/(?P<path>.*)$', 'django.views.static.serve',
|
|
{'document_root': settings.MEDIA_ROOT}),
|
|
)
|
|
urlpatterns += patterns('',
|
|
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
|
|
{'document_root': settings.STATIC_ROOT}),
|
|
)
|