Skip to content

Commit

Permalink
Merge branch 'master' into add-copyright-per-album
Browse files Browse the repository at this point in the history
  • Loading branch information
ildyria committed Apr 28, 2024
2 parents 9b332ff + ffcb72d commit 50b87bd
Show file tree
Hide file tree
Showing 970 changed files with 45,426 additions and 29,746 deletions.
83 changes: 82 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,35 @@ APP_NAME=Lychee
APP_ENV=production
APP_KEY=
APP_DEBUG=false
# This MUST contain the host name up to the Top Level Domain (tld) e.g. .com, .org etc.
APP_URL=http://localhost
APP_FORCE_HTTPS=false

# If using Lychee in a sub folder, specify the path after the tld here.
# For example for https://lychee.test/path/to/lychee
# Set APP_URL=https://lychee.test
# and APP_DIR=/path/to/lychee
# We (LycheeOrg) do not recommend the use of APP_DIR.
# APP_DIR=

# enable or disable debug bar. By default it is disabled.
# Do note that this disable CSP!!
DEBUGBAR_ENABLED=false

# enable or disable the v5 layout.
LIVEWIRE_ENABLED=true

# enable or disable log viewer. By default it is enabled.
LOG_VIEWER_ENABLED=true

# enable s3 bucket (required in addition to needing AWS_ACCESS_KEY_ID)
# S3_ENABLED=true

# If you spread old links of to your albums in your Lychee instance starting with
# https://lychee.text/#albumID/PhotoId
# Set this value to true to enable redirection.
LEGACY_V4_REDIRECT=false

##############################################################################
# IMPORTANT: To migrate from Lychee v3 you *MUST* use the same MySQL/MariaDB #
# server as v3. #
Expand All @@ -34,7 +53,7 @@ DB_LOG_SQL=false
DB_LOG_SQL_EXPLAIN=false #only for MySQL

# List foreign keys in diagnostic page
DB_LIST_FOREIGN_KEYS=true
DB_LIST_FOREIGN_KEYS=false

# Application timezone. If not specified, the server's default timezone is used.
# Requires a named timezone identifier.
Expand Down Expand Up @@ -101,3 +120,65 @@ TRUSTED_PROXIES=null

# Comma-separated list of class names of diagnostics checks that should be skipped.
#SKIP_DIAGNOSTICS_CHECKS=

VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

# Oauth token data
# XXX_REDIRECT_URI should be left as default unless you know exactly what you do.

# AMAZON_SIGNIN_CLIENT_ID=
# AMAZON_SIGNIN_SECRET=
# AMAZON_SIGNIN_REDIRECT_URI=/auth/amazon/redirect

# https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple
# Note: the client secret used for "Sign In with Apple" is a JWT token that can have a maximum lifetime of 6 months.
# The article above explains how to generate the client secret on demand and you'll need to update this every 6 months.
# To generate the client secret for each request, see Generating A Client Secret For Sign In With Apple On Each Request.
# https://bannister.me/blog/generating-a-client-secret-for-sign-in-with-apple-on-each-request
# APPLE_CLIENT_ID=
# APPLE_CLIENT_SECRET=
# APPLE_REDIRECT_URI=/auth/apple/redirect

# FACEBOOK_CLIENT_ID=
# FACEBOOK_CLIENT_SECRET=
# FACEBOOK_REDIRECT_URI=/auth/facebook/redirect

# GITHUB_CLIENT_ID=
# GITHUB_CLIENT_SECRET=
# GITHUB_REDIRECT_URI=/auth/github/redirect

# GOOGLE_CLIENT_ID=
# GOOGLE_CLIENT_SECRET=
# GOOGLE_REDIRECT_URI=/auth/google/redirect

# MASTODON_DOMAIN=https://mastodon.social
# MASTODON_ID=
# MASTODON_SECRET=
# MASTODON_REDIRECT_URI=/auth/mastodon/redirect

# MICROSOFT_CLIENT_ID=
# MICROSOFT_CLIENT_SECRET=
# MICROSOFT_REDIRECT_URI=/auth/microsoft/redirect

# NEXTCLOUD_CLIENT_ID=
# NEXTCLOUD_CLIENT_SECRET=
# NEXTCLOUD_REDIRECT_URI=/auth/nextcloud/redirect
# NEXTCLOUD_BASE_URI=

# KEYCLOAK_CLIENT_ID=
# KEYCLOAK_CLIENT_SECRET=
# KEYCLOAK_REDIRECT_URI=/auth/keycloak/redirect
# KEYCLOAK_BASE_URL=
# KEYCLOAK_REALM=

