Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 09:02:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
31801 commits 3 branches 64 tags 245 MiB
Commit graph

31801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
2e6b0f63be small typo 2021-10-01 18:27:22 +02:00
Tobias Diekershoff
d7cb68e95d add a hint about the phpmailer addon to the install docs 2021-10-01 18:25:18 +02:00
Hypolite Petovan
c20c029edc
Merge pull request #10789 from tobiasd/20211001-de 
DE translation updates
 2021-10-01 11:39:56 -04:00
Tobias Diekershoff
91a31f2da9 DE translation updates 2021-10-01 17:35:21 +02:00
fabrixxm
30c3740f67 Fix run_xgettext.sh code and make it work on osx 
- run script thru `shellcheck` and fix code
- replace `readlink -f` with a function which works on osx too
- set flags to stop on errors
 2021-10-01 17:26:19 +02:00
Hypolite Petovan
dae3e7d4c7
Merge pull request #10787 from fabrixxm/issue/10767 
Mark string translatable in View logs
 2021-10-01 11:08:11 -04:00
fabrixxm
e8c0d5d445 Logs view: remove unneeded tpl var 2021-10-01 17:00:06 +02:00
fabrixxm
0638e23f7a Mark string translatable in View logs 
and update messages.po
 2021-10-01 16:46:55 +02:00
Hypolite Petovan
0c53adfd72
Merge pull request #10782 from annando/display-uid 
Prefer the local user when displaying items
 2021-10-01 10:41:38 -04:00
Michael Vogel
6a444d8e13
Update mod/display.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-01 16:28:33 +02:00
Tobias Diekershoff
3727be9d6c
Merge pull request #10786 from annando/sanitize-addon-author 
Sanitize the addon author if it is not a valid URL but a handle
 2021-10-01 15:30:30 +02:00
Michael
19d5987c9d Sanitize the addon author if it is not a valid URL but a handle 2021-10-01 13:25:00 +00:00
fabrixxm
5bcc6cca75
Merge pull request #10784 from tobiasd/20211001-adminpanel_messages 
cleanup adminpanel messages
 2021-10-01 14:20:50 +02:00
Tobias Diekershoff
2f0b2e2276
Merge pull request #10785 from fabrixxm/fix/test-small-typo 
Fix typo in test for ParsedLogIterator
 2021-10-01 14:17:35 +02:00
fabrixxm
fcc284577d Fix typo in test for ParsedLogIterator 2021-10-01 14:08:00 +02:00
Tobias Diekershoff
f51438c168 unescape HTML from the relocation warning message 2021-10-01 14:05:17 +02:00
Tobias Diekershoff
786596fec5 remove superfluous characters from warning messages in the admin panel 
\r\n was shown in the warning messages of the admin panel log view page. They have
been removed. Additionally the messages.po file has been regenerated.
 2021-10-01 14:02:27 +02:00
fabrixxm
e73be051ce
Merge pull request #10783 from tobiasd/20211001-Vagrant 
Vagrant updates
 2021-10-01 10:35:57 +02:00
Tobias Diekershoff
9b23ac578e Vagrant: create the correct mail aliases during provision 2021-10-01 10:18:43 +02:00
Tobias Diekershoff
0b2fa63bcb Vagrant: Docs add a note about the PHP dependencies 2021-10-01 10:04:40 +02:00
Tobias Diekershoff
d52e2ab791 Vagrant: Replace comment with more fitting one in provision 2021-10-01 10:00:01 +02:00
Tobias Diekershoff
4960d0f438 Vagrant: Add the type to the synced folder in the Vagrantfile 2021-10-01 09:42:08 +02:00
Tobias Diekershoff
e4dc2b8e1c Vagrant: Docs 
A typo and a note about resolving friendica.local
 2021-10-01 09:38:51 +02:00
Tobias Diekershoff
d6f89da11b Vagrant: updating the docs 2021-10-01 08:54:08 +02:00
Tobias Diekershoff
7331e90c00 Vagrant: Avoid mis-leading error during setup 
With the use of Friendicas auto-installation feature and the pre-configured
config file, the admin email address is set. Setting it again after the
installation is compleated will generate a mis-leading error message.
 2021-10-01 08:41:58 +02:00
