Skip to content

Commit

Permalink
v2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
djmaze committed Sep 1, 2021
1 parent 53ece73 commit 010794f
Show file tree
Hide file tree
Showing 9 changed files with 719 additions and 550 deletions.
95 changes: 16 additions & 79 deletions .docker/release/files/usr/local/include/application.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; SnappyMail Webmail configuration file
; SnappyMail configuration file
; Please don't add custom parameters here, those will be overwritten

[webmail]
Expand Down Expand Up @@ -27,38 +27,24 @@ allow_languages_on_settings = On
allow_additional_accounts = On
allow_additional_identities = On

; Number of messages displayed on page by default
; Number of messages displayed on page by default
messages_per_page = 20

; File size limit (MB) for file upload on compose screen
; 0 for unlimited.
attachment_size_limit = 25
attachment_size_limit = 2

[interface]
show_attachment_thumbnail = On
use_native_scrollbars = Off
new_move_to_folder_button = On

[branding]
login_logo = ""
login_background = ""
login_desc = ""
login_css = ""
user_css = ""
user_logo = ""
user_logo_title = ""
user_logo_message = ""
user_iframe_message = ""
welcome_page_url = ""
welcome_page_display = "none"

[contacts]
; Enable contacts
enable = Off
allow_sync = On
allow_sync = Off
sync_interval = 20
type = "sqlite"
pdo_dsn = "mysql:host=127.0.0.1;port=3306;dbname=snappymail"
pdo_dsn = "host=127.0.0.1;port=3306;dbname=snappymail"
pdo_user = "root"
pdo_password = ""
suggestions_limit = 30
Expand All @@ -67,23 +53,21 @@ suggestions_limit = 30
; Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)
csrf_protection = On
custom_server_signature = "SnappyMail"
x_frame_options_header = ""
x_frame_options_header = "DENY"
x_xss_protection_header = "1; mode=block"
openpgp = Off

; Login and password for web admin panel
admin_login = "admin"
admin_password = "12345"
admin_password = ""
admin_totp = ""

; Access settings
allow_admin_panel = On
allow_two_factor_auth = Off
force_two_factor_auth = Off
hide_x_mailer_header = Off
hide_x_mailer_header = On
admin_panel_host = ""
admin_panel_key = "admin"
content_security_policy = ""
core_install_access_domain = ""

[ssl]
; Require verification of SSL certificate used.
Expand All @@ -102,7 +86,6 @@ capath = ""
client_cert = ""

[capa]
folders = On
composer = On
contacts = On
settings = On
Expand All @@ -111,7 +94,6 @@ help = On
reload = On
search = On
search_adv = On
filters = On
x-templates = Off
dangerous_actions = On
message_actions = On
Expand All @@ -125,10 +107,7 @@ default_domain = ""
allow_languages_on_login = On
determine_user_language = On
determine_user_domain = Off
welcome_page = Off
hide_submit_button = On
forgot_password_link_url = ""
registration_link_url = ""
login_lowercase = On

; This option allows webmail to remember the logged in user
Expand Down Expand Up @@ -177,9 +156,8 @@ write_on_timeout_only = 0
; Required for development purposes only.
; Disabling this option is not recommended.
hide_passwords = On
time_offset = "0"
time_zone = "UTC"
session_filter = ""
sentry_dsn = ""

; Log filename.
; For security reasons, some characters are removed from filename.
Expand Down Expand Up @@ -207,6 +185,7 @@ sentry_dsn = ""
; filename = "log-{date:Y-m-d}.txt"
; filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log"
; filename = "{user:email}-{date:Y-m-d}.txt"
; filename = "syslog"
filename = "log-{date:Y-m-d}.txt"

; Enable auth logging in a separate file (for fail2ban)
Expand All @@ -218,31 +197,6 @@ auth_logging_format = "[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={i
; Special option required for development purposes
enable = Off

[social]
; Google
google_enable = Off
google_enable_auth = Off
google_enable_auth_gmail = Off
google_enable_drive = Off
google_enable_preview = Off
google_client_id = ""
google_client_secret = ""
google_api_key = ""

; Facebook
fb_enable = Off
fb_app_id = ""
fb_app_secret = ""

