From b76049afdbbefb1b71069eac60b016230fd98fe2 Mon Sep 17 00:00:00 2001 From: trwnh Date: Thu, 10 Jan 2019 13:14:29 -0600 Subject: [PATCH 01/16] Make NSFW shade the same size as its container --- resources/assets/sass/custom.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 45068728..f41e7f40 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -306,13 +306,21 @@ details summary::-webkit-details-marker { } .details-animated > summary { - display: block; + display: flex; + flex-flow: column; + justify-content: center; background-color: #ECF0F1; padding-top: 50px; padding-bottom: 50px; text-align: center; } +@media (min-width: 720px) { + .details-animated > summary { + min-height: 600px; + } +} + .details-animated[open] > summary { display: none!important; } From c4c985bd4204731be49fee2979928b60f21fd356 Mon Sep 17 00:00:00 2001 From: j1t Date: Sun, 13 Jan 2019 14:09:25 +0000 Subject: [PATCH 02/16] Create site.php --- resources/lang/he/site.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/lang/he/site.php diff --git a/resources/lang/he/site.php b/resources/lang/he/site.php new file mode 100644 index 00000000..3f13e6a8 --- /dev/null +++ b/resources/lang/he/site.php @@ -0,0 +1,16 @@ + 'אודות', + 'help' => 'עזרה', + 'language' => 'שפה', + 'fediverse' => 'פדיוורס', + 'opensource' => 'קוד פתוח', + 'terms' => 'תנאים', + 'privacy' => 'פרטיות', + 'l10nWip' => 'אנחנו עדיין עובדים על תמיכה לאיזור הנוכחי', + 'currentLocale' => 'איזור נוכחי', + 'selectLocale' => 'בחרו מאחת השפות הנתמכות', + +]; From 07a04a5e616e79c6ec6382083d7d53f3b1c78157 Mon Sep 17 00:00:00 2001 From: j1t Date: Sun, 13 Jan 2019 14:16:33 +0000 Subject: [PATCH 03/16] Update profile.php --- resources/lang/he/profile.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/lang/he/profile.php b/resources/lang/he/profile.php index 13da8041..e875885d 100644 --- a/resources/lang/he/profile.php +++ b/resources/lang/he/profile.php @@ -6,4 +6,10 @@ return [ 'emptyFollowing' => 'משתמש זה עדיין אינו עוקב אחרי אף אחד!', 'emptySaved' => 'עדיין לא שמרת שום פוסט!', 'savedWarning' => 'רק אתם יכולים לראות את מה ששמרתם', + 'privateProfileWarning' => 'חשבון זה פרטי', + 'alreadyFollow' => 'כבר עוקב :username?', + 'loginToSeeProfile' => 'על מנת לראות את התמונות והסרטונים שלהם.', + + 'status.disabled.header' => 'פרופיל לא זמין', + 'status.disabled.body' => 'מצטערים, פרופיל זה אינו זמין כרגע. אנא נסו שוב בקרוב.', ]; From de769b9006c3aa4fad0a400ed2bdace2b3096c6e Mon Sep 17 00:00:00 2001 From: Sylke Vicious <41053887+silkevicious@users.noreply.github.com> Date: Fri, 25 Jan 2019 13:27:54 +0100 Subject: [PATCH 04/16] Updated italian translation --- resources/lang/it/profile.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/it/profile.php b/resources/lang/it/profile.php index 1ac98bfc..488af69f 100644 --- a/resources/lang/it/profile.php +++ b/resources/lang/it/profile.php @@ -9,4 +9,7 @@ return [ 'privateProfileWarning' => 'Questo Account è Privato', 'alreadyFollow' => 'Segui già :username?', 'loginToSeeProfile' => 'per vedere le sue foto e video.', + + 'status.disabled.header' => 'Profilo Non Disponibile', + 'status.disabled.body' => 'Scusa, questo profilo non è disponibile al momento. Per favore riprova più tardi.', ]; From 4a08a7c8f3c5a901b7308245dc656c65739ce655 Mon Sep 17 00:00:00 2001 From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com> Date: Sat, 2 Feb 2019 13:13:58 +0100 Subject: [PATCH 05/16] L10n: Update Czech translation --- resources/lang/cs/profile.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/cs/profile.php b/resources/lang/cs/profile.php index f6fa1fee..b805ad89 100644 --- a/resources/lang/cs/profile.php +++ b/resources/lang/cs/profile.php @@ -9,4 +9,7 @@ return [ 'privateProfileWarning' => 'Tento účet je soukromý', 'alreadyFollow' => 'Již uživatele :username sledujete?', 'loginToSeeProfile' => 'pro zobrazení jeho/jejích fotek a videí.', + + 'status.disabled.header' => 'Profil nedostupný', + 'status.disabled.body' => 'Omlouváme se, tento profil není v tuto chvíli dostupný. Prosím zkuste to znovu zakrátko.', ]; From 7f57dfe2bb45fd3520b1ab10a9ad3eefce4fb992 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:15:24 +0700 Subject: [PATCH 06/16] Create auth.php --- resources/lang/id/auth.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 resources/lang/id/auth.php diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php new file mode 100644 index 00000000..d8d3d1c8 --- /dev/null +++ b/resources/lang/id/auth.php @@ -0,0 +1,19 @@ + 'Kredensial ini tidak cocok dengan data kami.', + 'throttle' => 'Terlalu banyak percobaan login. COba lagi setelah :seconds detik.', + +]; From 5e1a505418a04cb4edb9bb087a616118245c88c2 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:17:49 +0700 Subject: [PATCH 07/16] Create navmenu.php --- resources/lang/id/navmenu.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 resources/lang/id/navmenu.php diff --git a/resources/lang/id/navmenu.php b/resources/lang/id/navmenu.php new file mode 100644 index 00000000..ab8fcd14 --- /dev/null +++ b/resources/lang/id/navmenu.php @@ -0,0 +1,11 @@ + 'Lihat profil saya', + 'myTimeline' => 'Linimasa Saya', + 'publicTimeline' => 'Linimasa Publik', + 'remoteFollow' => 'Ikuti Jarak Jauh', + 'settings' => 'Pengaturan', + 'admin' => 'Admin', + 'logout' => 'Keluar', + 'directMessages' => 'Pesan Langsung', +]; From 10cca0ecce311313dc6e4e5715f62f182fda3665 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:19:25 +0700 Subject: [PATCH 08/16] Create notification.php --- resources/lang/id/notification.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 resources/lang/id/notification.php diff --git a/resources/lang/id/notification.php b/resources/lang/id/notification.php new file mode 100644 index 00000000..dafcd823 --- /dev/null +++ b/resources/lang/id/notification.php @@ -0,0 +1,7 @@ + 'menyukai foto kamu.', + 'startedFollowingYou' => 'mulai mengikuti kamu.', + 'commented' => 'mengomentari posting kamu.', + 'mentionedYou' => 'menyebut nama kamu.', +]; From 1880ce6d0505129f765ca7ba8f87e60cbbf9404d Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:20:14 +0700 Subject: [PATCH 09/16] Create pagination.php --- resources/lang/id/pagination.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/lang/id/pagination.php diff --git a/resources/lang/id/pagination.php b/resources/lang/id/pagination.php new file mode 100644 index 00000000..f543b3b4 --- /dev/null +++ b/resources/lang/id/pagination.php @@ -0,0 +1,15 @@ + '« Sebelumnya', + 'next' => 'Selanjutnya »', +]; From c63ee0ab461bcd26037e9990ec2e8429e81f80bd Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:23:06 +0700 Subject: [PATCH 10/16] Create passwords.php --- resources/lang/id/passwords.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 resources/lang/id/passwords.php diff --git a/resources/lang/id/passwords.php b/resources/lang/id/passwords.php new file mode 100644 index 00000000..1b2e8096 --- /dev/null +++ b/resources/lang/id/passwords.php @@ -0,0 +1,18 @@ + 'Password minimal enam karakter dan diisi dua kali harus sama.', + 'reset' => 'Password kamu sudah di-reset!', + 'sent' => 'Kami sudah mengirim link reset password lewat email!', + 'token' => 'Token reset password ini tidak valid.', + 'user' => "Kami tidak menemukan user beralamat email tersebut.", +]; From 112fd396194cf6814c2f93961eb07b6be84087c8 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:26:46 +0700 Subject: [PATCH 11/16] Create profile.php --- resources/lang/id/profile.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 resources/lang/id/profile.php diff --git a/resources/lang/id/profile.php b/resources/lang/id/profile.php new file mode 100644 index 00000000..7ed6d253 --- /dev/null +++ b/resources/lang/id/profile.php @@ -0,0 +1,13 @@ + 'User ini belum memiliki posting!', + 'emptyFollowers' => 'User ini belum punya pengikut!', + 'emptyFollowing' => 'User ini belum mengikuti siapapun!', + 'emptySaved' => 'Kamu belum membuat posting!', + 'savedWarning' => 'Hanya kami yang bisa melihat posting kamu sendiri', + 'privateProfileWarning' => 'Akun ini Privat', + 'alreadyFollow' => 'Sudah mengikuti :username?', + 'loginToSeeProfile' => 'untuk melihat foro dan videonya.', + 'status.disabled.header' => 'Profil Tidak Tersedia', + 'status.disabled.body' => 'Maaf, profil ini sedang tidak tersedia. Silakan coba lagi kemudian.', +]; From 7f79c5e84ce73f0de42321dfd19c052e492dbe2b Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:29:04 +0700 Subject: [PATCH 12/16] Create site.php --- resources/lang/id/site.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 resources/lang/id/site.php diff --git a/resources/lang/id/site.php b/resources/lang/id/site.php new file mode 100644 index 00000000..ffe52171 --- /dev/null +++ b/resources/lang/id/site.php @@ -0,0 +1,13 @@ + 'Tentang', + 'help' => 'Bantuan', + 'language' => 'Bahasa', + 'fediverse' => 'Fediverse', + 'opensource' => 'Open Source', + 'terms' => 'Syarat', + 'privacy' => 'Privasi', + 'l10nWip' => 'Kami masih mengusahakan fitur multi bahasa ini', + 'currentLocale' => 'Locale sekarang', + 'selectLocale' => 'Pilih salah satu bahasa yang tersedia', +]; From 8353d7e3859395f5f1988bea3bece1c9dc294878 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:29:52 +0700 Subject: [PATCH 13/16] Create timeline.php --- resources/lang/id/timeline.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 resources/lang/id/timeline.php diff --git a/resources/lang/id/timeline.php b/resources/lang/id/timeline.php new file mode 100644 index 00000000..075b4129 --- /dev/null +++ b/resources/lang/id/timeline.php @@ -0,0 +1,4 @@ + 'Linimasa kamu kosong.', +]; From 4a0e1df564a9f649b20ab0569165c27ec47dd0e5 Mon Sep 17 00:00:00 2001 From: begini <32761223+begini@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:41:14 +0700 Subject: [PATCH 14/16] Create validation.php --- resources/lang/id/validation.php | 114 +++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 resources/lang/id/validation.php diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php new file mode 100644 index 00000000..3c94d618 --- /dev/null +++ b/resources/lang/id/validation.php @@ -0,0 +1,114 @@ + ':attribute harus diterima.', + 'active_url' => ':attribute bukan berupa URL yang benar.', + 'after' => ':attribute harus berupa tanggal setelah :date.', + 'after_or_equal' => ':attribute harus berupa tanggal yang sama atau setelah :date.', + 'alpha' => ':attribute hanya boleh berisi huruf.', + 'alpha_dash' => ':attribute hanya boleh berisi huruf, angka dan tanda minus.', + 'alpha_num' => ':attribute hanya boleh berisi huruf dan angka.', + 'array' => ':attribute harus berupa array.', + 'before' => ':attribute harus berupa tanggal sebelum :date.', + 'before_or_equal' => ':attribute harus berupa tanggal yang sama atau sebelum :date.', + 'between' => [ + 'numeric' => ':attribute harus antara :min dan :max.', + 'file' => ':attribute harus antara :min dan :max KB.', + 'string' => ':attribute harus antara :min dan :max karakter.', + 'array' => ':attribute harus antara :min dan :max item.', + ], + 'boolean' => ':attribute harus berupa true atau false.', + 'confirmed' => 'Konfirmasi :attribute tidak sama.', + 'date' => ':attribute bukan berupa tanggal yang benar.', + 'date_format' => ':attribute tidak sesuai dengan format :format.', + 'different' => ':attribute dan :other harus berbeda.', + 'digits' => ':attribute haurs berisi :digits digit.', + 'digits_between' => ':attribute harus antara :min dan :max digit.', + 'dimensions' => ':attribute berisi dimensi gambar yang tidak benar.', + 'distinct' => 'Bagian :attribute memiliki duplikasi.', + 'email' => ':attribute harus berupa alamat email yang benar.', + 'exists' => ':attribute yang dipilih tidak benar.', + 'file' => ':attribute harus berupa berkas.', + 'filled' => 'Bagian :attribute harus diisi.', + 'image' => ':attribute harus berupa gambar.', + 'in' => ':attribute yang dipilih tidak benar.', + 'in_array' => 'Bagian :attribute tidak ada dalam :other.', + 'integer' => ':attribute harus berupa angka bulat.', + 'ip' => ':attribute harus berupa alamat IP yang benar.', + 'ipv4' => ':attribute harus berupa alamat IPv4 yang benar.', + 'ipv6' => ':attribute harus berupa alamat IPv6 yang benar.', + 'json' => ':attribute harus berupa string JSON yang benar.', + 'max' => [ + 'numeric' => 'The :attribute may not be greater than :max.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', + ], + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => 'The :attribute must be at least :min.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', + ], + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'same' => 'The :attribute and :other must match.', + 'size' => [ + 'numeric' => 'The :attribute must be :size.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', + ], + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute format is invalid.', + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + 'attributes' => [], +]; From b79fdea270e318c5ff4224962225aaba9b5cf097 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 13 Feb 2019 13:00:36 -0700 Subject: [PATCH 15/16] Fix database migration down method --- .../2019_01_11_005556_update_profiles_table.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/database/migrations/2019_01_11_005556_update_profiles_table.php b/database/migrations/2019_01_11_005556_update_profiles_table.php index 829bedbc..53eca4d2 100644 --- a/database/migrations/2019_01_11_005556_update_profiles_table.php +++ b/database/migrations/2019_01_11_005556_update_profiles_table.php @@ -27,8 +27,10 @@ class UpdateProfilesTable extends Migration */ public function down() { - $table->dropColumn('unlisted'); - $table->dropColumn('cw'); - $table->dropColumn('no_autolink'); + Schema::table('profiles', function (Blueprint $table) { + $table->dropColumn('unlisted'); + $table->dropColumn('cw'); + $table->dropColumn('no_autolink'); + }); } } From e15d0ea891c79f7c2b15c47c1431297c10a548a4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 13 Feb 2019 13:23:26 -0700 Subject: [PATCH 16/16] Add indexes, closes #831 --- .../2019_02_13_195702_add_indexes.php | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 database/migrations/2019_02_13_195702_add_indexes.php diff --git a/database/migrations/2019_02_13_195702_add_indexes.php b/database/migrations/2019_02_13_195702_add_indexes.php new file mode 100644 index 00000000..e52c13cf --- /dev/null +++ b/database/migrations/2019_02_13_195702_add_indexes.php @@ -0,0 +1,86 @@ +index('visibility','statuses_visibility_index'); + $table->index(['in_reply_to_id', 'reblog_of_id'], 'statuses_in_reply_or_reblog_index'); + $table->index('uri', 'statuses_uri_index'); + $table->index('is_nsfw', 'statuses_is_nsfw_index'); + $table->index('created_at', 'statuses_created_at_index'); + $table->index('profile_id', 'statuses_profile_id_index'); + $table->index('local', 'statuses_local_index'); + }); + + Schema::table('notifications', function (Blueprint $table) { + $table->index('created_at','notifications_created_at_index'); + $table->index('actor_id', 'notifications_actor_id_index'); + }); + + Schema::table('profiles', function (Blueprint $table) { + $table->index('domain', 'profiles_domain_index'); + }); + + Schema::table('media', function (Blueprint $table) { + $table->index('user_id', 'media_user_id_index'); + }); + + Schema::table('likes', function (Blueprint $table) { + $table->index('created_at', 'likes_created_at_index'); + }); + + Schema::table('followers', function (Blueprint $table) { + $table->index('created_at', 'followers_created_at_index'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('statuses', function (Blueprint $table) { + $table->dropIndex('statuses_visibility_index'); + $table->dropIndex('statuses_in_reply_or_reblog_index'); + $table->dropIndex('statuses_uri_index'); + $table->dropIndex('statuses_is_nsfw_index'); + $table->dropIndex('statuses_created_at_index'); + $table->dropIndex('statuses_profile_id_index'); + $table->dropIndex('statuses_local_index'); + }); + + Schema::table('notifications', function (Blueprint $table) { + $table->dropIndex('notifications_created_at_index'); + $table->dropIndex('notifications_actor_id_index'); + }); + + Schema::table('profiles', function (Blueprint $table) { + $table->dropIndex('profiles_domain_index'); + }); + + Schema::table('media', function (Blueprint $table) { + $table->dropIndex('media_user_id_index'); + }); + + Schema::table('likes', function (Blueprint $table) { + $table->dropIndex('likes_created_at_index'); + }); + + Schema::table('followers', function (Blueprint $table) { + $table->dropIndex('followers_created_at_index'); + }); + } +}