diff --git a/.env.example b/.env.example index 608080562f4..a10ca51e101 100644 --- a/.env.example +++ b/.env.example @@ -12,7 +12,6 @@ DB_PORT=3306 DB_DATABASE=homestead DB_USERNAME=homestead DB_PASSWORD=secret -DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true DB_LOG_SQL=false # leave empty or delete the line for default (empty string). diff --git a/.env.mariadb.travis b/.env.mariadb.travis index c73936eff95..0fb9712dcaa 100644 --- a/.env.mariadb.travis +++ b/.env.mariadb.travis @@ -7,7 +7,6 @@ DB_PORT=3306 DB_DATABASE=homestead_test DB_USERNAME=root DB_PASSWORD= -DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true CACHE_DRIVER=array SESSION_DRIVER=array diff --git a/.env.postgresql.travis b/.env.postgresql.travis index ccfa1435c28..809bc0f6766 100644 --- a/.env.postgresql.travis +++ b/.env.postgresql.travis @@ -7,7 +7,6 @@ DB_PORT=5432 DB_DATABASE=homestead_test DB_USERNAME=postgres DB_PASSWORD= -DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true CACHE_DRIVER=array SESSION_DRIVER=array diff --git a/app/ControllerFunctions/Install/RequirementsChecker.php b/app/ControllerFunctions/Install/RequirementsChecker.php index 5699072d3f6..780240fd86d 100644 --- a/app/ControllerFunctions/Install/RequirementsChecker.php +++ b/app/ControllerFunctions/Install/RequirementsChecker.php @@ -65,7 +65,7 @@ public function check(array $requirements) // @codeCoverageIgnoreStart default: - break; + break; // @codeCoverageIgnoreEnd } } diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 1d9f5a67501..a4a2ff3834a 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -194,7 +194,6 @@ public function server(Request $request) $this->memLimit *= 1024 * 1024 * 1024 * 1024; break; default: - $this->memLimit *= 1; break; // @codeCoverageIgnoreEnd } diff --git a/config/urls.php b/config/urls.php index f8ee88e7015..035ec6040cb 100644 --- a/config/urls.php +++ b/config/urls.php @@ -3,10 +3,10 @@ return [ 'update' => [ // we need this in case the URL of the project changes - 'git' => 'http://api.github.com/repos/LycheeOrg/Lychee-Laravel/commits', + 'git' => 'http://api.github.com/repos/LycheeOrg/Lychee/commits', 'json' => 'https://lycheeorg.github.io/update.json', ], 'git' => [ - 'pull' => 'https://github.com/LycheeOrg/Lychee-Laravel.git', + 'pull' => 'https://github.com/LycheeOrg/Lychee.git', ], ]; \ No newline at end of file diff --git a/database/migrations/2018_08_15_102039_move_albums.php b/database/migrations/2018_08_15_102039_move_albums.php index dc3782370db..818703b6087 100644 --- a/database/migrations/2018_08_15_102039_move_albums.php +++ b/database/migrations/2018_08_15_102039_move_albums.php @@ -48,7 +48,9 @@ public function up() public function down() { if (Schema::hasTable('lychee_albums')) { + Schema::disableForeignKeyConstraints(); Album::truncate(); + Schema::enableForeignKeyConstraints(); } } } diff --git a/database/migrations/2018_08_15_103716_move_photos.php b/database/migrations/2018_08_15_103716_move_photos.php index f64ace82a90..a421b53d34d 100644 --- a/database/migrations/2018_08_15_103716_move_photos.php +++ b/database/migrations/2018_08_15_103716_move_photos.php @@ -2,6 +2,7 @@ use App\Album; use App\Logs; +use App\ModelFunctions\Helpers; use App\Photo; use Illuminate\Database\Migrations\Migration; use Illuminate\Support\Facades\DB; @@ -33,6 +34,7 @@ public function up() $album = $album_id; } $photo->id = $id; + $photo->album_id = $album; $photo->title = $result->title; $photo->description = $result->description; $photo->url = $result->url; @@ -63,8 +65,6 @@ public function up() $photo->thumb2x = 1; } } - - $photo->album_id = $album; $photo->checksum = $result->checksum; if (Storage::exists('medium/' . $photo->url)) { list($width, $height) = getimagesize(Storage::path('medium/' . $photo->url)); diff --git a/public/installer/assets/css/style.css b/public/installer/assets/css/style.css index be24e7ce889..6df02d9da8f 100755 --- a/public/installer/assets/css/style.css +++ b/public/installer/assets/css/style.css @@ -4117,6 +4117,10 @@ input[type=text] { width: 110px; } +code.folder { + background-color: #e0e0e0; +} + span.perm ~ span.perm { padding-right: 0; } diff --git a/readme.md b/readme.md index c3275e27798..7641005744e 100644 --- a/readme.md +++ b/readme.md @@ -1,16 +1,22 @@ -

@LycheeOrg

+

@LycheeOrg

-Build Status -Code Coverage -GitHub release -GitHub +Build Status +Code Coverage +GitHub release +GitHub Gitter CII Best Practices Summary -Quality Gate Status +Quality Gate Status