; Twitter
twitter_enable = Off
twitter_consumer_key = ""
twitter_consumer_secret = ""

; Dropbox
dropbox_enable = Off
dropbox_api_key = ""

[cache]
; The section controls caching of the entire application.
;
Expand All @@ -252,7 +206,7 @@ enable = On
; Additional caching key. If changed, cache is purged
index = "v1"

; Can be: files, APCU, memcache, redis (beta)
; Can be: files, APC, memcache, redis (beta)
fast_cache_driver = "files"

; Additional caching key. If changed, fast cache is purged
Expand All @@ -268,27 +222,18 @@ http_expires = 3600
server_uids = On

[labs]
; Experimental settings. Handle with care.
;
allow_mobile_version = On
ignore_folders_subscription = Off
check_new_password_strength = On
update_channel = "stable"
allow_gravatar = On
allow_prefetch = On
allow_smart_html_links = On
cache_system_data = On
date_from_headers = On
autocreate_system_folders = On
allow_message_append = Off
disable_iconv_if_mbstring_supported = Off
login_fault_delay = 1
log_ajax_response_write_limit = 300
allow_html_editor_source_button = Off
allow_html_editor_biti_buttons = Off
allow_ctrl_enter_on_compose = On
try_to_detect_hidden_images = Off
hide_dangerous_actions = Off
use_app_debug_js = Off
use_mobile_version_for_tablets = Off
use_app_debug_css = Off
Expand All @@ -314,7 +259,6 @@ imap_use_auth_cram_md5 = Off
smtp_show_server_errors = Off
smtp_use_auth_plain = On
smtp_use_auth_cram_md5 = Off
sieve_allow_raw_script = Off
sieve_utf8_folder_name = On
sieve_auth_plain_initial = On
sieve_allow_fileinto_inbox = Off
Expand All @@ -326,34 +270,27 @@ mail_func_clear_headers = On
mail_func_additional_parameters = Off
favicon_status = On
folders_spec_limit = 50
owncloud_save_folder = "Attachments"
owncloud_suggestions = On
curl_proxy = ""
curl_proxy_auth = ""
in_iframe = Off
force_https = Off
custom_login_link = ""
custom_logout_link = ""
allow_external_login = Off
allow_external_sso = Off
external_sso_key = ""
http_client_ip_check_proxy = Off
fast_cache_memcache_host = "127.0.0.1"
fast_cache_memcache_port = 11211
fast_cache_redis_host = "127.0.0.1"
fast_cache_redis_port = 6379
use_local_proxy_for_external_images = Off
use_local_proxy_for_external_images = On
detect_image_exif_orientation = On
cookie_default_path = ""
cookie_default_secure = Off
check_new_messages = On
replace_env_in_configuration = ""
startup_url = ""
strict_html_parser = Off
allow_cmd = Off
boundary_prefix = ""
dev_email = ""
dev_password = ""

[version]
current = "1.14.0"
saved = "Wed, 08 Apr 2020 16:37:27 +0000"
current = "2.7.0"
saved = "Mon, 23 Aug 2021 07:55:13 +0000"
28 changes: 20 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@

**Getting started**

1. Install node.js - `https://nodejs.org/download/`
2. Install yarn - `https://yarnpkg.com/en/docs/install`
3. Install gulp - `npm install gulp -g`
4. Fork snappymail from https://github.com/the-djmaze/snappymail
5. Clone snappymail - `git clone git@github.com:USERNAME/snappymail.git snappymail`
6. `cd snappymail`
7. Install install all dependencies - `yarn install`
8. Run gulp - `gulp`
1. Install PHP
2. Install node.js - `https://nodejs.org/download/`
3. Install yarn - `https://yarnpkg.com/en/docs/install`
4. Install gulp - `npm install gulp -g`
5. Fork snappymail from https://github.com/the-djmaze/snappymail
6. Clone snappymail - `git clone git@github.com:USERNAME/snappymail.git snappymail`
7. `cd snappymail`
8. Install all dependencies - `yarn install`
9. Run gulp - `gulp`

---

