1
0
Fork 0
Commit graph

31827 commits

Author SHA1 Message Date
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
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
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
d8447469b6 Prefer the local user when displaying items 2021-10-01 05:26:13 +00:00
Michael Vogel
c8d2321c99
Merge pull request from tobiasd/20210929-ru
RU translations THX Alexander An
2021-09-29 08:15:09 +02:00
2139e46d98 RU translations THX Alexander An 2021-09-29 07:37:38 +02:00
57ac1e5b92
Merge pull request from annando/comment-public
Fix commenting on profile pages
2021-09-28 15:12:22 -04:00
65b0b443b5 Fix commenting on profile pages 2021-09-28 18:52:11 +00:00
d9cd2f5bca
Merge pull request from annando/issue-10772
Issue 10772: Avoid duplicated links in AP posts
2021-09-28 07:03:39 -04:00
0b333ef6bc Fixed test error 2021-09-28 04:27:24 +00:00
dd6e321c97 Added test 2021-09-28 03:36:48 +00:00
5a7bd4884a Issue 10772: Avoid duplicated links in AP posts 2021-09-27 20:26:08 +00:00
e53dcc3be2
Merge pull request 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 
2021-09-27 12:14:19 +02:00
79b40ad573
Merge pull request from annando/issue-10768
Issue 10768: Avoid MySQL problems when upgrading both index and structure
2021-09-26 17:45:31 -04:00
e4b8536c75 Removing MySQL workaround 2021-09-26 18:30:44 +00:00
f26226229a Issue 10768: Avoid MySQL problems when upgrading both index and structure 2021-09-26 17:13:26 +00:00
2a88262732
Merge pull request 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 from MrPetovan/bug/notices
Return early when parent-related record isn't found
2021-09-26 14:22:05 +02:00
1bb25de287 Applied change from PR 2021-09-26 12:17:30 +00:00
6d19ecfde0 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 12:15:22 +00:00
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
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 from MrPetovan/task/10745-redir-private-posts
Limit /redir links to private posts
2021-09-26 07:03:08 +02:00
e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
24078ad5f0 Testing cs ... 2021-09-26 03:59:15 +00:00
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
49f9ac0e77 Testing cs 2021-09-26 03:54:54 +00:00
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Michael Vogel
45277bbc47
Merge pull request from MrPetovan/task/10734-unfollow-hook
Add new hook to support unfollow contacts on non-native networks
2021-09-26 04:57:42 +02:00
6836b1ea78 Limit /redir links to private posts
- This allows to share public post links with anonymous users
2021-09-25 16:15:25 -04:00
d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
Michael Vogel
255b98b5bf
Merge pull request from nupplaphil/bug/drone_chmod
Adapt permissions
2021-09-25 22:09:42 +02:00
8e979b4c9e And another operator ... 2021-09-25 18:53:35 +00:00
9369b02613 testing one operator less .. 2021-09-25 18:50:22 +00:00
6983f257c8 Updated messages.po 2021-09-25 18:45:32 +00:00
e77b5d4569 Updated messages.po 2021-09-25 18:43:19 +00:00
f60c8225a6 Change code style rules 2021-09-25 18:40:11 +00:00
1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
f0c4d504af
Update messages.po (new version) 2021-09-25 20:18:01 +02:00
b970455388
Adapt permissions 2021-09-25 20:13:44 +02:00
00382dd39e opened CHANGELOG for 2021.12 2021-09-25 19:22:11 +02:00
944957a009 pumped version to 2021.12-dev 2021-09-25 19:21:35 +02:00
1adbdfb8d1 set the version of Friendica to 2021.09 2021-09-25 19:18:27 +02:00
142fad533e CHANGELOG set release date 2021-09-25 19:16:41 +02:00
61484c3c4c
Merge pull request from tobiasd/2021.09-CHANGELOG
2021.09 CHANGELOG
2021-09-25 19:15:08 +02:00