Commit graph

3252 commits

Author SHA1 Message Date
Samuel Clay
06511bd628 Making blurblog header more pronounced. 2013-05-08 17:22:27 -07:00
Samuel Clay
a6bc5e68f4 Merge branch 'master' into circular
# By Samuel Clay (4) and ojiikun (1)
* master:
  ES requires valid url.
  Overriding haystack elasticsearch url.
  Removing Redis autocomplete. Upgrading elasticsearch.
  Using haystack and elasticsearch for a third autocomplete feature.
  Refactor/fix mark-as-read-while-reading workflow.
2013-05-08 12:23:14 -07:00
Samuel Clay
6633560587 Merge pull request #235 from ojiikun/master
Android: Fix Mark-As-Read-While-Reading Workflow
2013-05-08 10:41:51 -07:00
ojiikun
35b680c0d9 Refactor/fix mark-as-read-while-reading workflow. 2013-05-08 10:09:36 +00:00
Samuel Clay
62a93d7ce7 Merge branch 'master' into circular
* master:
  Selecting story when clicking on a link.
2013-05-07 16:39:10 -07:00
Samuel Clay
530f8ea3dd Selecting story when clicking on a link. 2013-05-07 16:39:05 -07:00
Samuel Clay
9d2925fe0b Moving follow iframes. 2013-05-07 11:28:52 -07:00
Samuel Clay
03018669bf Starting intro at the first page. 2013-05-06 18:32:45 -07:00
Samuel Clay
53b2893df9 New ios and web screenshots for welcome page. 2013-05-06 17:22:25 -07:00
Samuel Clay
2c9b321312 New welcome page feature screenshots. 2013-05-06 16:40:38 -07:00
Samuel Clay
8d4647920e Fixing story river header. 2013-05-06 16:16:45 -07:00
Samuel Clay
0cbf23fdf2 Handling errors correctly in account settings dialog. 2013-05-06 15:21:17 -07:00
Samuel Clay
66125d306f Merge branch 'master' into circular
* master:
  Fixing double click on unread count to actually mark the feed as read.

Conflicts:
	media/js/newsblur/views/feed_title_view.js
2013-05-06 13:23:14 -07:00
Samuel Clay
34046ad2da Fixing double click on unread count to actually mark the feed as read. 2013-05-06 13:22:44 -07:00
Samuel Clay
28a8f81c7f Merge branch 'master' into circular
* master:
  Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes #230.
  Slight cleanup of fabfile.
  Adding all role to send commands to every server (specificaly setup_hosts).
2013-05-06 12:33:22 -07:00
Samuel Clay
23d8c87bda Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes #230. 2013-05-06 12:33:17 -07:00
Samuel Clay
36504d3543 Better iPad/iPhone screenshots. 2013-05-03 13:16:42 -07:00
Samuel Clay
3320c7356e Tightening up unread counts. 2013-05-02 18:05:32 -07:00
Samuel Clay
191738b621 Merge branch 'master' into circular
* master:
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.

Conflicts:
	media/js/newsblur/reader/reader.js
2013-05-02 17:52:59 -07:00
daanzu
44f6d66dc2 Change crossover to narrow view from 700 to 720px. 2013-05-02 20:24:30 -04:00
Samuel Clay
1df44ee02d Fixing iphone mockup offset. 2013-05-02 10:26:42 -07:00
Samuel Clay
486c6da5ef Fixing iOS narrow. 2013-05-01 18:02:21 -07:00
Samuel Clay
66d84f3c1a Cleaning up ios static page. Adding redesign. 2013-05-01 17:58:23 -07:00
Samuel Clay
f3e43c3f38 Merge branch 'master' into circular
* master:
  Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
  Fixing Global shared stories by checking for missing story hashes properly.
  Using index in msharedstory search.
  Using new story_hashes instead of story object ids.
  Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.

Conflicts:
	apps/social/models.py
