Commit graph

10101 commits

Author SHA1 Message Date
dosiecki
90116ee45d Complete unread recounting after reading sessions. 2015-02-13 01:14:46 -08:00
Samuel Clay
a1c8cd7925 Monitoring disk usage should fail on error. 2015-02-12 11:51:08 -08:00
Samuel Clay
bdea41f131 Fixing pythonpath for disk monitor. 2015-02-11 17:37:41 -08:00
Samuel Clay
afee20edca Adding disk usage monitor to all database servers. 2015-02-11 17:30:15 -08:00
Samuel Clay
86a73d7c91 Deleting unstarred story as part of starred story cleanup. 2015-02-11 15:55:18 -08:00
Samuel Clay
f4832ce566 Logging starred story params. 2015-02-11 15:37:14 -08:00
Samuel Clay
d83df1a6a6 Logging starred story params. 2015-02-11 15:35:48 -08:00
Samuel Clay
c671b4283e Removing ttl from munin. 2015-02-11 15:18:24 -08:00
Samuel Clay
d50885c18f Removing ttl from munin. 2015-02-11 15:17:55 -08:00
Samuel Clay
26124dfed3 Removing ttl from munin. 2015-02-11 15:16:16 -08:00
Samuel Clay
dc1b722cf3 Removing ttl from redis munin. 2015-02-11 15:11:56 -08:00
dosiecki
73136825ab Best-effort recount stories after a mark-multi operation. 2015-02-11 14:34:40 -08:00
Samuel Clay
0b853d780a Removing backported grid fix. 2015-02-11 12:01:19 -08:00
Samuel Clay
9f3eb7cee9 Merge branch 'master' into grid
* master:
  Backporting grid layout so that if a user goes from dev, which has the new grid, back to www, which doesn't, they will still be able to use the site.
2015-02-11 12:01:06 -08:00
Samuel Clay
2118d4b164 Backporting grid layout so that if a user goes from dev, which has the new grid, back to www, which doesn't, they will still be able to use the site. 2015-02-11 12:00:14 -08:00
Samuel Clay
b7393e70fb Merge branch 'master' into grid
* master:
  Marking all site stories as read with confirmation turned off should also work on mark read buttons (not just shift+a).
2015-02-11 11:56:43 -08:00
Samuel Clay
626d483212 Marking all site stories as read with confirmation turned off should also work on mark read buttons (not just shift+a). 2015-02-11 10:47:49 -08:00
Samuel Clay
06d2457c1e Marking stories read as they are scrolled past. 2015-02-11 10:42:06 -08:00
Samuel Clay
0b8bfa37c8 Merge branch 'master' into grid
* master:
  Adding mark read confirmation preference.
2015-02-10 18:03:21 -08:00
Samuel Clay
72d0dc441d Adding mark read confirmation preference. 2015-02-10 18:03:16 -08:00
Samuel Clay
8b92dbbc90 Removing log. 2015-02-10 17:43:24 -08:00
Samuel Clay
dffb0c55bd Fixing broken view swap. 2015-02-10 17:25:45 -08:00
Samuel Clay
e799633d15 Preventing undefined view layout to take control. 2015-02-10 17:21:14 -08:00
Samuel Clay
9299c3524a Capturing undefined view settings. 2015-02-10 17:16:47 -08:00
Samuel Clay
4f4fd3f86c Correctly re-rendering story titles when switch into and out of grid layout. 2015-02-10 17:04:32 -08:00
Samuel Clay
23d32808f1 Font sizes for grid. 2015-02-10 16:05:51 -08:00
Samuel Clay
3aa661ab5b Finishing up overriding grid columns. Need to fix active story and font size changes. 2015-02-10 15:40:53 -08:00
Samuel Clay
5352b11588 Fixing image loading on grid. Only loads images > 100 px wide. 2015-02-10 15:12:47 -08:00
Samuel Clay
645018c1f1 Adding link in preferences to clear all overridden story layouts and story views. 2015-02-10 14:45:03 -08:00
Samuel Clay
dca3f99167 Moving authors to bottom of grid story title. 2015-02-10 14:00:15 -08:00
dosiecki
e3edb5542a Switch unread tracking to increment/decrement metadata counts rather than counting stories. 2015-02-10 02:04:03 -08:00
Samuel Clay
a3323de772 Laying out web now only refreshes right side when changing views. Faster and smoother. 2015-02-09 17:47:05 -08:00
Samuel Clay
bed0f9d0e8 Merge branch 'master' into grid
* master:
  Adding mark_newer_stories_as_read to socialsubs. Uses story date and not shared date, probably to its detriment.
  Adding check to paypal resub ipn.
  Fix background colour for blurblog share table in dark theme
2015-02-09 16:43:45 -08:00
Samuel Clay
e46d759c18 Adding mark_newer_stories_as_read to socialsubs. Uses story date and not shared date, probably to its detriment. 2015-02-09 16:25:10 -08:00
Samuel Clay
065f12cb3e Adding check to paypal resub ipn. 2015-02-09 13:51:12 -08:00
Daniel
ca5b6d7bf8 Merge pull request #660 from manderson23/mark
Android: Fix background colour for blurblog share table in dark theme
2015-02-08 15:17:14 -08:00
Mark Anderson
bcdf750d92 Fix background colour for blurblog share table in dark theme 2015-02-08 23:01:56 +00:00
Samuel Clay
a040fd702a Grid columns override. Still needs override. 2015-02-06 15:02:32 -08:00
Samuel Clay
bb092dc450 Moving from global story layout to per-site story layout. Needs work when switching layouts while on an active story. 2015-02-06 13:28:55 -08:00
Samuel Clay
a8bb32f1fa Merge branch 'master' into grid
* master:
  Fixing organizer to actually delete feeds when in flat hierarchy.
  More use of private method for converting group position to index in FolderListAdapter.
  Add global shared stories icon
  Remove mark as unread from menu in GlobalSharedStoriesReading
  Fix querying for global shared stories
  Fix indexing in FolderListAdapter. Fix title for GlobalSharedStoriesReading.
  Wire everything together to load global shared stories
  Initial work on activity/fragment/feedset for global shared stories
  Single method to convert group position to folder index
  Fix indexing into activeFolderNames to take into account additional row for global shared stories.
  Initial work to show row for global shared stories
  Add constant for position of all shared stories
2015-02-06 12:00:34 -08:00
Samuel Clay
bacbf46d8f Fixing organizer to actually delete feeds when in flat hierarchy. 2015-02-06 11:55:41 -08:00
dosiecki
8068543d17 Enable debug logging. 2015-02-06 10:59:36 -08:00
dosiecki
4c8bdba4b0 Bump project to Android 21. 2015-02-06 10:59:24 -08:00
dosiecki
4929618577 Fix activity drop after logout/login. 2015-02-05 12:57:34 -08:00
dosiecki
819c17d0f6 Fix unclean shutdowns. 2015-02-05 12:47:55 -08:00
dosiecki
484258e249 Remove cruft. 2015-02-04 17:40:47 -08:00
dosiecki
77373e1bff Remove cruft. 2015-02-04 17:00:59 -08:00
dosiecki
7be870a622 Merge remote-tracking branch 'upstream/master'
Conflicts:
	clients/android/NewsBlur/AndroidManifest.xml
2015-02-04 16:36:27 -08:00
Daniel
b400cc079b Merge pull request #658 from manderson23/mark
Android: Global Shared Stories
2015-02-04 16:34:40 -08:00
dosiecki
b408f02026 Remove cruft. 2015-02-04 16:29:55 -08:00