From d5ddf67b7d689754fc37a9f6c6bce77d4877c492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Tue, 12 Jun 2018 09:49:25 +0200 Subject: [PATCH 001/120] Added the law requirements for the EU/EEA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- resources/views/site/privacy.blade.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php index 576f1af20..1903e5768 100644 --- a/resources/views/site/privacy.blade.php +++ b/resources/views/site/privacy.blade.php @@ -66,8 +66,13 @@

Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.

When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.

-

Children's Online Privacy Protection Act Compliance

-

Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.

+

Site usage by children

+ +

If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.

+ +

If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.

+ +

Law requirements can be different if this server is in another jurisdiction.

Changes to our Privacy Policy

If we decide to change our privacy policy, we will post those changes on this page.

From dc23e04d6844bbd70521233c60e2b338447772f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Tue, 12 Jun 2018 11:30:13 +0200 Subject: [PATCH 002/120] Last update date --- resources/views/site/privacy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php index 1903e5768..f5bc9ba54 100644 --- a/resources/views/site/privacy.blade.php +++ b/resources/views/site/privacy.blade.php @@ -77,7 +77,7 @@

Changes to our Privacy Policy

If we decide to change our privacy policy, we will post those changes on this page.

-

This document is CC-BY-SA. It was last updated May 31, 2018.

+

This document is CC-BY-SA. It was last updated Jun 12, 2018.

Originally adapted from the Mastodon privacy policy.

From 27ad80d9a8207c40b6ec39b7fe4ad24886cfb5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xos=C3=A9=20M?= Date: Mon, 18 Jun 2018 16:03:48 +0200 Subject: [PATCH 003/120] navmenu --- resources/lang/gl/navmenu.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 resources/lang/gl/navmenu.php diff --git a/resources/lang/gl/navmenu.php b/resources/lang/gl/navmenu.php new file mode 100644 index 000000000..1e427d5cc --- /dev/null +++ b/resources/lang/gl/navmenu.php @@ -0,0 +1,13 @@ + 'Ver perfil', + 'myTimeline' => 'A miña liña temporal', + 'publicTimeline' => 'Liña temporal pública', + 'remoteFollow' => 'Seguimento remoto', + 'settings' => 'Axustes', + 'admin' => 'Admin', + 'logout' => 'Saír', + +]; From f4881569375903f6523d14b8e05ca67202ad7a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xos=C3=A9=20M?= Date: Mon, 18 Jun 2018 16:20:00 +0200 Subject: [PATCH 004/120] backup --- .../lang/vendor/backup/gl/notifications.php | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 resources/lang/vendor/backup/gl/notifications.php diff --git a/resources/lang/vendor/backup/gl/notifications.php b/resources/lang/vendor/backup/gl/notifications.php new file mode 100644 index 000000000..8ab623b00 --- /dev/null +++ b/resources/lang/vendor/backup/gl/notifications.php @@ -0,0 +1,35 @@ + 'Mensaxe da exepción: :message', + 'exception_trace' => 'Traza da excepción: :trace', + 'exception_message_title' => 'Mensaxe da excepción', + 'exception_trace_title' => 'Traza da excepción', + + 'backup_failed_subject' => 'Erro no respaldo de :application_name', + 'backup_failed_body' => 'Importante: Algo fallou ao respaldar :application_name', + + 'backup_successful_subject' => 'Respaldo realizado correctamente :application_name', + 'backup_successful_subject_title' => 'Novo respaldo correcto!', + 'backup_successful_body' => 'Parabéns, un novo respaldo de :application_name foi realizado correctamente no disco con nome :disk_name.', + + 'cleanup_failed_subject' => 'Limpando os respaldos de :application_name failed.', + 'cleanup_failed_body' => 'Algo fallou mentras se limpaban os respaldos de :application_name', + + 'cleanup_successful_subject' => 'Limpeza correcta nos respaldos de :application_name', + 'cleanup_successful_subject_title' => 'Limpeza dos respaldos correcta!', + 'cleanup_successful_body' => 'Realizouse correctamente a limpeza dos respaldos de :application_name no disco con nome :disk_name.', + + 'healthy_backup_found_subject' => 'Os respaldos de :application_name no disco :disk_name están en bo estado', + 'healthy_backup_found_subject_title' => 'Os respaldos de :application_name están ben!', + 'healthy_backup_found_body' => 'Os respaldos de :application_name están en bo estado. Bo traballo!', + + 'unhealthy_backup_found_subject' => 'Importante: Os respaldos de :application_name non están en bo estado', + 'unhealthy_backup_found_subject_title' => 'Importante: Os respaldos de :application_name non están ben. :problem', + 'unhealthy_backup_found_body' => 'Os respaldos para :application_name no disco :disk_name non están ben.', + 'unhealthy_backup_found_not_reachable' => 'Non se puido alcanzar o disco de destino. :error', + 'unhealthy_backup_found_empty' => 'Non existen copias de respaldo para esta aplicación.', + 'unhealthy_backup_found_old' => 'O último respaldo realizouse en :date e considerase demasiado antigo.', + 'unhealthy_backup_found_unknown' => 'Lamentámolo, non se puido determinar unha causa concreta.', + 'unhealthy_backup_found_full' => 'Os respaldos están a utilizar demasiado espazo. A utilización actual de :disk_usage é maior que o límite establecido de :disk_limit.', +]; From bc5356420afde942f59954388286aeff421e9f0e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 18 Jun 2018 14:21:21 -0600 Subject: [PATCH 005/120] Update logo Fixes #295 --- public/img/pixelfed-icon-black.svg | Bin 0 -> 5460 bytes public/img/pixelfed-icon-color.svg | Bin 8092 -> 0 bytes resources/views/layouts/partial/nav.blade.php | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/img/pixelfed-icon-black.svg delete mode 100644 public/img/pixelfed-icon-color.svg diff --git a/public/img/pixelfed-icon-black.svg b/public/img/pixelfed-icon-black.svg new file mode 100644 index 0000000000000000000000000000000000000000..ec26b5a3293095b02a7e77e2a5927e41dca559c2 GIT binary patch literal 5460 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 RakhFmy~xvtE4?ec`5&h9cC!Eg literal 0 HcmV?d00001 diff --git a/public/img/pixelfed-icon-color.svg b/public/img/pixelfed-icon-color.svg deleted file mode 100644 index c3a8625bdc310c5d264153455176365201daa4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8092 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 diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 10e2bf068..36d16714b 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,7 +1,7 @@