From 421d838e3549a16b2d1f2bb2ba89979c24e0c1e2 Mon Sep 17 00:00:00 2001
From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com>
Date: Tue, 29 Dec 2020 19:11:47 +0300
Subject: [PATCH 1/2] Fix retry after header

---
 app/Services/Backups/InitiateBackupService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/Backups/InitiateBackupService.php b/app/Services/Backups/InitiateBackupService.php
index f66722191..0aa7ae4ed 100644
--- a/app/Services/Backups/InitiateBackupService.php
+++ b/app/Services/Backups/InitiateBackupService.php
@@ -114,7 +114,7 @@ class InitiateBackupService
             $previous = $this->repository->getBackupsGeneratedDuringTimespan($server->id, $period);
             if ($previous->count() >= $limit) {
                 throw new TooManyRequestsHttpException(
-                    CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addMinutes(10)),
+                    CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addSeconds($period)),
                     sprintf('Only %d backups may be generated within a %d second span of time.', $limit, $period)
                 );
             }

From 5f284dad1d79a9f440328b3d5d3f752d28cbe189 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 30 Dec 2020 18:13:28 -0800
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7742f3890..541c2df60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.2.0
+### Fixed
+* Fixes newest backup being deleted when creating a new one using the schedule tasks, rather than the oldest backup.
+* Fixes multiple encoding issues when handling file names in the manager.
+* Fixes database password not properly being copied to the clipboard when clicked.
+* Fixes failed transfers unintentionally locking a server into a failed state and not properly releasing allocations that were reserved.
+* Fixes error box on server pages having an oval refresh button rather than a perfect circle.
+* Fixes a bunch of errors and usage issues relating to backups especially when uploading to S3-based systems.
+* Fixes HMR breaking navigation in development modes on the frontend.
+
+### Changed
+* Updated Paper egg to default to Java 11 as the base docker image.
+* Removes the file mode display from the File Manager row listing.
+* Updated input UI elements to have thicker borders and more consistent highlighting when active.
+* Changed searchbar toggle from `"k"` to `Cmd/Ctrl + "/"` to avoid accidental toggles and be more consistent with other sites.
+* Upgrades TailwindCSS to `v2`.
+
+### Added
+* Adds support for eggs to define multiple Docker images that can be selected by users (e.g. Java 8 & 11 images for a single egg).
+* Adds support for configuring the default interval for failed backups to be pruned from the system to avoid long running backups being incorrectly cleared.
+* Adds server transfer output logging to the server console allowing admins to see how a transfer is progressing directly in the UI.
+* Adds client API endpoint to download a file from a remote souce. This functionality is not currently expressed in the UI.
+
 ## v1.1.3
 ### Fixed
 * Server bulk power actions command will no longer attempt to run commands against installing or suspended servers.