arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge d5467e7233 into 2a8b1f9ec2

Browse Source
This commit is contained in:
woderkant 2018-06-20 08:37:03 +00:00 committed by GitHub
commit b5fa656df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@ -6,14 +6,12 @@ Options -Indexes
#<IfModule mod_php5.c> #<IfModule mod_php5.c>
# php_value max_execution_time 200 # php_value max_execution_time 200
# php_value post_max_size 200M # php_value post_max_size 200M
# php_value upload_max_size 200M
# php_value upload_max_filesize 20M # php_value upload_max_filesize 20M
# php_value max_file_uploads 100 # php_value max_file_uploads 100
#</IfModule> #</IfModule>
#<IfModule mod_php7.c> #<IfModule mod_php7.c>
# php_value max_execution_time 200 # php_value max_execution_time 200
# php_value post_max_size 200M # php_value post_max_size 200M
# php_value upload_max_size 200M
# php_value upload_max_filesize 20M # php_value upload_max_filesize 20M
# php_value max_file_uploads 100 # php_value max_file_uploads 100
#</IfModule> #</IfModule>
@ -23,4 +21,4 @@ Options -Indexes
# --- # ---
#Header add Access-Control-Allow-Origin "*" #Header add Access-Control-Allow-Origin "*"
#Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type" #Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type"
#Header add Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS" #Header add Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS"

1
.user.ini
View File

@ -3,6 +3,5 @@
;max_execution_time = 200 ;max_execution_time = 200
;post_max_size = 200M ;post_max_size = 200M
;upload_max_size = 200M
;upload_max_filesize = 20M ;upload_max_filesize = 20M
;max_file_uploads = 200 ;max_file_uploads = 200

3
docs/FAQ.md
View File

@ -11,7 +11,6 @@ If possible, change these settings directly in your `php.ini`. We recommend to i
max_execution_time = 200 max_execution_time = 200
post_max_size = 100M post_max_size = 100M
upload_max_size = 100M
upload_max_filesize = 20M upload_max_filesize = 20M
memory_limit = 256M memory_limit = 256M
@ -58,4 +57,4 @@ There's a problem with images compressed by ImageOptim. [Read more.](https://git
[#455](https://github.com/electerious/Lychee/issues/455) [#455](https://github.com/electerious/Lychee/issues/455)
#### How to reset username and password? #### How to reset username and password?
Simply delete the whole `lychee_settings` table from the database. Lychee will regenerate it and ask you to enter a new username and password. Simply delete the whole `lychee_settings` table from the database. Lychee will regenerate it and ask you to enter a new username and password.

1
docs/Installation.md
View File

@ -9,7 +9,6 @@ To use Lychee without restrictions, we recommend to increase the values of the f
max_execution_time = 200 max_execution_time = 200
post_max_size = 100M post_max_size = 100M
upload_max_size = 100M
upload_max_filesize = 20M upload_max_filesize = 20M
memory_limit = 256M memory_limit = 256M