diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 998692964..9c16abc7e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem. - Mode: [e.g. standalone, nextcloud, cyberpanel, docker] **Debug/logging information** -[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging) +[Read here how to log](https://github.com/nextgen-networks/snappymail/wiki/FAQ#how-do-i-enable-logging) - [ ] I've placed them here (few lines) or as attachments (many lines) **Additional context** diff --git a/CHANGELOG.md b/CHANGELOG.md index d31a1b771..0809a39c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,7 +72,7 @@ ### Fixed - mXSS exploit found by SonarSource - [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm) + [CVE-2024-45800](https://github.com/nextgen-networks/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm) - Call to a member function Email() on null [#1706](https://github.com/the-djmaze/snappymail/issues/1706) - IMAP capabilities via IMAP Proxy @@ -202,7 +202,7 @@ ### Added - Customize private key passphrase expiration interval - [#1545](https://github.com/the-djmaze/snappymail/discussions/1545) + [#1545](https://github.com/nextgen-networks/snappymail/discussions/1545) - AdvancedSearch support for filtering mails before a given date [#1606](https://github.com/the-djmaze/snappymail/pull/1606) by @codiflow - Control valid spam and virus headers @@ -411,9 +411,9 @@ [#1458](https://github.com/the-djmaze/snappymail/issues/1458) - Automatically verify PGP and S/MIME signed messages - TNEFDecoder for - [#1012](https://github.com/the-djmaze/snappymail/discussions/1012) + [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012) - RTF to HTML converter for - [#1012](https://github.com/the-djmaze/snappymail/discussions/1012) + [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012) - Polyfill for PHP ctype [#1250](https://github.com/the-djmaze/snappymail/issues/1250) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95821f69d..9777f5e56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ 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 +5. Fork snappymail from https://github.com/nextgen-networks/snappymail/ 6. Clone snappymail - `git clone git@github.com:USERNAME/snappymail.git snappymail` 7. `cd snappymail` 8. Install all dependencies - `yarn install` diff --git a/build/arch/PKGBUILD b/build/arch/PKGBUILD index 4dd25389c..207d109ab 100644 --- a/build/arch/PKGBUILD +++ b/build/arch/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="modern PHP webmail client" arch=('any') license=('AGPL3') -url="https://github.com/nextgen-networks/snappymail" +url="https://github.com/nextgen-networks/snappymail/" depends=('php-fpm') makedepends=('php', 'nodejs' 'yarn' 'gulp', 'rollup') optdepends=('mariadb: storage backend for contacts' diff --git a/build/deb/DEBIAN/control b/build/deb/DEBIAN/control index 884792246..65bb6b79a 100644 --- a/build/deb/DEBIAN/control +++ b/build/deb/DEBIAN/control @@ -6,8 +6,8 @@ Recommends: php-intl, php-sodium, php-uuid Suggests: php-sqlite3 | php-mysql | php-pgsql, php-curl, php-exif, php-gnupg, php-gd | php-gmagick | php-imagick, php-openssl, php-zip Architecture: all Homepage: https://snappymail.eu -Vcs-Browser: https://github.com/the-djmaze/snappymail -Vcs-Git: https://github.com/the-djmaze/snappymail.git +Vcs-Browser: https://github.com/nextgen-networks/snappymail/ +Vcs-Git: https://github.com/nextgen-networks/snappymail.git Description: SnappyMail is a PHP-based simple, modern, lightweight & fast web-based email client with no database requirements. It supports IMAP, SMTP and Sieve protocols, multiple accounts and identities, an admin panel for configuration. Plugins can be installed to further extend functionality. diff --git a/cli/release.php b/cli/release.php index 2e4e12c46..5a0e12b07 100755 --- a/cli/release.php +++ b/cli/release.php @@ -207,7 +207,7 @@ if ($options['aur']) { pkgdesc = modern PHP webmail client pkgver = '.$package->version.' pkgrel = 1 - url = https://github.com/nextgen-networks/snappymail + url = https://github.com/nextgen-networks/snappymail/ arch = any license = AGPL3 makedepends = php @@ -269,7 +269,7 @@ if (isset($options['sign'])) { if (isset($options['debian'])) { passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var); - // https://github.com/nextgen-networks/snappymail/issues/185#issuecomment-1059420588 + // https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588 passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' ' . escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var); diff --git a/examples/eml/tnef.eml b/examples/eml/tnef.eml index 7709e9ada..9432fc4ce 100644 --- a/examples/eml/tnef.eml +++ b/examples/eml/tnef.eml @@ -10,7 +10,7 @@ Content-Type: text/plain; charset=us-ascii; format=flowed Test message body with example TNEF part from https://github.com/Yeraze/ytnef -https://github.com/the-djmaze/snappymail/discussions/1012 +https://github.com/nextgen-networks/snappymail/discussions/1012 --=-2UbcDuksJBAwUNBNW7UD Content-Type: application/vnd.ms-tnef diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index a3d442e96..94316c469 100644 --- a/integrations/cloudron/Dockerfile +++ b/integrations/cloudron/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app/code # If you change the extraction below, be sure to test on scaleway VERSION=2.38.2 -RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \ +RUN wget https://github.com/nextgen-networks/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \ unzip /tmp/snappymail.zip -d /app/code && \ rm /tmp/snappymail.zip && \ find /app/code/snappymail -type d -exec chmod 755 {} \; && \ diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index b1a67e0b1..44e402778 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -25,19 +25,19 @@ There, click on the link to go to the SnappyMail admin panel. ]]> SnappyMail - https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md - https://github.com/the-djmaze/snappymail/wiki/Admin-Manual - https://github.com/the-djmaze/snappymail/wiki/Developer-Documentation - https://github.com/the-djmaze/snappymail/wiki + https://github.com/nextgen-networks/snappymail/blob/master/integrations/nextcloud/snappymail/README.md + https://github.com/nextgen-networks/snappymail/wiki/Admin-Manual + https://github.com/nextgen-networks/snappymail/wiki/Developer-Documentation + https://github.com/nextgen-networks/snappymail/wiki integration office search social - https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg + https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg https://snappymail.eu - https://github.com/the-djmaze/snappymail/discussions - https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud + https://github.com/nextgen-networks/snappymail/discussions + https://github.com/nextgen-networks/snappymail/tree/master/integrations/nextcloud https://github.com/the-djmaze/snappymail/issues diff --git a/integrations/owncloud/snappymail/appinfo/info.xml b/integrations/owncloud/snappymail/appinfo/info.xml index 84ce9cb7f..1b9092eb8 100644 --- a/integrations/owncloud/snappymail/appinfo/info.xml +++ b/integrations/owncloud/snappymail/appinfo/info.xml @@ -22,17 +22,17 @@ There, click on the link to go to the SnappyMail admin panel. ]]> SnappyMail - https://github.com/the-djmaze/snappymail/blob/master/integrations/owncloud/snappymail/README.md - https://github.com/the-djmaze/snappymail/wiki + https://github.com/nextgen-networks/snappymail/blob/master/integrations/owncloud/snappymail/README.md + https://github.com/nextgen-networks/snappymail/wiki integration office search social - https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/inbox.jpg + https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/owncloud/screenshots/inbox.jpg https://snappymail.eu - https://github.com/the-djmaze/snappymail/discussions - https://github.com/the-djmaze/snappymail/tree/master/integrations/owncloud + https://github.com/nextgen-networks/snappymail/discussions + https://github.com/nextgen-networks/snappymail/tree/master/integrations/owncloud https://github.com/the-djmaze/snappymail/issues diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl index c3fcc7ab5..61cba8f47 100644 --- a/integrations/virtualmin/snappymail.pl +++ b/integrations/virtualmin/snappymail.pl @@ -153,7 +153,7 @@ sub script_snappymail_files local ($d, $ver, $opts, $upgrade) = @_; local @files = ( { 'name' => "source", 'file' => "snappymail-$ver.tar.gz", - 'url' => "https://github.com/the-djmaze/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" }, + 'url' => "https://github.com/nextgen-networks/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" }, ); return @files; } diff --git a/package.json b/package.json index 3e3ff929d..889872ef9 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "repository": { "type": "git", - "url": "git://github.com/the-djmaze/snappymail.git" + "url": "git://github.com/nextgen-networks/snappymail.git" }, "scripts": { "watch-css": "gulp watchCss" diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php index ee2458948..5fea19cb2 100644 --- a/plugins/auto-domain-grab/index.php +++ b/plugins/auto-domain-grab/index.php @@ -7,7 +7,7 @@ * be set to to 'example.com'. * * Based on: - * https://github.com/the-djmaze/snappymail/blob/master/plugins/override-smtp-credentials/index.php + * https://github.com/nextgen-networks/snappymail/blob/master/plugins/override-smtp-credentials/index.php * */ diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php index a6b8d3f9d..ca4f4e6b1 100644 --- a/plugins/login-gmail/index.php +++ b/plugins/login-gmail/index.php @@ -148,7 +148,7 @@ class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin ->SetLabel('Client ID') ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING) ->SetAllowedInJs() - ->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#gmail'), + ->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#gmail'), \RainLoop\Plugins\Property::NewInstance('client_secret') ->SetLabel('Client Secret') ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING) diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php index 62050f429..c372dd8ab 100644 --- a/plugins/login-o365/index.php +++ b/plugins/login-o365/index.php @@ -166,7 +166,7 @@ class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin ->SetLabel('Client ID') ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING) ->SetAllowedInJs() - ->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#o365'), + ->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#o365'), \RainLoop\Plugins\Property::NewInstance('client_secret') ->SetLabel('Client Secret') ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING) diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html index b83ea9345..749bb035b 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html @@ -40,9 +40,9 @@

- + - +
✔ diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html index e31f81108..e5b68f2bd 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html @@ -9,8 +9,8 @@

- https://github.com/the-djmaze/snappymail/wiki/Installation-instructions + https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html index b78891e18..86780f5c7 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html @@ -93,7 +93,7 @@

- ⓘ + ⓘ