Currently we have some license issues. We are working on it.

Commit a67db649 authored by dmorley's avatar dmorley
Browse files

remove short url auto expand, its not 1999

parent 25054069
......@@ -11,7 +11,7 @@ oldurls = urls;
}
}
});
$('body').on('mouseenter',"a[href^='https://dia.so/'][class!='expanded'],a[href*='//t.co'][class!='expanded'],a[href*='//bit.ly'][class!='expanded'],a[href*='//goo.gl'][class!='expanded'],a[href*='//j.mp'][class!='expanded'],a[href*='//is.gd'][class!='expanded']", function() {
//$('body').on('mouseenter',"a[href^='https://dia.so/'][class!='expanded'],a[href*='//t.co'][class!='expanded'],a[href*='//bit.ly'][class!='expanded'],a[href*='//goo.gl'][class!='expanded'],a[href*='//j.mp'][class!='expanded'],a[href*='//is.gd'][class!='expanded']", function() {
$(this).css('cursor','wait');
var $self = $(this);
$.ajax({
......
......@@ -18,7 +18,7 @@ class RegistrationsController < Devise::RegistrationsController
@user.seed_aspects
@user.send_welcome_message
sign_in_and_redirect(:user, @user)
logger.info "event=registration status=successful user=#{@user.diaspora_handle} ip=#{request.remote_ip}"
logger.info "event=registration status=successful user=#{@user.diaspora_handle} ip=#{request.remote_ip} email=#{@user.email}"
else
@user.errors.delete(:person)
......
......@@ -76,6 +76,8 @@
- if AppConfig.settings.terms.enable?
%p.terms.text-center#terms
= t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
%br
*This is a donation based service, it is not free
= f.submit t("registrations.new.sign_up"), class: "btn btn-block btn-large btn-primary",
data: {disable_with: t("registrations.new.submitting")}
:javascript
$(document).ready(function() {progress(76, $('#progressBar'));});
$(document).ready(function() {progress(91, $('#progressBar'));});
.contentdonations.sidebar.info-bar
2021 Fundraiser is going, goal is $1500. That keeps diasporg ad free and running for a year.
......
%li= link_to 'Tor', "http://diasporg5tj4xz5mxkd5qnrppo7tbb6ynk2gtmjw5lmz6mtbesj3k6id.onion"
%li= link_to 'i2p', "http://diasporg.i2p"
%li= link_to 'Donate', "https://b.diasp.org/items/"
%li= link_to 'diaspora*', "https://diasporafoundation.org"
%li= link_to 'Status', "https://diasp.net"
%li= link_to 'Status', "https://stats.uptimerobot.com/O78WS5Bw"
%li= link_to 'Blog', "https://b.diasp.org"
%li= link_to 'Canary', "https://canary.diasp.org"
%li= link_to 'Support', "https://support.diasp.org"
%li= link_to 'Dia.so', "https://dia.so"
%li= link_to 'Poduptime', "https://podupti.me"
......
......@@ -121,8 +121,6 @@
Artistic content that depics minors or images/language that sexulises minors;
%li
Automated content posting of any sort. No Bot, RSS readers, or scripts that post content automatically from other sources may be used.
%li
Approved bot accounts: juniorsdisk@diasp.org
%li
Content that is libelous, defamatory, bigoted, fraudulent or deceptive;
%li
......
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
rJp0kAU7upw=
=g8I5
-----END PGP PUBLIC KEY BLOCK-----
#!/home/david/.rvm/rubies/ruby-2.6.6/bin/ruby
# Load diaspora environment
ENV['RAILS_ENV'] ||= "production"
......
......@@ -11,7 +11,7 @@ use warnings;
my $log = "/home/david/diaspora/log/production.log";
## how many seconds before an unseen ip is considered old and removed from the hash?
my $expire_time = 9200;
my $expire_time = 19200;
## how many error log lines before we trigger blocking abusive ips and clean up
## of old ips in the hash? make sure this value is greater than $errors_block above.
......@@ -28,7 +28,7 @@ use warnings;
## open the log file. we are using the system binary tail which is smart enough
## to follow rotating logs. We could have used File::Tail, but tail is easier.
open(LOG,"/usr/bin/tail -35000 $log |") || die "ERROR: could not open log file.\n";
open(LOG,"/usr/bin/tail -65000 $log |") || die "ERROR: could not open log file.\n";
while(<LOG>) {
## process the log line if it contains one of these error codes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment