a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu)
2021-09-12 21:20:12 +02:00
3eea4b1130
Use "rel" for "self" instead of using a separate field
2021-09-12 19:04:27 +00:00
19c3e55ca8
Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact
2021-09-12 12:36:04 +00:00
b7c262bee6
Fix test
2021-09-12 13:51:03 +02:00
27e4586597
Move path determination logic into the ConfigFactory
2021-09-12 13:44:29 +02:00
Michael Vogel
5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities
...
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
2021-09-12 06:47:51 +02:00
e3a2f17f9f
Merge pull request #10696 from annando/photo-type
...
Use post type "photo" for multiple photos as well
2021-09-12 00:19:47 -04:00
9ab217c6e5
Merge pull request #10695 from annando/commenting
...
Fix commenting on public posts
2021-09-12 00:19:10 -04:00
8e99b7f775
Refine BBCode::expandTags regular expression
...
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
2021-09-12 00:06:14 -04:00
5a93bb6eff
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
...
- We never need to expand tags inside of an already existing BBCode url tag
2021-09-12 00:05:22 -04:00
6579a3a106
Use post type "photo" for multiple photos as well
2021-09-12 01:58:29 +00:00
9191daf12f
Fix commenting on public posts
2021-09-12 01:52:10 +00:00
Michael Vogel
8628bd5228
Merge pull request #10694 from nupplaphil/bug/drone_gzip
...
Fix drone artifact compression parameter
2021-09-11 21:36:50 +02:00
ee0b8a9e60
Fix drone artifact compression parameter
2021-09-11 20:00:13 +02:00
eeec6aaeb9
Removed unused "use"
2021-09-11 13:02:36 +00:00
1e123ace12
Only fetch, not probe
2021-09-11 13:00:12 +00:00
10cb52bc00
Only add user contacts, alternate way to fetch public contact id
2021-09-11 12:43:46 +00:00
5702944116
Add the possibility to use a different configuration directory
2021-09-11 14:33:26 +02:00
5113987031
Added update function to add user-contact entry
2021-09-11 07:59:46 +00:00
c40b3411a7
Merge pull request #10689 from MrPetovan/bug/fatal-errors
...
[frio] Use correct admin endpoint for block/deletion in Admin\Users\Active
2021-09-11 07:51:11 +02:00
f33a98578d
Capitalization
2021-09-10 23:59:33 +00:00
b170dd765d
Insert and update some more fields
2021-09-10 20:53:10 +00:00
2486c8031b
update for user-contact is added
2021-09-10 20:22:24 +00:00
9c14eb0c6b
Use centralized function to update contact entries
2021-09-10 18:21:19 +00:00
Michael Vogel
e7593dcc1f
Merge pull request #10688 from MrPetovan/task/10672-contact-module-security-token
...
Move unsecured GET endpoint handlers before security token check in Module\Contact
2021-09-10 18:33:55 +02:00
12396a1298
[frio] Use correct admin endpoint for block/deletion in Admin\Users\Active
...
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-914516676
2021-09-10 12:27:23 -04:00
8b450be09b
Move unsecured GET endpoint handlers before security token check in Module\Contact
2021-09-10 12:05:43 -04:00
75d3f5094b
Merge pull request #10683 from annando/proxify
...
Make the proxy functionality optional
2021-09-10 10:24:17 -04:00
a4b0ab90b1
Insert a user-contact
for every contact
2021-09-10 13:05:16 +00:00
Philipp
bca856abf7
Merge pull request #10685 from tobiasd/20210910-hu
...
HU translation updated THX Balázs Úr
2021-09-10 08:32:15 +02:00
6c9fe7d95b
HU translation updated THX Balázs Úr
2021-09-10 07:29:17 +02:00
634db1ec85
Changed text
2021-09-10 00:30:11 +00:00
Michael Vogel
18470da84a
Merge pull request #10673 from MrPetovan/task/10672-contact-module-security-token
...
Add form security token to contact actions
2021-09-09 14:51:19 +02:00
bdb5aa6bd9
Make the proxy functionality optional
2021-09-09 12:40:19 +00:00
Michael Vogel
3cceb5ba6f
Merge pull request #10682 from tobiasd/20210909-docs
...
update to the INSTALL documentation
2021-09-09 12:59:13 +02:00
acabaf4df7
update to the INSTALL documentation
...
* updated the PHP requirements and added a note about the PHP8 support
* removed the section about tryfriendica.de as possibility to get a temporal Friendica account
2021-09-09 10:42:18 +02:00
43fe1341f9
Merge pull request #10681 from nupplaphil/feat/drone_sha512
...
Add GPG signing for drone artifacts
2021-09-08 18:45:58 -04:00
04b2eb41cd
Add GPG sign
2021-09-08 22:08:59 +02:00
373d5c3f02
Merge pull request #10677 from nupplaphil/feat/optimize_drone
...
Add drone graph execution
2021-09-07 16:59:09 -04:00
f1c536f18d
Add drone graph execution
2021-09-07 20:49:42 +02:00
Philipp
225d368139
Merge pull request #10676 from tobiasd/20210907-de
...
DE translation updates
2021-09-07 08:01:21 +02:00
fa5e4db549
DE translation updates
2021-09-07 07:39:19 +02:00
c7b19653dc
Merge pull request #10675 from annando/fix-10674
...
Fix for PR 10674: Changing the template variables according to the last changes
2021-09-06 16:45:39 -04:00
be3f7e4528
Fix for PR 10674: Changing the template variables according to the last changes
2021-09-06 20:25:23 +00:00
Michael Vogel
b52b78efbd
Merge pull request #10674 from MrPetovan/task/10640-convert-disable-settings-to-enable
...
Convert the two remaining "Disable..." setting names to "Enable..."
2021-09-06 21:32:27 +02:00
0011b4187f
Update main messages.po
2021-09-06 14:18:56 -04:00
d295b37789
Convert the two remaining "Disable..." setting names to "Enable..."
2021-09-06 12:43:24 -04:00
e9aa27b19f
Add form security token to contact actions
...
- Add token to batch POST actions
- Add token to individual GET actions
2021-09-06 12:30:38 -04:00
Michael Vogel
0c8c0f7374
Merge pull request #10670 from MrPetovan/bug/10502-contact-block-unblock
...
Distinguish between public and private contact in contact actions
2021-09-06 18:25:54 +02:00
9718e198a1
Update main messages.po
2021-09-06 11:50:50 -04:00