mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
aa7df2988d
* master: (292 commits) Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story. Fixing bug on empty river. Use the selected feed view when viewing a story Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories. Fixing accidental truncation on story when saved. Fixing story detail height in Text view when saved with tags. Fixing text tab view. Updating readability. Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one. Counting dupe feeds only once in unread counts. Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug. Fixing bounce on resize. disable debug Mark-read idempotency for social feeds. (#460) Idempotent mark-as-read DB ops. (#460) Cleaning up unread counting. (#460) Fixing height issues with new saved stories sideoptions box. Limiting new user queue. Limiting new user queue. Max overlay fully fade slightly sooner when scrolling down. (#459) ... Conflicts: media/css/reader.css media/js/newsblur/reader/reader.js media/js/newsblur/views/story_titles_header_view.js
52 lines
3.6 KiB
Python
52 lines
3.6 KiB
Python
from django.conf.urls import *
|
|
from apps.reader import views
|
|
|
|
urlpatterns = patterns('',
|
|
url(r'^$', views.index),
|
|
url(r'^login_as', views.login_as, name='login_as'),
|
|
url(r'^logout', views.logout, name='logout'),
|
|
url(r'^login', views.login, name='login'),
|
|
url(r'^autologin/(?P<username>\w+)/(?P<secret>\w+)/?', views.autologin, name='autologin'),
|
|
url(r'^signup', views.signup, name='signup'),
|
|
url(r'^feeds/?$', views.load_feeds, name='load-feeds'),
|
|
url(r'^feed/(?P<feed_id>\d+)', views.load_single_feed, name='load-single-feed'),
|
|
url(r'^page/(?P<feed_id>\d+)', views.load_feed_page, name='load-feed-page'),
|
|
url(r'^refresh_feed/(?P<feed_id>\d+)', views.refresh_feed, name='refresh-feed'),
|
|
url(r'^favicons', views.load_feed_favicons, name='load-feed-favicons'),
|
|
url(r'^river_stories', views.load_river_stories__redis, name='load-river-stories'),
|
|
url(r'^refresh_feeds', views.refresh_feeds, name='refresh-feeds'),
|
|
url(r'^interactions_count', views.interactions_count, name='interactions-count'),
|
|
url(r'^feed_unread_count', views.feed_unread_count, name='feed-unread-count'),
|
|
url(r'^starred_stories', views.load_starred_stories, name='load-starred-stories'),
|
|
url(r'^read_stories', views.load_read_stories, name='load-read-stories'),
|
|
url(r'^starred_story_hashes', views.starred_story_hashes, name='starred-story-hashes'),
|
|
url(r'^starred_rss/(?P<user_id>\d+)/(?P<secret_token>\w+)/(?P<tag_slug>[-\w]+)?/?$', views.starred_stories_rss_feed, name='starred-stories-rss-feed'),
|
|
url(r'^unread_story_hashes', views.unread_story_hashes, name='unread-story-hashes'),
|
|
url(r'^mark_all_as_read', views.mark_all_as_read, name='mark-all-as-read'),
|
|
url(r'^mark_story_as_read', views.mark_story_as_read, name='mark-story-as-read'),
|
|
url(r'^mark_story_hashes_as_read', views.mark_story_hashes_as_read, name='mark-story-hashes-as-read'),
|
|
url(r'^mark_feed_stories_as_read', views.mark_feed_stories_as_read, name='mark-feed-stories-as-read'),
|
|
url(r'^mark_social_stories_as_read', views.mark_social_stories_as_read, name='mark-social-stories-as-read'),
|
|
url(r'^mark_story_as_unread', views.mark_story_as_unread),
|
|
url(r'^mark_story_as_starred', views.mark_story_as_starred),
|
|
url(r'^mark_story_as_unstarred', views.mark_story_as_unstarred),
|
|
url(r'^mark_feed_as_read', views.mark_feed_as_read),
|
|
url(r'^delete_feed_by_url', views.delete_feed_by_url, name='delete-feed-by-url'),
|
|
url(r'^delete_feed', views.delete_feed, name='delete-feed'),
|
|
url(r'^delete_folder', views.delete_folder, name='delete-folder'),
|
|
url(r'^rename_feed', views.rename_feed, name='rename-feed'),
|
|
url(r'^rename_folder', views.rename_folder, name='rename-folder'),
|
|
url(r'^move_feed_to_folder', views.move_feed_to_folder, name='move-feed-to-folder'),
|
|
url(r'^move_folder_to_folder', views.move_folder_to_folder, name='move-folder-to-folder'),
|
|
url(r'^add_url', views.add_url),
|
|
url(r'^add_folder', views.add_folder),
|
|
url(r'^add_feature', views.add_feature, name='add-feature'),
|
|
url(r'^features', views.load_features, name='load-features'),
|
|
url(r'^save_feed_order', views.save_feed_order, name='save-feed-order'),
|
|
url(r'^feeds_trainer', views.feeds_trainer, name='feeds-trainer'),
|
|
url(r'^save_feed_chooser', views.save_feed_chooser, name='save-feed-chooser'),
|
|
url(r'^send_story_email', views.send_story_email, name='send-story-email'),
|
|
url(r'^retrain_all_sites', views.retrain_all_sites, name='retrain-all-sites'),
|
|
url(r'^load_tutorial', views.load_tutorial, name='load-tutorial'),
|
|
url(r'^buster', views.iframe_buster, name='iframe-buster'),
|
|
)
|