ed67e2cd6e
Merge pull request #985 from friendica/dependabot/composer/phpmailer/phpmailer/phpmailer-6.1.6
...
Bump phpmailer/phpmailer from 6.1.4 to 6.1.6 in /phpmailer
2020-05-27 14:05:06 -04:00
a0e071db70
Bump phpmailer/phpmailer from 6.1.4 to 6.1.6 in /phpmailer
...
Bumps [phpmailer/phpmailer](https://github.com/PHPMailer/PHPMailer ) from 6.1.4 to 6.1.6.
- [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.4...v6.1.6 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-05-27 17:59:56 +00:00
47cb5d0b14
Merge pull request #984 from annando/twitter-gsid
...
Twitter: set the baseurl and the gsid
2020-05-23 18:15:48 -04:00
351ff48ef8
Twitter: set the baseurl and the gsid
2020-05-23 17:51:41 +00:00
54d22d3ef8
Merge pull request #983 from AlfredSK/patch-1
...
Issue 8680: Fix slim application error
2020-05-23 19:09:06 +02:00
33fc7240e6
Issue 8680: Fix slim application error
...
This should fix https://github.com/friendica/friendica/issues/8680
2020-05-23 16:30:55 +02:00
5688629a4b
Merge pull request #982 from annando/bbcode-constants
...
Replacing numberic values with constants for the BBCode conversion
2020-05-16 13:15:52 -04:00
b406d737b5
Replacing numberic values with constants for the BBCode conversion
2020-05-16 16:48:08 +00:00
59cfb05c3a
Merge pull request #980 from annando/item-insert
...
Self merging, since @MrPetovan approved it - and it would otherwise create issues when not merged now.
2020-05-14 09:59:40 +02:00
5b9bba32bb
Merge pull request #981 from MrPetovan/task/remove-item-tag
...
[various] Remove references to obsolete virtual tag item.tag
2020-05-14 06:13:47 +02:00
5e397ad580
[twitter] Remove references to obsolete virtual field item.tag
2020-05-13 22:40:02 -04:00
cf6bf67fd8
[statusnet] Remove references to obsolete virtual field item.tag
...
- Remove tag extraction done in Item::insert
2020-05-13 22:39:33 -04:00
b6cd18fcad
[ljpost] Remove references to obsolete virtual field item.tag
2020-05-13 22:38:59 -04:00
8b291f534e
[ijpost] Remove references to obsolete virtual field item.tag
2020-05-13 22:38:50 -04:00
5e39c8d2c2
[dwpost] Remove references to obsolete virtual field item.tag
2020-05-13 22:38:39 -04:00
00b1f69b7e
Removed parameter from item::insert
2020-05-13 19:29:33 +00:00
76e3339b7b
Merge pull request #979 from MrPetovan/task/8564-diaspora-connector-settings
...
[diaspora] Overhaul connector settings
2020-05-07 07:11:58 +02:00
b733391e85
[diaspora] Overhaul connector settings
...
- Move HTML in template file
- Use standard form fields
- Hide irrelevant fields depending on the connector status (disabled, enabled, error)
- Add notice messages on settings submit
2020-05-07 00:16:40 -04:00
e060931939
Merge pull request #978 from annando/tags
...
Updated addons for new tag handling
2020-05-05 21:26:40 -04:00
471bcc1b63
Updated addons for new tag handling
2020-05-05 22:47:43 +00:00
9b57f661b0
Merge pull request #977 from nupplaphil/bug/subdir
...
[various] Template Engine with Subdirectory
2020-04-26 14:31:37 -04:00
6520bd77d9
Template Engine with Subdirectory
...
- Use explicit root path for template engine
- Replace "__DIR__" calls in addons with subdirectories
- Fixes local tests, where call is made out of '/' and not '/vagrant/'
2020-04-26 15:45:25 +02:00
81dd8fb295
Merge pull request #976 from annando/tags
...
Twitter: Storing tags the new way
2020-04-25 21:08:54 -04:00
4486c7bfd5
Update twitter/twitter.php
...
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
2020-04-25 23:23:57 +02:00
45e1dff8fd
Added documentation
2020-04-25 18:21:31 +00:00
3814219b0c
Twitter: Storing tags the new way
2020-04-25 17:56:14 +00:00
d108ea4b79
Merge pull request #975 from MrPetovan/bug/8511-lib-oauth1-token-parameter
...
[various] Move optional token parameter at the end of OAuthRequest::from_consumer_and_token() function definition
2020-04-25 19:54:58 +02:00
2a3689976e
[tumblr] Update call to OAuthRequest::from_consumer_and_token after definition change
2020-04-25 12:35:49 -04:00
a76e9a1226
[statusnet] Update call to OAuthRequest::from_consumer_and_token after definition change
2020-04-25 12:35:41 -04:00
786de7b891
Merge pull request #974 from MrPetovan/bug/notices
...
[twitter] Use correct variable name for emptiness test in twitter_convert_share()
2020-04-04 19:12:19 +02:00
079e56fb1c
[twitter] Use correct variable name for emptiness test in twitter_convert_share()
2020-04-04 12:36:33 -04:00
cb34593770
Merge pull request #973 from annando/notices
...
Fixing some notices
2020-04-04 15:31:13 +02:00
225243645e
Fixing some notices
2020-04-04 11:15:13 +00:00
ec335be182
Merge pull request #972 from MrPetovan/bug/8470-twitter-expand-entities
...
[twitter] Rework twitter_expand_entities
2020-04-03 06:45:02 +02:00
1df61e8dc2
[twitter] Rework twitter_expand_entities
...
- Uses Twitter-provided entity indices to avoid blanket string replacement and unwarranted tag search
2020-03-30 10:49:06 -04:00
96925a3a75
Merge 2020.03 into develop
2020-03-30 14:31:36 +02:00
efaf125d3d
Merge pull request #971 from tobiasd/20200329-fr
...
FR translation update THX ButterflyOfFire
2020-03-29 14:26:50 -04:00
98579a7feb
gnot FR translation update THX ButterflyOfFire
2020-03-29 19:08:25 +02:00
a32fd4df56
geonames FR translation update THX ButterflyOfFire
2020-03-29 19:07:57 +02:00
5cd2f6c442
Merge pull request #968 from wiwie/develop
...
[WIP] #8374 : Limit post content by rendered height instead of number of characters
2020-03-17 20:48:18 -04:00
9497a598bb
#8374 : Removed wrapper from css
2020-03-17 22:34:34 +01:00
15d3c2f78e
#8374 : Not triggering post height limit when showing individual post under /display
2020-03-17 22:27:48 +01:00
f9e74a3c34
#8374 : Removed wrapper and unnecessary css
2020-03-17 21:50:00 +01:00
b5056b11ef
#8374 : Removed unnecessary template variable
2020-03-16 16:20:32 +01:00
4f7dc02acb
Merge pull request #970 from tobiasd/20200316-ru
...
blockbot added RU translation THX Eugene Veresk
2020-03-16 10:27:04 -04:00
fabd3728a7
blockbot added RU translation THX Eugene Veresk
2020-03-16 10:05:06 +01:00
959f98e476
#8374 : Updating messages.po
2020-03-15 21:21:39 +01:00
4d3aed3095
#8374 : Using sub-templates for input field
2020-03-15 21:19:42 +01:00
1360efc930
#8374 : Removed incorrect strings.php file
2020-03-15 21:18:29 +01:00
f4c141f2e7
#8374 : Added missing lang/C/messages.po file
2020-03-15 15:58:26 +01:00
Hypolite Petovan
dependabot[bot]
Michael
Michael Vogel
Steffen K9
Philipp
Tobias Diekershoff
Christian Wiwie