Commit graph

7672 commits

Author SHA1 Message Date
Samuel Clay
729fa13e5c Merge branch 'jstricks'
* jstricks:
  Fixing footnotes.
  Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page.
  Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love.

Conflicts:
	media/js/newsblur/views/story_detail_view.js
2014-01-06 12:10:55 -08:00
Samuel Clay
bb365d00f6 Fixing footnotes. 2014-01-06 12:10:25 -08:00
Samuel Clay
93813773c1 Bumping android version. 2014-01-05 21:42:38 -08:00
Samuel Clay
936d20265e Merge pull request #452 from dosiecki/master
Android: 3.5 bugfixes
2014-01-05 16:53:42 -08:00
ojiikun
a89ee534ae Fix crash async crash. 2014-01-05 23:40:35 +00:00
ojiikun
06099f7f64 Clean up sync cruft. Add sanity break in pagination loop. 2014-01-05 23:29:41 +00:00
Samuel Clay
c30b989545 Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page. 2014-01-05 14:55:53 -08:00
Samuel Clay
a460bece9d Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love. 2014-01-05 14:55:53 -08:00
Samuel Clay
1e0162fb31 Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page. 2014-01-05 14:55:24 -08:00
ojiikun
54eaf00e25 Fix async crash wheen sharing stories. 2014-01-05 01:28:11 +00:00
ojiikun
9bbcfae052 Empty list views differentiate between loading and truly empty. 2014-01-05 00:46:10 +00:00
ojiikun
f00cc3e049 Re-bump build level to 19. Pleae update your IDEs! 2014-01-04 22:50:22 +00:00
Samuel Clay
0486603ff0 Upping queued user interval from 5 to 2min. 2014-01-04 11:12:47 -08:00
Samuel Clay
c9f8498745 Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love. 2014-01-03 17:13:21 -08:00
Samuel Clay
f5fc687235 Merge branch 'master' into tagging
* master:
  Fixing mark as read when disabling double clicks.
  Android v3.5.
  New preferences: double-clicking site titles and unread counts.
  Fixing the default PuSH lease by setting it to 10 minutes (matching the reference hub). Huge thanks to @mihaip.
  Now forcing image sizing.
  Switch remaining story loading to new async model.
  Switch folder reading and All Stories reading to new async model.
  Move saved stories fetch to new async model.
  Generalise handling of story request responses.
  Update some auto-gen cruft that recent tools fixed.
  Switch social feeds to new async system.
  Fix some async crashes.
  Update to API level 19!
  Update to API level 19!
  Fix crash on async callback in reading fragment.
  Initial decouple of feed story sync from sync service.  Buggy.

Conflicts:
	media/js/newsblur/views/feed_title_view.js
2014-01-03 12:01:48 -08:00
Samuel Clay
4435e2d1d2 Fixing mark as read when disabling double clicks. 2014-01-03 11:58:07 -08:00
Samuel Clay
5ee2c36626 Android v3.5. 2014-01-03 11:57:55 -08:00
Samuel Clay
d3f71b8719 New preferences: double-clicking site titles and unread counts. 2014-01-02 16:30:19 -08:00
Samuel Clay
074cdb8c49 Fixing the default PuSH lease by setting it to 10 minutes (matching the reference hub). Huge thanks to @mihaip. 2014-01-02 15:03:19 -08:00
Samuel Clay
9dcfea63b3 Now forcing image sizing. 2014-01-02 14:08:20 -08:00
Samuel Clay
69926f27bf Merge pull request #451 from dosiecki/master
Android: Decouple Story Loading From Feed Loading
2014-01-02 13:21:10 -08:00
Samuel Clay
f6b7a553be Merge branch 'master' into tagging
* master:
  Now forcing image sizing.
  Upgrading feedparser.
  Fixing RSS feed for blurblogs by using permalinks instead of guids.
  Treat 12:00am as occurring at the start of the day
  Adding monit for work server.
  Removing starred stories from mongo backups.
  Logic error.
  New algorithm for figuring out how long to renew.
2014-01-02 13:16:36 -08:00
Samuel Clay
43a16804bf Now forcing image sizing. 2014-01-02 13:16:24 -08:00
Samuel Clay
72124a5ffc Upgrading feedparser. 2014-01-02 13:02:42 -08:00
Samuel Clay
b48f9bb129 Fixing RSS feed for blurblogs by using permalinks instead of guids. 2014-01-02 12:32:16 -08:00
ojiikun
ba82541b83 Switch remaining story loading to new async model. 2013-12-31 09:49:04 +00:00
ojiikun
f382b14ea0 Switch folder reading and All Stories reading to new async model. 2013-12-31 08:31:49 +00:00
ojiikun
aec64abae5 Move saved stories fetch to new async model. 2013-12-31 06:11:07 +00:00
ojiikun
38a891b4c9 Generalise handling of story request responses. 2013-12-31 03:44:08 +00:00
ojiikun
376bf7e23b Update some auto-gen cruft that recent tools fixed. 2013-12-31 03:06:26 +00:00
ojiikun
15aa6f050e Merge remote-tracking branch 'upstream/master' 2013-12-31 03:05:43 +00:00
ojiikun
81765b582f Switch social feeds to new async system. 2013-12-30 23:32:19 +00:00
Samuel Clay
2a63396bea Merge pull request #450 from richardfearn/master
Treat 12:00am as occurring at the start of the day
2013-12-27 11:46:45 -08:00
Richard Fearn
4b84eddcd6 Treat 12:00am as occurring at the start of the day
Otherwise a story published at midnight today is displayed as
"Yesterday, 12:00am".
2013-12-27 16:53:49 +00:00
ojiikun
9647d0a219 Fix some async crashes. 2013-12-27 04:13:10 +00:00
ojiikun
db7496406a Update to API level 19! 2013-12-27 04:12:29 +00:00
ojiikun
ac905387dd Update to API level 19! 2013-12-27 04:11:31 +00:00
ojiikun
7c0ea85b27 Merge remote-tracking branch 'upstream/master' 2013-12-27 03:21:12 +00:00
ojiikun
c9fdeda67c Fix crash on async callback in reading fragment. 2013-12-27 03:17:42 +00:00
Samuel Clay
a79d0fa6be Adding monit for work server. 2013-12-22 15:17:13 -08:00
Samuel Clay
7ae3692957 Removing starred stories from mongo backups. 2013-12-22 14:26:37 -08:00
ojiikun
0242aeab08 Merge remote-tracking branch 'upstream/master' 2013-12-22 21:16:09 +00:00
ojiikun
7367d9cad0 Initial decouple of feed story sync from sync service. Buggy. 2013-12-22 21:14:31 +00:00
Samuel Clay
2942b5cedd Logic error. 2013-12-20 12:46:09 -08:00
Samuel Clay
742657fa64 New algorithm for figuring out how long to renew. 2013-12-20 12:45:28 -08:00
Samuel Clay
51572b8121 Text view can now be set as the default view. 2013-12-19 12:51:29 -08:00
Samuel Clay
52b83ab39f Hiding starred story tags in Statistics modal dropdown. 2013-12-19 12:29:07 -08:00
Samuel Clay
65d172ebf3 RSS feed for saved stories. 2013-12-19 11:57:58 -08:00
Samuel Clay
feb398a2d4 Adding RSS feeds for saved tags. Still needs the actual rss feed. 2013-12-19 11:08:22 -08:00
Samuel Clay
e368abd7d0 Merge branch 'master' into tagging
* master:
  Fixing view destroy for comments.
  Fixing a number of big memory leaks.
  Fixing story intelligence trainer.
2013-12-17 11:54:47 -08:00