public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dejal' into wkwebkit

Browse source
This commit is contained in:
David Sinclair 2020-04-20 17:58:00 -07:00
commit 2a69ef5133
7 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
apps/reader/views.py
View file

@ -184,19 +184,21 @@ def login(request):
@render_to('accounts/signup.html')
def signup(request):
if request.method == "POST":
signup_form = SignupForm(request.POST, prefix='signup')
return {
"form": signup_form
}
# form = SignupForm(prefix='signup', data=request.POST)
# if form.is_valid():
# new_user = form.save()
# login_user(request, new_user)
# logging.user(new_user, "~FG~SB~BBNEW SIGNUP: ~FW%s" % new_user.email)
# if not new_user.is_active:
# url = "https://%s%s" % (Site.objects.get_current().domain,
# reverse('stripe-form'))
# return HttpResponseRedirect(url)
if settings.ENFORCE_SIGNUP_CAPTCHA:
signup_form = SignupForm(request.POST, prefix='signup')
return {
"form": signup_form
}
form = SignupForm(prefix='signup', data=request.POST)
if form.is_valid():
new_user = form.save()
login_user(request, new_user)
logging.user(new_user, "~FG~SB~BBNEW SIGNUP: ~FW%s" % new_user.email)
if not new_user.is_active:
url = "https://%s%s" % (Site.objects.get_current().domain,
reverse('stripe-form'))
return HttpResponseRedirect(url)
return index(request)

8
apps/rss_feeds/models.py
View file

@ -2152,12 +2152,16 @@ class Feed(models.Model):
if len(fetch_history['push_history']):
total = total * 12
# 3 hour max for premiums, 48 hour max for free
# 4 hour max for premiums, 48 hour max for free
if subs >= 1:
total = min(total, 60*4*1)
else:
total = min(total, 60*24*2)
# Craigslist feeds get 6 hours minimum
if 'craigslist' in self.feed_address:
total = max(total, 60*6)
if verbose:
logging.debug(" ---> [%-30s] Fetched every %s min - Subs: %s/%s/%s Stories/day: %s" % (
self.log_title[:30], total,

32
clients/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -3599,7 +3599,7 @@
CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = HR7P97SD72;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -3619,7 +3619,7 @@
INFOPLIST_FILE = "Share Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.newsblur.NewsBlur.Share-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -3649,7 +3649,7 @@
CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = HR7P97SD72;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -3663,7 +3663,7 @@
INFOPLIST_FILE = "Share Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.newsblur.NewsBlur.Share-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -3695,7 +3695,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = HR7P97SD72;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -3710,7 +3710,7 @@
INFOPLIST_FILE = "Widget Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.newsblur.NewsBlur.widget;
@ -3744,7 +3744,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = HR7P97SD72;
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -3753,7 +3753,7 @@
INFOPLIST_FILE = "Widget Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.newsblur.NewsBlur.widget;
@ -3776,7 +3776,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = HR7P97SD72;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -3796,7 +3796,7 @@
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/Other Sources\"",
);
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"-lsqlite3.0",
@ -3825,7 +3825,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = HR7P97SD72;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -3844,7 +3844,7 @@
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/Other Sources\"",
);
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
@ -3970,7 +3970,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = HR7P97SD72;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -3985,7 +3985,7 @@
INFOPLIST_FILE = "Story Notification Service Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.newsblur.NewsBlur.Story-Notification-Service-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -4010,7 +4010,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = HR7P97SD72;
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -4019,7 +4019,7 @@
INFOPLIST_FILE = "Story Notification Service Extension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 10.0.1;
MARKETING_VERSION = 10.0.2;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.newsblur.NewsBlur.Story-Notification-Service-Extension";
PRODUCT_NAME = "$(TARGET_NAME)";

1
docker/local_settings.py
View file

@ -24,6 +24,7 @@ MEDIA_URL = '/media/'
SECRET_KEY = 'YOUR SECRET KEY'
AUTO_PREMIUM_NEW_USERS = True
AUTO_ENABLE_NEW_USERS = True
ENFORCE_SIGNUP_CAPTCHA = False
CACHES = {
'default': {

1
local_settings.py.template
View file

@ -24,6 +24,7 @@ MEDIA_URL = '/media/'
SECRET_KEY = 'YOUR SECRET KEY'
AUTO_PREMIUM_NEW_USERS = True
AUTO_ENABLE_NEW_USERS = True
ENFORCE_SIGNUP_CAPTCHA = False
# CACHE_BACKEND = 'dummy:///'
# CACHE_BACKEND = 'locmem:///'

7
media/css/payments.css
View file

@ -55,6 +55,10 @@
width: 360px;
}
.NB-stripe-form {
overflow: hidden;
}
.NB-static-form input,
.NB-static-form select {
font-size: 14px;
@ -70,7 +74,8 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.NB-static-oauth .NB-static-form .controls input {
.NB-static-oauth .NB-static-form .controls input,
.NB-stripe-form.NB-static-form .controls input {
width: 180px;
}
.NB-static-form .NB-label-right {

1
settings.py
View file

@ -80,6 +80,7 @@ HOMEPAGE_USERNAME = 'popular'
ALLOWED_HOSTS = ['*']
AUTO_PREMIUM_NEW_USERS = False
AUTO_ENABLE_NEW_USERS = True
ENFORCE_SIGNUP_CAPTCHA = True
PAYPAL_TEST = False
# Uncomment below to force all feeds to store this many stories. Default is to cut