Commit graph

6221 commits

Author SHA1 Message Date
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
Samuel Clay
7c32fea650 Normalizing settings. 2013-04-28 21:39:52 -07:00
Samuel Clay
7e5172876d Merge pull request #221 from pmitros/master
Slightly simplified development install
2013-04-27 20:36:44 -07:00
ojiikun
31fe0293da Revert "Fix NPE on login."
This reverts commit 6eeac845d8.
2013-04-28 02:28:34 +00:00
Daniel
3fadddd399 Merge pull request #222 from manderson23/master
Android: Remove (via Newsblur) when sharing
2013-04-27 19:15:46 -07:00
Mark Anderson
500cc6bad5 Fixed #217. Remove (via Newsblur) when sharing 2013-04-27 22:59:09 +01:00
Piotr Mitros
7ad5693a49 Documented additional hack to get into the system without Stripe installed 2013-04-27 15:18:56 -04:00
Piotr Mitros
a5b7b85b03 Expanded requirements 2013-04-27 14:54:14 -04:00
Piotr Mitros
81fd273b15 Fixed doc. We do require a non-fake migrate as well. 2013-04-27 14:30:39 -04:00
Piotr Mitros
5fa8bde9ca Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py. 2013-04-27 14:26:53 -04:00
Piotr Mitros
abed85920b Added requirements.txt
This allows you to:
  pip install -r requirements.txt
2013-04-27 14:01:04 -04:00
ojiikun
6eeac845d8 Fix NPE on login. 2013-04-27 07:00:15 +00: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
Samuel Clay
f35b2f5f88 Merge pull request #218 from ojiikun/master
Ensure All Stories Heading Always Appears
2013-04-26 11:31:52 -07:00
ojiikun
0ad5f392a8 Extra documentation on sqlite quirks. 2013-04-26 09:04:09 +00:00
ojiikun
d38a9d5275 Clear DB on upgrade. Fix DB query for all folders. 2013-04-26 07:17:09 +00:00
Samuel Clay
75388bcb3c Adding Im Feeling Generous button to stripe form. Needs free user queue. 2013-04-25 18:58:36 -07:00
Samuel Clay
d5968599ea New icons for feedchooser/premium. Adding premium menu option. Moving from radio payment amount controls to single checkbox, graciously inspired by @pbones. 2013-04-25 17:57:33 -07:00
Samuel Clay
82b9055af5 Merge branch 'master' into circular
# By ojiikun
# Via Samuel Clay (1) and ojiikun (1)
* master:
  Log user out if API response claims not authed.
2013-04-25 13:03:00 -07:00
Samuel Clay
de76448c9c Major intelligence refactoring to hide/show stories on training. 2013-04-25 13:01:47 -07:00
Samuel Clay
a7e670a5ed Fixing titles scroll in Firefox. 2013-04-25 13:01:47 -07:00
Samuel Clay
55eb479f4d Showing hidden stories button on feeds even for stories that are read. Fixing story classifiers modal dialog scrolling. 2013-04-25 13:01:47 -07:00
Samuel Clay
4c711fd094 Merge pull request #216 from ojiikun/master
Android: Force Logout if API Indicates Not Authed
2013-04-24 12:11:36 -07:00
Samuel Clay
ff1227d101 Merge pull request #214 from lance0428/circular
New unread count rectangle colors - #182
2013-04-24 12:10:38 -07:00
Samuel Clay
f1d64470f5 Adding Metroblur, another windows phone app. 2013-04-24 11:56:39 -07:00
ojiikun
96d0e077a2 Log user out if API response claims not authed. 2013-04-24 09:54:41 +00:00
Lance Johnson
6efd51576a New unread count rectangle colors - #182 2013-04-23 23:25:39 -05:00
Samuel Clay
66b7fa5af2 Merge branch 'master' into circular
* master:
  If a feed has no stories, don't choke on latest story.
2013-04-23 21:23:01 -07:00
Samuel Clay
fbe5f4422e If a feed has no stories, don't choke on latest story. 2013-04-23 21:22:49 -07:00
Samuel Clay
070591de35 Merge branch 'master' into circular
* master:
  Upping to 5000 feeds per minute.
2013-04-23 21:17:11 -07:00
Samuel Clay
6a3d043ced Upping to 5000 feeds per minute. 2013-04-23 21:17:03 -07:00
Samuel Clay
60f86b1967 Merge branch 'schedule_dev' into circular
* schedule_dev:
  Fixing overcommit_memory allocation error for new redis machines.
  Adding metric for last story date, used to calculate next scheduled update.
  Correcting for premiums being counted twice.
  Use average stories per month in calc.
  Complete rewrite of feed update schedule.
2013-04-23 20:49:59 -07:00
Samuel Clay
68b0ec6683 Merge branch 'master' into schedule_dev
* master:
  Fixing overcommit_memory allocation error for new redis machines.
2013-04-23 20:49:53 -07:00
Samuel Clay
78d11e3123 Merge branch 'schedule'
* schedule:
  Adding metric for last story date, used to calculate next scheduled update.
  Correcting for premiums being counted twice.
  Use average stories per month in calc.
  Complete rewrite of feed update schedule.
2013-04-23 20:49:42 -07:00
Lance Johnson
a391e565f1 Merge branch 'circular' of https://github.com/samuelclay/NewsBlur into ciruclar 2013-04-23 21:49:32 -05:00
Lance Johnson
f1748e88e6 Revert "New unread count colors - #182"
This reverts commit 46f41c3082.
2013-04-23 21:26:09 -05:00
Samuel Clay
06677b706a Moving dev to haproxy. 2013-04-23 18:35:37 -07:00