2013-05-01 14:37:14 -07:00
Samuel Clay
7a5dfc9a47 Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug. 2013-05-01 14:32:54 -07:00
Samuel Clay
a2c5aaafc6 Adding real ip to socketio. 2013-05-01 13:22:03 -07:00
Samuel Clay
320bbd1f7e Minor style tweaks to story menu. 2013-04-30 17:08:25 -07:00
Samuel Clay
570b1d1cf3 Merge branch 'master' into circular
* master:
  Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
2013-04-30 14:08:16 -07:00
Samuel Clay
06cf8de130 Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug. 2013-04-30 13:58:16 -07:00
Samuel Clay
7a72a4d7aa Small style change on profile. 2013-04-30 13:37:25 -07:00
Samuel Clay
1024db2295 Merge branch 'master' into circular
# By ojiikun (3) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
  Upping ulimit file descriptor limits.
  README.md typo fixes
  newline at end of readme
  Fix duplicate appearance of All Stories heading.
  Revert "Fix NPE on login."
  Fix NPE on login.
2013-04-30 10:28:45 -07:00
Alexey I. Froloff
2994b9eacc Fix regression introduced by commit 3ad469a1c1
Signed-off-by: Alexey I. Froloff <raorn@raorn.name>
2013-04-30 16:33:05 +04:00
ojiikun
6dcceba7ba Fix duplicate appearance of All Stories heading. 2013-04-30 02:59:24 +00:00
Samuel Clay
3aed74e44f Submitting iOS v2.0 to App Store. 2013-04-29 12:21:24 -07:00
Samuel Clay
03a5250794 Adding maintenance mode message to ios app. 2013-04-29 11:38:06 -07:00
Samuel Clay
4e3df85b61 Merge branch 'master' into circular
# By Piotr Mitros (5) and others
# Via Samuel Clay (2) and Daniel (1)
* master:
  Normalizing settings.
  Fixed #217. Remove (via Newsblur) when sharing
  Documented additional hack to get into the system without Stripe installed
  Expanded requirements
  Fixed doc. We do require a non-fake migrate as well.
  Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py.
  Added requirements.txt
2013-04-29 11:28:38 -07:00
Samuel Clay
5f20f4b61b Fixing close email/sms dialogs uiactivity. 2013-04-29 11:28:15 -07:00
Mark Anderson
500cc6bad5 Fixed #217. Remove (via Newsblur) when sharing 2013-04-27 22:59:09 +01:00
Samuel Clay
6c75fe1d43 Fixing bug on circular progress indicator if a story isn't selected first. 2013-04-26 16:41:25 -07:00
Samuel Clay
f186b65630 Fixing story circular progress indicator for ipad. 2013-04-26 16:34:02 -07:00
Samuel Clay
86e24f78a4 Merge branch 'master' into circular
* master:
  Android v1.3 (33).
2013-04-26 15:42:43 -07:00
Samuel Clay
ae3d16335a Android v1.3 (33). 2013-04-26 15:42:35 -07:00
Samuel Clay
3ad469a1c1 Fixing single story mode. 2013-04-26 15:09:51 -07:00
Samuel Clay
325a4e677b Adding iOS 5.1 support. Not perfect, but works fine. 2013-04-26 14:30:15 -07:00
Samuel Clay
951b32d41e Turning off debugging. Releasing iOS app v2.0 RC0 2013-04-26 13:53:46 -07:00
Samuel Clay
690a661b16 Releasing new ipa for ios v2.0. 2013-04-26 13:51:03 -07:00
Samuel Clay
cfdc5882c4 Adding Open in Safari UIActivity. Total hack on ShareThis library, but it's so necessary it hurts a little less. Thanks again to @pbones for making this happen. 2013-04-26 13:04:11 -07:00
Samuel Clay
9d149ea140 Merge branch 'master' into circular
# By ojiikun
# Via Samuel Clay (1) and ojiikun (1)
* master:
  Extra documentation on sqlite quirks.
  Clear DB on upgrade. Fix DB query for all folders.
2013-04-26 11:59:49 -07:00
Samuel Clay
f3ff9ff476 Fixing Text view. 2013-04-26 11:36:45 -07:00
ojiikun
0ad5f392a8 Extra documentation on sqlite quirks. 2013-04-26 09:04:09 +00:00