friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-08-26 13:28:03 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity
31458 commits 3 branches 67 tags 242 MiB
Commit graph

31458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp
e563a193f5
 		Setup PHP release workflow in drone with lftp 2021-09-03 09:36:51 +02:00
Michael Vogel
782a54cf8c
 		Merge pull request #10656 from tobiasd/20210902-sec 
updating date of security.txt validity
 2021-09-02 17:20:20 +02:00
Tobias Diekershoff
a19a7dc2a0 updating date of security.txt validity 
The Friendica release plan is roughly March, June, September, December. With
this patch the information in the security.txt are vailid for the two planed
releases after the 2021.09 release.
 2021-09-02 16:57:43 +02:00
Michael Vogel
6d878eafa0
 		Merge pull request #10655 from tobiasd/20210902-de 
DE translation updates
 2021-09-02 10:33:30 +02:00
Tobias Diekershoff
5f48d12d31 DE translation updates 2021-09-02 08:51:42 +02:00
Hypolite Petovan
c4307c85e1
 		Merge pull request #10653 from annando/issue-10640-c 
Issue 10640 - Inverse user display settings
 2021-09-01 17:56:22 -04:00
Michael Vogel
d94af463ba
 		Merge pull request #10652 from tobiasd/20210901-de2 
DE translation updates
 2021-09-01 20:40:26 +02:00
Michael
1e189d6596 Updated messages.po 2021-09-01 18:36:31 +00:00
Michael
58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
Michael
c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
Tobias Diekershoff
86fb56fe39 DE translation updates 2021-09-01 19:44:31 +02:00
Tobias Diekershoff
ce48e8cb5d
 		Merge pull request #10650 from nupplaphil/feat/storage_transl 
Improve translation for Storage module
 2021-09-01 15:36:02 +02:00
Philipp
23a1fa18c8
 		Update messages.po 2021-09-01 14:02:04 +02:00
Philipp
728e82d8b0
 		Improve translation for Storage module 2021-09-01 14:00:23 +02:00
Michael Vogel
229040332f
 		Merge pull request #10649 from tobiasd/20210901-admintemplate 
missing $ in template
 2021-09-01 11:26:41 +02:00
Tobias Diekershoff
5fe1ab0758 missing $ in template 
The admin/site.tpl file had a missing $ from a variable name thus Smarty
could not compile the template.
 2021-09-01 10:54:56 +02:00
Philipp
6fbdcc3dc6
 		Merge pull request #10648 from tobiasd/20210901-de 
DE translation update
 2021-09-01 08:56:31 +02:00
Tobias Diekershoff
073c3cf134 DE translation updats 2021-09-01 08:13:17 +02:00
Hypolite Petovan
bbfeee5380
 		Merge pull request #10647 from annando/issue-10640-a 
Issue 10640: Some more inversed settings
 2021-08-31 16:05:01 -04:00
Hypolite Petovan
1665b54c6f
 		Fix variable assignment alignment in Module\Admin\Site 2021-08-31 16:01:20 -04:00
Michael
13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
Michael
a61bfa4e67 Updated messages.po 2021-08-31 19:28:16 +00:00
Michael
85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
Tobias Diekershoff
01abd5b344
 		Merge pull request #10646 from annando/fix-translation 
Fix translations for singular/plural strings
 2021-08-31 09:44:15 +02:00
Michael Vogel
8f47d90f86
 		Merge pull request #10645 from tobiasd/20210831-de 
DE translation updats
 2021-08-31 08:04:56 +02:00
Michael
80b13ec232 Fix translations for singular/plural strings 2021-08-31 05:51:08 +00:00
Tobias Diekershoff
f32b2b4f85 DE translation updats 2021-08-31 07:39:01 +02:00
Hypolite Petovan
80ff11e626
 		Merge pull request #10644 from annando/issue-10640 
Issue 10640: Use consistent settings to enable protocol support
 2021-08-30 17:36:52 -04:00
Michael
1a8fdbb527 Updated messages.po 2021-08-30 21:18:00 +00:00
Michael
3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
Michael
221c6c4f2a Updated "messages.po" 2021-08-30 19:49:13 +00:00
Michael
e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
Hypolite Petovan
0448070069
 		Merge pull request #10643 from annando/notices 
Avoid notices
 2021-08-30 11:39:47 -04:00
Michael
2bae4dde1f Avoid notices 2021-08-30 12:29:09 +00:00
Hypolite Petovan
4f7142198e
 		Merge pull request #10642 from annando/url-change 
Set contact to failed when url changed
 2021-08-30 08:12:10 -04:00
Michael
9135ff5124 Set contact to failed when url changed 2021-08-29 20:25:21 +00:00
Hypolite Petovan
1c35bcf5c8
 		Merge pull request #10641 from nupplaphil/bug/http_client 
Fix HTTPClient Errors
 2021-08-29 08:22:39 -04:00
Philipp
51fe8fc210
 		Update messages.po (changed branch) 2021-08-29 14:07:31 +02:00
Philipp
0d6884a8a9
 		Fix http_code usage in case of failures 2021-08-29 14:05:38 +02:00
Philipp
58001c729f
 		Fix https://github.com/friendica/friendica/issues/10473#issuecomment-907749093 2021-08-29 13:56:56 +02:00
Philipp
d517fed12d
 		Add test for https://github.com/friendica/friendica/issues/10473#issuecomment-907749093 2021-08-29 13:49:10 +02:00
Philipp
b76634ea0c
 		Catch TransferExceptions for HTTPClient::finalUrl() in case the headers are empty 2021-08-29 13:37:08 +02:00
Tobias Diekershoff
e88c12d958 pump version to 2021.09-rc 2021-08-28 08:46:18 +02:00
Hypolite Petovan
a53cff6ec2
 		Merge pull request #10637 from nupplaphil/feat/webdav_storage 
PSR-7 Part 4: Add additional Authentication options
 2021-08-26 08:04:29 -04:00
Philipp
1c089e8d89
 		[WIP] WebDav Storage backend 2021-08-25 23:47:18 +02:00
Hypolite Petovan
7fb9e1c7c8
 		Merge pull request #10636 from nupplaphil/feat/httpclient_followup 
PSR-7 Part 3: Post Bugfix & HTTPRequestOptions
 2021-08-25 16:01:05 -04:00
Philipp
13a91e63aa
 		Rename DI::httpRequest() into DI::httpClient() 2021-08-25 21:54:54 +02:00
Philipp
505100bdd7
 		Rename HTTPRequestOptions to HTTPClientOptions 2021-08-25 21:45:15 +02:00
Philipp
478f69c403
 		Realy fix setCookieJar 2021-08-25 21:32:44 +02:00
Philipp
2054a787da
 		Fix HTTPRequestOptions at HTTPClient::post() 2021-08-25 21:31:30 +02:00