Expand All @@ -30,6 +31,17 @@
1. Edit data/\_data_/\_default_/configs/application.ini
2. Set 'cache_system_data' to Off

**Release**

1. Install gzip
2. Install brotli
3. php release.php

Options:
* `php release.php --aur` = Build Arch Linux package
* `php release.php --docker` = Build Docker instance
* `php release.php --plugins` = Build plugins

---

If you have any questions, open an issue or email support@snappymail.eu.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,23 +129,23 @@ RainLoop 1.15 vs SnappyMail

|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
|admin.js |2.158.025 | 91.050 |
|app.js |4.215.733 | 451.709 |
|boot.js | 672.433 | 2.861 |
|admin.js |2.158.025 | 89.407 |
|app.js |4.215.733 | 447.836 |
|boot.js | 672.433 | 2.856 |
|libs.js | 647.679 | 214.458 |
|polyfills.js | 325.908 | 0 |
|serviceworker.js | 0 | 285 |
|TOTAL |8.019.778 | 760.363 |
|TOTAL |8.019.778 | 754.842 |

|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
|admin.min.js | 255.514 | 47.330 | 73.899 | 14.216 | 60.674 | 12.715 |
|app.min.js | 516.000 | 232.217 |140.430 | 68.323 |110.657 | 57.830 |
|boot.min.js | 66.456 | 1.621 | 22.553 | 968 | 20.043 | 810 |
|admin.min.js | 255.514 | 46.428 | 73.899 | 14.039 | 60.674 | 12.575 |
|app.min.js | 516.000 | 230.355 |140.430 | 67.980 |110.657 | 57.567 |
|boot.min.js | 66.456 | 1.648 | 22.553 | 986 | 20.043 | 822 |
|libs.min.js | 574.626 | 103.928 |177.280 | 37.795 |151.855 | 33.829 |
|polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 |
|TOTAL |1.445.204 | 385.096 |425.477 |121.302 |353.301 |105.184 |
|TOTAL (no admin) |1.189.690 | 337.766 |351.061 |107.086 |292.627 | 92.469 |
|TOTAL |1.445.204 | 382.359 |425.477 |120.800 |353.301 |104.793 |
|TOTAL (no admin) |1.189.690 | 335.931 |351.061 |106.761 |292.627 | 92.218 |

For a user its around 68% smaller and faster than traditional RainLoop.

Expand Down Expand Up @@ -184,12 +184,12 @@ For a user its around 68% smaller and faster than traditional RainLoop.

|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
|app.css | 340.334 | 96.105 | 46,959 | 17.510 | 15.104 |
|app.min.css | 274.791 | 78.371 | 39.618 | 15.671 | 13.804 |
|app.css | 340.334 | 94.785 | 46.959 | 17.381 | 15.006 |
|app.min.css | 274.791 | 77.141 | 39.618 | 15.535 | 13.683 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
|admin.css | | 40.198 | | 8.442 | 7.371 |
|admin.min.css | | 31.756 | | 7.401 | 6.572 |
|admin.css | | 40.340 | | 8.507 | 7.434 |
|admin.min.css | | 31.824 | | 7.463 | 6.627 |


### Squire vs CKEditor
Expand All @@ -202,7 +202,7 @@ Still TODO:

| | normal | min | gzip | min gzip |
|-------- |-------: |-------: |------: |--------: |
|squire | 128.826 | 47.074 | 33.671 | 15.596 |
|squire | 122.321 | 41.906 | 31.867 | 14.330 |
|ckeditor | ? | 520.035 | ? | 155.916 |

CKEditor including the 7 asset requests (css,language,plugins,icons) is 633.46 KB / 180.47 KB (gzip).
Expand Down
2 changes: 1 addition & 1 deletion integrations/nextcloud/snappymail/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2
2.7.0
2 changes: 1 addition & 1 deletion integrations/nextcloud/snappymail/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>SnappyMail</name>
<summary>SnappyMail Webmail</summary>
<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).</description>
<version>2.6.2</version>
<version>2.7.0</version>
<licence>agpl</licence>
<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
<namespace>SnappyMail</namespace>
Expand Down
Loading

0 comments on commit 010794f

Please sign in to comment.