+#### Help, I'm lost! + +I was using the version 3, how do I upgrade to version 4? See [Upgrade »](https://github.com/LycheeOrg/Lychee/wiki/Upgrade-from-version-3) + +To find out what's changed, see the [changelog »](https://github.com/LycheeOrg/Lychee/wiki/Changelog) + #### A great looking and easy-to-use photo-management-system. *Since the 1st of April 2018 this project has moved to it's own Organisation (https://github.com/LycheeOrg) where people are able to submit their fixes to it. We, the Organisation owners, want to thank electerious (Tobias Reich) for the opportunity to make this project live on.* @@ -24,13 +30,13 @@ Lychee is a free photo-management tool, which runs on your server or web-space. To run Lychee, everything you need is a web-server with PHP 7.3 or later and a MySQL-Database. Follow the instructions to install Lychee on your server. This version of Lychee is built on the Laravel framework. To install: -1. Clone this repo to your server and set the web root to `lychee-laravel/public` +1. Clone this repo to your server and set the web root to `lychee/public` 2. Run `composer install --no-dev` to install dependencies 3. Copy `.env.example` as `.env` and edit it to match your parameters 4. Generate your secret key with `php artisan key:generate` -5. Migrate your database with `php artisan migrate` to create a new database or migrate an existing Lychee installation to the new framework. +5. Migrate your database with `php artisan migrate` to create a new database or migrate an existing Lychee installation to the latest framework. -See detailed instructions on the [Installation](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Install) wiki page. +See detailed instructions on the [Installation](https://github.com/LycheeOrg/Lychee/wiki/Install) wiki page. ### Docker @@ -38,15 +44,15 @@ Alternatively, an official Docker image can be found at [LycheeOrg/Lychee-Larave ### Update -Updating is as easy as it should be. [Update »](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Update) +Updating is as easy as it should be. [Update »](https://github.com/LycheeOrg/Lychee/wiki/Update) ### Settings -Sign in and click the gear in the top left corner to change your settings. [Settings »](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings) +Sign in and click the gear in the top left corner to change your settings. [Settings »](https://github.com/LycheeOrg/Lychee/wiki/Settings) ### Build -Lychee is ready to use, right out of the box. If you want to contribute and edit CSS or JS files, you need to rebuild [Lychee-front](https://github.com/LycheeOrg/Lychee-front). [Build »](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Build) +Lychee is ready to use, right out of the box. If you want to contribute and edit CSS or JS files, you need to rebuild [Lychee-front](https://github.com/LycheeOrg/Lychee-front). [Build »](https://github.com/LycheeOrg/Lychee/wiki/Build) ## Advanced Features @@ -54,11 +60,11 @@ Lychee is ready to use straight after installation, but some features require a ### Keyboard Shortcuts -These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts »](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Keyboard-Shortcuts) +These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts »](https://github.com/LycheeOrg/Lychee/wiki/Keyboard-Shortcuts) ### Dropbox import -In order to use the Dropbox import from your server, you need a valid drop-ins app key from [their website](https://www.dropbox.com/developers/apps/create). Lychee will ask you for this key, the first time you try to use the import. Want to change your code? Take a look at [the settings](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings) of Lychee. +In order to use the Dropbox import from your server, you need a valid drop-ins app key from [their website](https://www.dropbox.com/developers/apps/create). Lychee will ask you for this key, the first time you try to use the import. Want to change your code? Take a look at [the settings](https://github.com/LycheeOrg/Lychee/wiki/Settings) of Lychee. ### Twitter Cards @@ -66,8 +72,8 @@ Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Gr ### Imagick -Lychee uses [Imagick](https://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](https://www.imagemagick.org) in the [settings](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings). +Lychee uses [Imagick](https://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](https://www.imagemagick.org) in the [settings](https://github.com/LycheeOrg/Lychee/wiki/Settings). ## Troubleshooting -Take a look at the [Wiki](https://github.com/LycheeOrg/Lychee-Laravel/wiki/), particularly the [FAQ](https://github.com/LycheeOrg/Lychee-Laravel/wiki/FAQ) if you have problems. Discovered a bug? Please create an issue [here](https://github.com/LycheeOrg/Lychee-Laravel/issues) on GitHub! +Take a look at the [Wiki](https://github.com/LycheeOrg/Lychee/wiki/), particularly the [FAQ](https://github.com/LycheeOrg/Lychee/wiki/FAQ) if you have problems. Discovered a bug? Please create an issue [here](https://github.com/LycheeOrg/Lychee/issues) on GitHub! diff --git a/resources/views/install/env.blade.php b/resources/views/install/env.blade.php index 592dd7a54bb..6a62865d8d4 100644 --- a/resources/views/install/env.blade.php +++ b/resources/views/install/env.blade.php @@ -8,9 +8,11 @@ - For more details of how those values are used, look in the "config" folder.
+
  • 2 - If you are migrating from the v3, copy your pictures from
    +      version3/uploads/ to version4/public/uploads/.
    • +
  • 3 - Edit the form below to reflect your desired configuration.
    • + +For more details of how those values are used, look in the "config" folder.