Commit dd71ba7c authored by David Morley's avatar David Morley

file upload size

parent 86611446
Pipeline #496 failed with stages
in 49 seconds
......@@ -6,7 +6,7 @@
app.views.PublisherUploader = Backbone.View.extend({
allowedExtensions: ["jpg", "jpeg", "png", "gif"],
sizeLimit: 29194304, // bytes
sizeLimit: 29194305, // bytes
initialize: function(opts) {
this.publisher = opts.publisher;
......
......@@ -25,3 +25,4 @@
%h3.text-center
= t(".be_who_you_want_to_be")
= t(".be_who_you_want_to_be_info")
......@@ -23,8 +23,6 @@
%br
<h3>Other Options:</h3><br><a href="https://flattr.com/thing/125882">Flattr</a><br>
<a href="http://play.google.com/store/apps/details?id=appinventor.ai_david_morley.DiasporgDonate">Android App</a> (It's very basic, just a way to donate more than an app you use)<br>
<a href="https://form.jotform.co/73203710020840" target="_blank">Dwolla</a><br>
<a href="https://squareup.com/market/diaspora/diasp-org-donations">Square</a><br>
<a href="https://liberapay.com/diasporg/donate">Liberapay</a><br>
Bitcoin: 16oAnzoYCy8YDFffve9D6N7KLwou3Z3c8H <br>
......
%li= link_to 'Tor', "https://diasporgc3d32vv4.onion"
%li= link_to 'i2p', "http://diasporg.i2p"
%li= link_to 'diaspora*', "https://diasporafoundation.org"
%li= link_to 'Wiki', "https://wiki.diasporafoundation.org"
%li= link_to 'Status', "https://stats.uptimerobot.com/O78WS5Bw"
%li= link_to 'Blog', "https://b.diasp.org"
%li= link_to 'Support', "https://dia.so/support"
%li= link_to 'Dia.so', "https://dia.so"
%li= link_to 'Poduptime', "https://podupti.me"
%li= link_to 'Poduptime', "https://podupti.me/diasp.org"
%li= link_to t('layouts.application.whats_new'), changelog_url
%li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org"
%li= link_to t("layouts.header.code") + " " + pod_version,
......
......@@ -35,7 +35,7 @@
%h1
#{AppConfig.settings.pod_name} - Terms of Service
%small
Last Updated: 3rd April, 2018
Last Updated: 23rd July, 2018
%p
Here are the important things you need to know about accessing and using the <strong>#{AppConfig.settings.pod_name}</strong> (#{AppConfig.environment.url}) website and service (collectively, "Service"). These are our terms of service ("Terms"). Please read them carefully.
......@@ -114,9 +114,13 @@
%li
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 automaticly from other sources may be used.
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
Hate Speech as defined by Article 20 of the ICCPR: https://www.ohchr.org/en/professionalinterest/pages/ccpr.aspx
%li
Content that is illegal or unlawful, that would otherwise create liability;
%li
......
......@@ -51,6 +51,21 @@ Eye.application("diaspora") do
end
end
with_condition(!AppConfig.environment.single_process_mode?) do
process :camo do
start_command "nodejs /home/david/camo/server.js"
daemonize true
env "PORT" => 8081
env "CAMO_KEY" => "0x24FEEDFACEDEADBEEFCAF8"
env "NODE_TLS_REJECT_UNAUTHORIZED" => 0
env "CAMO_LENGTH_LIMIT" => 39485760
env "CAMO_HEADER_VIA" => "Camo Asset Proxy from diasp.org"
env "CAMO_HOSTNAME" => "diasp.org"
pid_file "tmp/pids/camo.pid"
stop_signals [:USR1, 0, :TERM, 10.seconds, :KILL]
end
end
with_condition(AppConfig.chat.enabled? && AppConfig.chat.server.enabled?) do
process :xmpp do
start_command "bin/bundle exec rails runner Prosody.start"
......
<br>11/19/17 server move in progress, if your seeing this message you are already getting the new server. Hope to be online by 11am PT.<br><br>
<a href="https://status.diasp.org">Diasporg Network Status Page</a><br><br>
<a href="https://stats.uptimerobot.com/O78WS5Bw">Diasporg Network Status Page</a><br><br>
Pod backend offline.. If down more than 5 min, check twitter <a href="http://twitter.com/diasporg">@diasporg</a>, if no update on twitter from me, then mention or dm me there or <a href="https://dia.so/support">email</a>.
......@@ -4,8 +4,3 @@
# User-Agent: *
# Disallow: /
# To ban all spiders from only specific directories such as /people /u or /tag etc.
User-Agent: *
Disallow: /people/
Disallow: /u/
Disallow: /camo/
#!/usr/bin/env ruby
# List of spam accounts
spam_accounts = %w(idfun@diasp.org)
spam_accounts = %w(enekoblb@diasp.org)
# Delete comments even if spammer isn't a local user or spam isn't on a
# local users account
......
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