Commit Graph

5367 Commits (d11efc108cb5059dd6b12bfa6e8f468defb9db2a)

Author SHA1 Message Date
Hypolite Petovan 74ea687c2e
Merge pull request #1145 from annando/simple-short
Support for simple shortening
2021-07-13 21:03:00 -04:00
Michael ee2a97fa5c Support for simple shortening 2021-07-12 14:10:38 +00:00
Hypolite Petovan 57be32257b
Merge pull request #1144 from annando/foruriid
Use "convertForUriId" when possible
2021-07-10 17:42:12 -04:00
Michael 9eaa6a2c08 Use "convertForUriId" when possible 2021-07-10 07:40:39 +00:00
Michael Vogel b164910032
Merge pull request #1143 from friendica/20210701-securemail
added missing )
2021-07-01 08:33:13 +02:00
Tobias Diekershoff fb4687b6df added missing )
This is a followup to PR  #1142 adding a missing ) to the if statement.
2021-07-01 07:47:48 +02:00
Hypolite Petovan bcda4f3c15
Merge pull request #1142 from Tealk/secure-mail
[securemail] template adapted to standard
2021-06-30 21:22:20 -04:00
Hypolite Petovan d86ad302e3
[securemail] Fix quoting style in securemail_settings_post() 2021-06-30 21:20:59 -04:00
Tealk 629c1cca9f
fix $_POST variable 2021-06-30 09:36:21 +02:00
Tealk ad111e05df
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-29 17:30:13 +02:00
Tealk a754a895ed
template adapted to standard 2021-06-29 11:18:15 +02:00
Tobias Diekershoff e83170ffcd
Merge pull request #1141 from MrPetovan/bug/10439-addon-settings-forms
[mailstream] Add a name to the addon settings submit button
2021-06-29 07:24:00 +02:00
Benjamin Lorteau dd7f343d43 [mailstream] Add a name to the addon settings submit button
- Now that each addon form is in their own form tag, we have to check whether the addon submit button was pressed.
- This was already done in every other addon but mailstream and this change will prevent unexpected loss of mailstream settings when saving any other addon settings.
2021-06-27 22:15:11 -04:00
Benjamin Lorteau 93892fd25a [catavatar] Remove unused code
- The $seed variable isn't used in that function, which removes the need for the database call.
2021-06-27 22:12:40 -04:00
Hypolite Petovan acdb5c551f
Merge pull request #1140 from nupplaphil/bug/catavatar
[securemail] Remove wrong 5th argument
2021-06-27 21:24:36 -04:00
Hypolite Petovan 0a8fe9149f
Merge pull request #1138 from nupplaphil/feat/phpmailer
[phpmailer] Update phpmailer to v6.5.0
2021-06-27 20:59:43 -04:00
Philipp 50552912b8
Remove wrong 5th argument for securemail 2021-06-27 21:33:12 +02:00
Michael Vogel 45fe085dac
Merge pull request #1139 from tobiasd/20210627-hu
HU translation of various addon uspdated THX urbalazs
2021-06-27 16:46:53 +02:00
Tobias Diekershoff c07649cd2b js upload addon HU translation updated THX Balázs Úr 2021-06-27 14:34:52 +02:00
Tobias Diekershoff 578e79afa6 added HU translation of keycloakpassword addon THX urbalazs 2021-06-27 14:33:48 +02:00
Tobias Diekershoff 27fc16d631 langfilter addon HU translation updated THX Balázs Úr 2021-06-27 14:31:45 +02:00
Tobias Diekershoff 22feb9ca04 HU translation added nitter addon THX urbalazs 2021-06-27 14:30:39 +02:00
Tobias Diekershoff 0bd7943d95 HU translation update saml addon THX urbalazs 2021-06-27 14:29:03 +02:00
Philipp 410c90460e
[phpmailer] Update phpmailer to v6.5.0 2021-06-26 19:46:51 +02:00
Philipp 3879d4f4fa
Merge pull request #1137 from friendica/dependabot/composer/phpmailer/phpmailer/phpmailer-6.5.0
Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 in /phpmailer
2021-06-22 19:12:22 +02:00
dependabot[bot] 4914afa221
Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 in /phpmailer
Bumps [phpmailer/phpmailer](https://github.com/PHPMailer/PHPMailer) from 6.1.6 to 6.5.0.
- [Release notes](https://github.com/PHPMailer/PHPMailer/releases)
- [Changelog](https://github.com/PHPMailer/PHPMailer/blob/master/changelog.md)
- [Commits](https://github.com/PHPMailer/PHPMailer/compare/v6.1.6...v6.5.0)

---
updated-dependencies:
- dependency-name: phpmailer/phpmailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-22 15:39:04 +00:00
Hypolite Petovan 17f6c8902b
Merge pull request #1136 from annando/header
Fill the header field of the contact with the twitter banner
2021-06-22 11:19:59 -04:00
Michael b4839e8a37 Fill the header field of the contact with the twitter banner 2021-06-22 15:00:59 +00:00
Hypolite Petovan 0d4c95b7bc
Merge pull request #1133 from mexon/mat/mailstream-workerqueue
Use workerqueue for mailstream jobs instead of custom table
2021-06-16 17:57:06 -04:00
Hypolite Petovan 91eefebab4
Merge pull request #1135 from annando/profile-update
CatAvatar: Use new function to perform a profile update
2021-06-16 10:23:11 -04:00
Michael ca4c76ce41 CatAvatar: Use new function to perform a profile update 2021-06-16 05:26:10 +00:00
Matthew Exon 6596a81af1 Retry failed mails with the defer() feature 2021-06-12 18:22:53 +02:00
Hypolite Petovan 1030498c09
Merge pull request #1134 from annando/bb-agent
Blockbot: Added "axios" to the "good" agents
2021-06-11 11:35:29 -04:00
Michael 4791838cfd Blockbot: Added "axios" to the "good" agents 2021-06-11 14:37:20 +00:00
Matthew Exon a50ca54999 Use workerqueue for mailstream jobs instead of custom table 2021-06-10 18:11:26 +02:00
Michael Vogel b5d841643c
Merge pull request #1132 from MrPetovan/bug/10378-ldapauth-wrong-parameters
[ldapauth] Only call ldap_createaccount once
2021-06-08 06:41:41 +02:00
Hypolite Petovan f6735056b0 [ldap] Only call ldap_createaccount once
- Moved group membership check before user creation
- Improve group membership check error message specificity
2021-06-07 23:55:24 -04:00
Hypolite Petovan b300d27d19
Merge pull request #1131 from annando/twitter-logging
Twitter: Improved logging for the picture upload
2021-06-02 09:31:30 -04:00
Michael 72b6898d49 Twitter: Improved logging for the picture upload 2021-06-02 13:13:26 +00:00
Michael Vogel be62a9a369
Merge pull request #1130 from MrPetovan/bug/notices
[openstreetmap] Ensure location key is available in hook data
2021-05-31 10:59:34 +02:00
Hypolite Petovan 7cad014049 [openstreetmap] Ensure location key is available in hook data
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835548421
2021-05-31 01:44:17 -04:00
Hypolite Petovan 0464660cad
Merge pull request #1129 from nupplaphil/bug/friendica-10314
Fix cat avatar for non-admin users
2021-05-29 16:57:31 -04:00
Philipp 5ea82418d8
Revert indentation 2021-05-29 21:59:54 +02:00
Philipp 58e38651b2
Fix cat avatar for non-admin users 2021-05-29 21:57:14 +02:00
Michael Vogel 050b46139b
Merge pull request #1128 from nupplaphil/bug/twitter_timeout
Catch Twitter Exceptions
2021-05-29 21:27:27 +02:00
Philipp d032800f1e
Catch Twitter Exceptions 2021-05-29 21:14:12 +02:00
Michael Vogel 431607509d
Merge pull request #1127 from nupplaphil/bug/friendica-10312
[securemail,phpmailer] Increase priority for securemail over phpmailer
2021-05-29 21:14:06 +02:00
Philipp bb8c01eba7
Increase priority for securemail over PHP SMTP mail 2021-05-29 20:59:51 +02:00
Hypolite Petovan f014d84798
Merge pull request #1125 from annando/blockbot-agents
Blockbot: Move Zabbix to the "good" agents
2021-05-24 05:56:36 -04:00
Michael Vogel 18556027cb
Merge pull request #1126 from tobiasd/20210524-de
DE translation updates THX Till Mohr
2021-05-24 09:22:40 +02:00