Skip to content

Commit

Permalink
Merge pull request #94 from YetiForceCompany/developer
Browse files Browse the repository at this point in the history
0.3.0 upgrade Roundcube Webmail 1.6.0
  • Loading branch information
mariuszkrzaczkowski authored Aug 3, 2022
2 parents d45a6bd + b30242e commit 4123f08
Show file tree
Hide file tree
Showing 1,170 changed files with 25,736 additions and 64,483 deletions.
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ Header set X-Robots-Tag "noindex, nofollow"

# X-Content-Type-Options
# It prevents Google Chrome and Internet Explorer from trying to mime-sniff the content-type of a response away from the one being declared by the server.
#Header set X-Content-Type-Options: "nosniff"
#Header set X-Content-Type-Options "nosniff"

</IfModule>
160 changes: 140 additions & 20 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ REQUIREMENTS

* An IMAP, HTTP and SMTP server
* .htaccess support allowing overrides for DirectoryIndex
* PHP Version 5.5 or greater including:
* PHP Version 7.3 or greater including:
- PCRE, DOM, JSON, Session, Sockets, OpenSSL, Mbstring, Filter, Ctype, Intl (required)
- PHP PDO with driver for either MySQL, PostgreSQL, SQL Server, Oracle or SQLite (required)
- Iconv, Zip, Fileinfo, Exif (recommended)
- LDAP for LDAP addressbook support (optional)
- GD, Imagick (optional thumbnails generation, QR-code)
- GD, Imagick, XMLWriter (optional: thumbnails generation, QR-code)
* PEAR and PEAR packages distributed with Roundcube or external.
See composer.json-dist for the list of required packages.
* php.ini options:
Expand Down Expand Up @@ -121,7 +121,7 @@ Now you can run the Installer or configure the database access options in

* SQLite
--------
Versions of sqlite database engine older than 3.0 aren't supported.
Versions of sqlite database engine older than 3.6.19 aren't supported.
Database file and structure is created automatically by Roundcube.
Make sure your configuration points to some file location and that the
webserver can write to the file and the directory containing the file.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Roundcube Webmail

[![Tests Status](https://github.com/roundcube/roundcubemail/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/roundcube/roundcubemail/actions/workflows/tests.yml)


INTRODUCTION
------------
Roundcube Webmail is a browser-based multilingual IMAP client with an
Expand Down
18 changes: 12 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,30 @@
}
],
"require": {
"php": ">=5.5.0",
"php": ">=7.3.0",
"pear/pear-core-minimal": "~1.10.1",
"pear/auth_sasl": "~1.1.0",
"pear/mail_mime": "~1.10.0",
"pear/net_smtp": "~1.10.0",
"pear/crypt_gpg": "~1.6.3",
"pear/net_sieve": "~1.4.5",
"roundcube/plugin-installer": "~0.3.0",
"roundcube/plugin-installer": "~0.3.1",
"roundcube/rtf-html-php": "~2.1",
"masterminds/html5": "~2.7.0",
"endroid/qr-code": "~1.6.5",
"guzzlehttp/guzzle": "^6.5.5",
"kolab/net_ldap3": "~1.1.1"
"bacon/bacon-qr-code": "^2.0.0",
"guzzlehttp/guzzle": "^7.3.0",
"kolab/net_ldap3": "~1.1.1",
"symfony/deprecation-contracts": "2.2"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
"phpunit/phpunit": "^9"
},
"suggest": {
"bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver"
},
"config": {
"allow-plugins": {
"roundcube/plugin-installer": true
}
}
}
15 changes: 10 additions & 5 deletions composer.json-dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,29 @@
}
],
"require": {
"php": ">=5.5.0",
"php": ">=7.3.0",
"pear/pear-core-minimal": "~1.10.1",
"pear/auth_sasl": "~1.1.0",
"pear/mail_mime": "~1.10.0",
"pear/net_smtp": "~1.10.0",
"pear/crypt_gpg": "~1.6.3",
"pear/net_sieve": "~1.4.5",
"roundcube/plugin-installer": "~0.3.0",
"roundcube/plugin-installer": "~0.3.1",
"roundcube/rtf-html-php": "~2.1",
"masterminds/html5": "~2.7.0",
"endroid/qr-code": "~1.6.5",
"guzzlehttp/guzzle": "^6.5.5"
"bacon/bacon-qr-code": "^2.0.0",
"guzzlehttp/guzzle": "^7.3.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
"phpunit/phpunit": "^9"
},
"suggest": {
"kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
"bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver"
},
"config": {
"allow-plugins": {
"roundcube/plugin-installer": true
}
}
}
Loading

0 comments on commit 4123f08

Please sign in to comment.