Commit graph

7724 commits

Author SHA1 Message Date
ojiikun
3a26a533f5 Clean up injected meta-html to remove warnings. 2014-01-22 23:23:41 +00:00
ojiikun
5618413dab Fix crash. 2014-01-22 22:47:50 +00:00
Samuel Clay
9110649677 Sync all twitter photos for past 14 days. 2014-01-21 22:42:38 -08:00
Samuel Clay
5fa400a3e3 Upgrading pip as part of pip req. 2014-01-21 17:30:20 -08:00
Samuel Clay
7f2a3c4b1a Upping pip. 2014-01-21 17:27:15 -08:00
Samuel Clay
c589212e30 Adding pip updater. 2014-01-21 16:56:03 -08:00
Samuel Clay
d262c15d91 Merge branch 'oauth'
* oauth:
  Focusing login name field on load.
  Whoops, errant print statement.
  Styling login and authorize oauth templates.
  Adding login view and integrating oauth middleware and authentication backend. Wow that was easy.
  Initial oauth provider commit.
2014-01-21 16:52:14 -08:00
Samuel Clay
0992791787 Focusing login name field on load. 2014-01-21 16:47:25 -08:00
Samuel Clay
b4963945f8 Merge branch 'master' into oauth
* master:
  Updating tweepy to v2.2.
  Switching starring story unique index parameter.
  Android v3.6.1 has new font sizes.
  Fixing race condition on starring stories.
  Typo on exception.
  Typo on exception.
  Fixing the unstarring bugs.
  Discrete text sizes rather than linear, new XXL size. (#474, #392)
  Fixing log.
  Cutting trim log in half.
  Turning off chance for cleanup. Everybody gets a cleanup.
  No need for progress on trim.
  Handling users who only read feeds to which they are subscribed.
  Fixing inaccurate counts.
  Sending a max of 1,000 read stories at a time.
  Adding logging and correcting logic error in auto trim.
  Cleaning up user read stories.

Conflicts:
	apps/reader/views.py
2014-01-21 16:38:57 -08:00
Samuel Clay
3f7b80e4d1 Updating tweepy to v2.2. 2014-01-21 16:38:20 -08:00
Samuel Clay
bd441ed7c2 Switching starring story unique index parameter. 2014-01-21 16:23:34 -08:00
Samuel Clay
5b1f144527 Android v3.6.1 has new font sizes. 2014-01-21 16:11:59 -08:00
Samuel Clay
54c9efd0b6 Merge pull request #475 from dosiecki/master
Android: Discrete text sizes rather than linear, new XXL size.
2014-01-21 16:06:00 -08:00
Samuel Clay
b5488e7509 Fixing race condition on starring stories. 2014-01-21 16:03:34 -08:00
Samuel Clay
91a61fd1ca Typo on exception. 2014-01-21 15:41:21 -08:00
Samuel Clay
f00d88625f Typo on exception. 2014-01-21 15:40:37 -08:00
Samuel Clay
68294f6489 Fixing the unstarring bugs. 2014-01-21 15:37:59 -08:00
ojiikun
bc12afaef1 Discrete text sizes rather than linear, new XXL size. (#474, #392) 2014-01-21 23:16:39 +00:00
Samuel Clay
91a0e69411 Fixing log. 2014-01-21 15:05:47 -08:00
Samuel Clay
491aea5f01 Cutting trim log in half. 2014-01-21 15:00:47 -08:00
Samuel Clay
178f7983c8 Turning off chance for cleanup. Everybody gets a cleanup. 2014-01-21 14:56:59 -08:00
Samuel Clay
b95927ff29 No need for progress on trim. 2014-01-21 14:05:41 -08:00
Samuel Clay
d5599954ad Handling users who only read feeds to which they are subscribed. 2014-01-21 13:53:31 -08:00
Samuel Clay
e2a11eb42e Fixing inaccurate counts. 2014-01-21 13:51:13 -08:00
Samuel Clay
0df1c98e79 Sending a max of 1,000 read stories at a time. 2014-01-21 13:49:00 -08:00
Samuel Clay
376529252d Adding logging and correcting logic error in auto trim. 2014-01-21 13:44:16 -08:00
Samuel Clay
5ae725364f Cleaning up user read stories. 2014-01-21 13:34:53 -08:00
Samuel Clay
39abe36598 Merge branch 'master' into oauth
* master:
  Android v3.6.
  Order saved stories by saved date rather than published date. (#463)
  Fixing subscribing to tryfeeds.
  Fixing story tags in Text view.
  Show loading screen when switching story list mode.
  Pass default feed view into ReadingItemFragment. Move loading original text into ReadingItemFragment.
2014-01-21 13:04:28 -08:00
Samuel Clay
b1fa7ef5f8 Android v3.6. 2014-01-21 12:43:26 -08:00
Samuel Clay
94ddb325e5 Merge pull request #473 from dosiecki/master
Android: Order saved stories by saved date rather than published date. (#463)
2014-01-21 09:43:20 -08:00
ojiikun
dcc7a8aaf7 Order saved stories by saved date rather than published date. (#463) 2014-01-20 21:16:59 +00:00
Samuel Clay
d6877a9439 Fixing subscribing to tryfeeds. 2014-01-17 13:58:52 -08:00
Samuel Clay
74c770d62e Fixing story tags in Text view. 2014-01-17 11:24:22 -08:00
Samuel Clay
a397305b85 Merge pull request #470 from dosiecki/master
Android: Show loading screen when switching story list mode.
2014-01-16 15:25:24 -08:00
ojiikun
bebc6d89b2 Show loading screen when switching story list mode. 2014-01-16 23:16:44 +00:00
Daniel
22bca6a215 Merge pull request #469 from manderson23/defaultview
Android: Move loading original text into ReadingItemFragment
2014-01-16 15:09:40 -08:00
Mark Anderson
a23d369e30 Pass default feed view into ReadingItemFragment. Move loading original text into ReadingItemFragment. 2014-01-16 23:00:09 +00:00
Samuel Clay
fe99c08dc0 Merge branch 'master' into oauth
* master:
  Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
2014-01-16 13:26:57 -08:00
Samuel Clay
869027b0fc Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story. 2014-01-16 12:55:59 -08:00
Samuel Clay
434c304889 Whoops, errant print statement. 2014-01-15 17:49:10 -08:00
Samuel Clay
f5e8826ba8 Styling login and authorize oauth templates. 2014-01-15 17:12:24 -08:00
Samuel Clay
c7d158a654 Adding login view and integrating oauth middleware and authentication backend. Wow that was easy. 2014-01-15 15:41:18 -08:00
Samuel Clay
61d6240694 Merge branch 'master' into oauth
* master:
  Fixing bug on empty river.
  Use the selected feed view when viewing a story
  Add default view menu option for all social and saved stories. Use selected preference when viewing stories.
  Pass default story view into Reading activity. Add menus entry for all stories, feeds and folders.
  Add enum for default feed view and preference methods. Add dialog for selecting default view. Update Reading activity to use the default feed view enum.
2014-01-15 14:58:47 -08:00
Samuel Clay
37c909dc16 Fixing bug on empty river. 2014-01-15 14:30:01 -08:00
Samuel Clay
7af614a324 Initial oauth provider commit. 2014-01-15 14:29:35 -08:00
Samuel Clay
46e409a571 Merge pull request #468 from manderson23/defaultview
Android: Add folder/feed preference for story/text view
2014-01-15 12:49:12 -08:00
Mark Anderson
3992491bb4 Merge remote-tracking branch 'upstream/master' into defaultview 2014-01-15 20:32:39 +00:00
Mark Anderson
657e31e554 Use the selected feed view when viewing a story 2014-01-15 20:29:25 +00:00
Samuel Clay
dfdbc6e398 Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories. 2014-01-15 11:53:38 -08:00
Samuel Clay
cdf90ed5be Fixing accidental truncation on story when saved. 2014-01-14 18:15:02 -08:00