Tobias Diekershoff
93bbf27d52 Vagrant: Do not pull PHP requirements during VM setup 
Don't pull the PHP requirements of Friendica with composer during the VM setup.

First coding is done out side of the VM, so should be the management of the
dependencies. Additionally if the _VirtualBox Guest Additions_ versions don't
match on the guest and host systems, writing to the shared directory will not
work, thus running composer will generate error messages during the initial
setup and Friendica wont work.
 2021-10-01 08:37:19 +02:00
Tobias Diekershoff
9858f86b21 Vagrant: Use Debian stable 
With the release of Debian 11 the Vagrant was still using _oldstable_ with this
we are now using Debian stable again in the Vagrant VM.
 2021-10-01 08:35:09 +02:00
Michael
d8447469b6 Prefer the local user when displaying items 2021-10-01 05:26:13 +00:00
Michael Vogel
c8d2321c99
Merge pull request #10776 from tobiasd/20210929-ru 
RU translations THX Alexander An
 2021-09-29 08:15:09 +02:00
Tobias Diekershoff
2139e46d98 RU translations THX Alexander An 2021-09-29 07:37:38 +02:00
Hypolite Petovan
57ac1e5b92
Merge pull request #10775 from annando/comment-public 
Fix commenting on profile pages
 2021-09-28 15:12:22 -04:00
Michael
65b0b443b5 Fix commenting on profile pages 2021-09-28 18:52:11 +00:00
Hypolite Petovan
d9cd2f5bca
Merge pull request #10773 from annando/issue-10772 
Issue 10772: Avoid duplicated links in AP posts
 2021-09-28 07:03:39 -04:00
Michael
0b333ef6bc Fixed test error 2021-09-28 04:27:24 +00:00
Michael
dd6e321c97 Added test 2021-09-28 03:36:48 +00:00
Michael
5a7bd4884a Issue 10772: Avoid duplicated links in AP posts 2021-09-27 20:26:08 +00:00
Hypolite Petovan
e53dcc3be2
Merge pull request #10771 from fabrixxm/issue/10766 
Handle reading empty file in ReversedFileReader
 2021-09-27 07:13:14 -04:00
fabrixxm
ab7de16aca Fix code style 2021-09-27 12:22:08 +02:00
fabrixxm
eadcc8dc93 Handle reading empty file in ReversedFileReader 
fix #10766
 2021-09-27 12:14:19 +02:00
Hypolite Petovan
79b40ad573
Merge pull request #10770 from annando/issue-10768 
Issue 10768: Avoid MySQL problems when upgrading both index and structure
 2021-09-26 17:45:31 -04:00
Michael
e4b8536c75 Removing MySQL workaround 2021-09-26 18:30:44 +00:00
Michael
f26226229a Issue 10768: Avoid MySQL problems when upgrading both index and structure 2021-09-26 17:13:26 +00:00
Hypolite Petovan
2a88262732
Merge pull request #10760 from annando/conversation-moved 
The conversation functionality moved to a class
 2021-09-26 10:03:26 -04:00
Michael Vogel
92114dbe33
Merge pull request #10764 from MrPetovan/bug/notices 
Return early when parent-related record isn't found
 2021-09-26 14:22:05 +02:00
Michael
1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
Michael
6d19ecfde0 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 12:15:22 +00:00
Hypolite Petovan
0bb169b4ed Check for reply existence before using its values in Model\Mail 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
 2021-09-26 08:15:07 -04:00
Hypolite Petovan
9d77958247 Ensure parent exists before adding reply to elements in OStatus and Feed 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-927118628
 2021-09-26 08:15:07 -04:00
Michael Vogel
1cf759d414
Merge pull request #10763 from MrPetovan/task/10745-redir-private-posts 
Limit /redir links to private posts
 2021-09-26 07:03:08 +02:00
Michael
e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00