Skip to content

Commit

Permalink
Merge branch 'release/3.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilsteampassnet
nilsteampassnet committed Feb 26, 2025
2 parents 2629ab8 + 67f8e02 commit 4723164
Show file tree
Hide file tree
Showing 560 changed files with 7,348 additions and 20,040 deletions.
2 changes: 1 addition & 1 deletion api/Controller/Api/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Controller/Api/BaseController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Controller/Api/FolderController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Controller/Api/ItemController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Controller/Api/UserController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Model/AuthModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
* @file AuthModel.php
* @author Nils Laumaillé ([email protected])
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
* @license GPL-3.0
* @see https://www.teampass.net
*/
Expand Down
2 changes: 1 addition & 1 deletion api/Model/FolderModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
* @file FolderModel.php
* @author Nils Laumaillé ([email protected])
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
* @license GPL-3.0
* @see https://www.teampass.net
*/
Expand Down
2 changes: 1 addition & 1 deletion api/Model/ItemModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
* @file ItemModel.php
* @author Nils Laumaillé ([email protected])
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
* @license GPL-3.0
* @see https://www.teampass.net
*/
Expand Down
2 changes: 1 addition & 1 deletion api/Model/Operation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/Model/UserModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/inc/bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/inc/jwt_utils.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion api/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author Nils Laumaillé ([email protected])
*
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
*
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
Expand Down
2 changes: 1 addition & 1 deletion changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @file changelog.txt
* ---
* @author Nils Laumaillé ([email protected])
* @copyright 2009-2024 Teampass.net
* @copyright 2009-2025 Teampass.net
* @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
* ---
* @see https://www.teampass.net
Expand Down
26 changes: 13 additions & 13 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,19 @@
"ext-iconv": "*",
"ext-xml": "*",
"ext-gd": "*",
"teampassclasses/sessionmanager": "dev-master",
"teampassclasses/superglobal": "dev-master",
"teampassclasses/nestedtree": "dev-master",
"ezimuel/php-secure-session": "dev-master",
"teampassclasses/performchecks": "dev-master",
"teampassclasses/encryption": "dev-master",
"teampassclasses/language": "dev-master",
"teampassclasses/ldapextra": "dev-master",
"teampassclasses/passwordmanager": "dev-master",
"teampassclasses/oauth2controller": "dev-master",
"teampassclasses/configmanager": "dev-master",
"teampassclasses/emailservice": "dev-master",
"teampassclasses/folderservices": "dev-master",
"teampassclasses/sessionmanager": "dev-develop",
"teampassclasses/superglobal": "dev-develop",
"teampassclasses/nestedtree": "dev-develop",
"ezimuel/php-secure-session": "dev-develop",
"teampassclasses/performchecks": "dev-develop",
"teampassclasses/encryption": "dev-develop",
"teampassclasses/language": "dev-develop",
"teampassclasses/ldapextra": "dev-develop",
"teampassclasses/passwordmanager": "dev-develop",
"teampassclasses/oauth2controller": "dev-develop",
"teampassclasses/configmanager": "dev-develop",
"teampassclasses/emailservice": "dev-develop",
"teampassclasses/folderservices": "dev-develop",
"illuminate/contracts": "^10.32",
"illuminate/collections": "^10.48",
"nesbot/carbon": "^2.71",
Expand Down
Loading

0 comments on commit 4723164

Please sign in to comment.