From: Dan Brown <redacted>
Date: Sat, 2 Jan 2021 15:45:18 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Swoy/BookStack into Swoy-master
X-Git-Tag: v0.31.0~3^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a04a800258b726876ff2badffe903b247aa0f676?hp=-c

Merge branch 'master' of git://github.com/Swoy/BookStack into Swoy-master
---

a04a800258b726876ff2badffe903b247aa0f676
diff --combined app/Config/app.php
index a4367d484,23c4bb0c7..120af0a8d
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@@ -31,13 -31,6 +31,13 @@@ return 
      // If set to false then a limit will not be enforced.
      'revision_limit' => env('REVISION_LIMIT', 50),
  
 +    // The number of days that content will remain in the recycle bin before
 +    // being considered for auto-removal. It is not a guarantee that content will
 +    // be removed after this time.
 +    // Set to 0 for no recycle bin functionality.
 +    // Set to -1 for unlimited recycle bin lifetime.
 +    'recycle_bin_lifetime' => env('RECYCLE_BIN_LIFETIME', 30),
 +
      // Allow <script> tags to entered within page content.
      // <script> tags are escaped by default.
      // Even when overridden the WYSIWYG editor may still escape script content.
@@@ -52,10 -45,6 +52,10 @@@
      // and used by BookStack in URL generation.
      'url' => env('APP_URL', '') === 'http://bookstack.dev' ? '' : env('APP_URL', ''),
  
 +    // A list of hosts that BookStack can be iframed within.
 +    // Space separated if multiple. BookStack host domain is auto-inferred.
 +    'iframe_hosts' => env('ALLOWED_IFRAME_HOSTS', null),
 +
      // Application timezone for back-end date functions.
      'timezone' => env('APP_TIMEZONE', 'UTC'),
  
@@@ -63,7 -52,7 +63,7 @@@
      'locale' => env('APP_LANG', 'en'),
  
      // Locales available
-     'locales' => ['en', 'ar', 'bg', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
+     'locales' => ['en', 'ar', 'bg', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'no_NB', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
  
      //  Application Fallback Locale
      'fallback_locale' => 'en',
@@@ -128,7 -117,6 +128,7 @@@
          BookStack\Providers\EventServiceProvider::class,
          BookStack\Providers\RouteServiceProvider::class,
          BookStack\Providers\CustomFacadeProvider::class,
 +        BookStack\Providers\CustomValidationServiceProvider::class,
      ],
  
      /*
diff --combined resources/lang/en/settings.php
index fe7ebc612,38be68e47..a81a801bb
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -68,7 -68,7 +68,7 @@@ return 
      'maint' => 'Maintenance',
      'maint_image_cleanup' => 'Cleanup Images',
      'maint_image_cleanup_desc' => "Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.",
 -    'maint_image_cleanup_ignore_revisions' => 'Ignore images in revisions',
 +    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
      'maint_image_cleanup_run' => 'Run Cleanup',
      'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
      'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
@@@ -80,27 -80,6 +80,27 @@@
      'maint_send_test_email_mail_subject' => 'Test Email',
      'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
      'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
 +    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
 +    'maint_recycle_bin_open' => 'Open Recycle Bin',
 +
 +    // Recycle Bin
 +    'recycle_bin' => 'Recycle Bin',
 +    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
 +    'recycle_bin_deleted_item' => 'Deleted Item',
 +    'recycle_bin_deleted_by' => 'Deleted By',
 +    'recycle_bin_deleted_at' => 'Deletion Time',
 +    'recycle_bin_permanently_delete' => 'Permanently Delete',
 +    'recycle_bin_restore' => 'Restore',
 +    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
 +    'recycle_bin_empty' => 'Empty Recycle Bin',
 +    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
 +    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
 +    'recycle_bin_destroy_list' => 'Items to be Destroyed',
 +    'recycle_bin_restore_list' => 'Items to be Restored',
 +    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
 +    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
 +    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
 +    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
  
      // Audit Log
      'audit' => 'Audit Log',
@@@ -111,7 -90,7 +111,7 @@@
      'audit_deleted_item_name' => 'Name: :name',
      'audit_table_user' => 'User',
      'audit_table_event' => 'Event',
 -    'audit_table_item' => 'Related Item',
 +    'audit_table_related' => 'Related Item or Detail',
      'audit_table_date' => 'Activity Date',
      'audit_date_from' => 'Date Range From',
      'audit_date_to' => 'Date Range To',
@@@ -157,7 -136,6 +157,7 @@@
      'user_profile' => 'User Profile',
      'users_add_new' => 'Add New User',
      'users_search' => 'Search Users',
 +    'users_latest_activity' => 'Latest Activity',
      'users_details' => 'User Details',
      'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
      'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
@@@ -175,10 -153,7 +175,10 @@@
      'users_delete_named' => 'Delete user :userName',
      'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
      'users_delete_confirm' => 'Are you sure you want to delete this user?',
 -    'users_delete_success' => 'Users successfully removed',
 +    'users_migrate_ownership' => 'Migrate Ownership',
 +    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
 +    'users_none_selected' => 'No user selected',
 +    'users_delete_success' => 'User successfully removed',
      'users_edit' => 'Edit User',
      'users_edit_profile' => 'Edit Profile',
      'users_edit_success' => 'User successfully updated',
@@@ -239,6 -214,7 +239,7 @@@
          'ja' => '日本語',
          'ko' => '한국어',
          'nl' => 'Nederlands',
+         'no_NB' => 'Norsk (Bokmål)',
          'pl' => 'Polski',
          'pt_BR' => 'Português do Brasil',
          'ru' => 'Русский',