# AWS support data

# AWS_ACCESS_KEY_ID=
# AWS_SECRET_ACCESS_KEY=
# AWS_DEFAULT_REGION=
# AWS_BUCKET=
# AWS_URL=
# AWS_ENDPOINT=
# AWS_IMAGE_VISIBILITY=
# AWS_USE_PATH_STYLE_ENDPOINT=
68 changes: 68 additions & 0 deletions .github/DISCUSSION_TEMPLATE/bugs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
body:
- type: markdown
attributes:
value: |
Create a bug report to help us improve, do not ignore the [REQUIRED] sections.
We understand this can be frustrating, take your time and relax. We are usually
pretty quick to answer. :)
Valid bug report will be converted into proper issues to track their advancement.
- type: input
id: lychee-version
attributes:
label: Lychee version
description: Which version of Lychee are you using? Please provide the full version, e.g. v3.2.6.
placeholder: v5.1.2
validations:
required: true

- type: dropdown
id: php-version
attributes:
label: Which PHP version are you using?
options:
- PHP 8.3
- PHP 8.2
validations:
required: true

- type: textarea
attributes:
label: Detailed description of the problem
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
attributes:
label: Steps to reproduce the issue
description: |
Which steps do we need to take to reproduce the problem you are having?
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
- type: textarea
attributes:
label: Diagnostics [REQUIRED]
description: |
Paste here is the content of your diagnostics.
*(Settings => Diagnostics or https://example.com/Diagnostics or `php artisan lychee:diagnostics`)*
placeholder: |
```
Paste result here
```
- type: textarea
attributes:
label: Browser & System [REQUIRED]

- type: checkboxes
attributes:
label: Please confirm (incomplete submissions will not be addressed)
options:
- label: I have provided easy and step-by-step instructions to reproduce the bug.
required: true
- label: I understand my bug report will be removed if I haven't met the criteria above.
required: true
14 changes: 14 additions & 0 deletions .github/DISCUSSION_TEMPLATE/ideas.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
body:
- type: markdown
attributes:
value: |
Suggest an idea for this project. :)
Valid ideas will be converted into proper issues to track their advancement.
- type: textarea
attributes:
label: Enhancement
description: Explain in a few words which functionality or improvements you would like to see in Lychee.
validations:
required: true
13 changes: 13 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These are supported funding model platforms

github: LycheeOrg # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
# patreon: # Replace with a single Patreon username
open_collective: LycheeOrg
# ko_fi: # Replace with a single Ko-fi username
# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
# liberapay: # Replace with a single Liberapay username
# issuehunt: # Replace with a single IssueHunt username
# otechie: # Replace with a single Otechie username
# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: I think I found a bug!
url: https:/LycheeOrg/Lychee/discussions/new?category=bugs
about: Please submit your a bug here.
- name: I have an idea/suggestion.
url: https:/LycheeOrg/Lychee/discussions/new?category=ideas
about: Please submit your ideas here.
- name: I have a question.
url: https:/LycheeOrg/Lychee/discussions/new?category=q-a
about: Please ask and answer questions here.
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/.env.mariadb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
APP_NAME=Lychee
APP_URL=https://localhost
APP_ENV=testing
APP_ENV=dev
APP_KEY=SomeRandomString
APP_DEBUG=true
LIVEWIRE_ENABLED=false

DB_CONNECTION=mysql
DB_HOST=localhost
Expand All @@ -15,3 +16,5 @@ DB_LIST_FOREIGN_KEYS=true
CACHE_DRIVER=array
SESSION_DRIVER=array
QUEUE_CONNECTION=sync

PHOTO_PIPES=true
3 changes: 2 additions & 1 deletion .github/workflows/.env.postgresql
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
APP_NAME=Lychee
APP_URL=https://localhost
APP_ENV=testing
APP_ENV=dev
APP_KEY=SomeRandomString
APP_DEBUG=true
LIVEWIRE_ENABLED=false

DB_CONNECTION=pgsql
DB_HOST=localhost
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/.env.sqlite
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
APP_NAME=Lychee
APP_URL=https://localhost
APP_ENV=testing
APP_ENV=dev
APP_KEY=SomeRandomString
APP_DEBUG=true
LIVEWIRE_ENABLED=false

DB_CONNECTION=sqlite
DB_LIST_FOREIGN_KEYS=true
Expand Down
Loading

0 comments on commit 50b87bd

Please sign in to comment.