jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30626 commits 10 branches 58 tags 216 MiB
Commit graph

30626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
98c314599c Don't lose ownership on forum posting 2021-06-05 06:13:10 +00:00
Hypolite Petovan
86d56c7f57
Merge pull request #10361 from annando/limit-context 
Simplify the code
 2021-06-02 09:11:11 -04:00
Hypolite Petovan
b47ae829f7
Merge pull request #10360 from annando/limit-context 
API: Limit the elements for the context
 2021-06-02 07:13:39 -04:00
Hypolite Petovan
ea473d93b7
Merge pull request #10359 from annando/milliseconds 
Use the proper way to display milliseconds
 2021-06-02 07:12:32 -04:00
Michael
4d19a6f0e3 Simplify the code 2021-06-02 07:15:42 +00:00
Michael
a2be7e386f API: Lim it the elements for the context 2021-06-02 07:11:18 +00:00
Michael
e7bc908655 Renaming the date format to "JSON" 2021-06-02 03:32:42 +00:00
Michael
4e164690d5 Use the proper way to display milliseconds 2021-06-02 03:19:55 +00:00
Hypolite Petovan
1088376172
Merge pull request #10357 from annando/api-date 
API: Fix date format
 2021-06-01 20:07:44 -04:00
Michael
5bd51b156a API: Fix date format 2021-06-01 22:32:05 +00:00
Hypolite Petovan
6b374c01ce
Merge pull request #10356 from annando/fix-account-id 
Fix account id of notifications
 2021-06-01 18:24:34 -04:00
Michael
d3833f63e0 Fix account id of notifications 2021-06-01 22:00:12 +00:00
Hypolite Petovan
fc0d81d59a
Merge pull request #10355 from annando/follow-notifications 
Added notifications for follow requests
 2021-06-01 17:28:28 -04:00
Michael
842cbbaf09 Added notifications for follow requests 2021-06-01 21:13:16 +00:00
Hypolite Petovan
675dbbf9c0
Merge pull request #10350 from annando/api-notifications 
API: Show activity notifications
 2021-06-01 10:34:54 -04:00
Michael Vogel
babe2cea08
Merge pull request #10351 from tobiasd/20210601-hu 
HU translation updated THX Balázs Úr
 2021-06-01 16:29:33 +02:00
Michael
49459821be Renamed function 2021-06-01 14:23:12 +00:00
Tobias Diekershoff
4b4a060547 HU translation updated THX Balázs Úr 2021-06-01 14:43:39 +02:00
Michael
3f0937dd42 API: Show activity notifications 2021-06-01 05:51:03 +00:00
Michael Vogel
dad6561715
Merge pull request #10349 from tobiasd/20210501-ja 
updated JA translation THX daingewuvzeevisiddfddd
 2021-06-01 07:15:06 +02:00
Tobias Diekershoff
65442ac6ba updated JA translation THX daingewuvzeevisiddfddd 2021-06-01 06:08:35 +02:00
Hypolite Petovan
d99286640d
Merge pull request #10348 from annando/fix-diaspora-comment 
Fix commenting on mobile to Diaspora
 2021-05-31 19:27:53 -04:00
Michael Vogel
4564d167db
Merge pull request #10347 from MrPetovan/task/composer 
Update Composer and its dependencies ahead of the stable release
 2021-05-31 23:09:35 +02:00
Michael Vogel
8fa791073b
Merge pull request #10346 from MrPetovan/bug/notices 
Fix several notices
 2021-05-31 22:18:05 +02:00
Michael
58531a2748 Fix tests 2021-05-31 20:02:53 +00:00
Michael
be7a01f086 Fix commenting on mobile to Diaspora 2021-05-31 19:39:50 +00:00
Hypolite Petovan
04adab2fab Updated Composer dependencies ahead of the stable release 
- Updating psr/log (1.1.3 => 1.1.4)
- Updating monolog/monolog (1.26.0 => 1.26.1)
- Updating phpseclib/phpseclib (2.0.30 => 2.0.31)
- Updating npm-asset/jgrowl (1.4.6 => 1.4.8)
- Updating paragonie/sodium_compat (v1.14.0 => v1.16.1)
- Updating guzzlehttp/psr7 (1.8.1 => 1.8.2)
- Updating paragonie/certainty (v2.8.0 => v2.8.1)
 2021-05-31 09:14:10 -04:00
Hypolite Petovan
fcac4109a2 Update Composer binary to version 1.10.22 2021-05-31 09:10:34 -04:00
Hypolite Petovan
52cf924558 Check for post-type key existence in Model\Item::addVisualAttachments 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-844324800
 2021-05-31 08:29:50 -04:00
Hypolite Petovan
303c9d4a54 Check Content\Item::replaceTag return for false return value before using it 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835547443
- Remove unused code in Content\Item::replaceTag
 2021-05-31 08:29:50 -04:00
Hypolite Petovan
e42a9254c0 Ensure photo_return string is set in tagrm_content 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835546485
 2021-05-31 08:29:50 -04:00
Hypolite Petovan
57d5a47042 Ensure task parameters is an array with at least 1 element in update_1404() 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-827182936
 2021-05-31 08:29:50 -04:00
Hypolite Petovan
ff94b9a694 Check existence of $params['activity'] in notification() 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-752730033
 2021-05-31 08:29:49 -04:00
Philipp
f5da6f4ae3
Merge pull request #10345 from MrPetovan/bug/warnings 
Ensure nodeinfo-provided protocols are strings in Model\GServer::parseNodeinfo2
 2021-05-31 07:37:30 +02:00
Hypolite Petovan
302070875c Ensure nodeinfo-provided protocols are strings in Model\GServer::parseNodeinfo2 
- https://github.com/friendica/friendica/issues/10168#issuecomment-828281803
 2021-05-31 00:47:03 -04:00
Tobias Diekershoff
8bdfdc7d52
Merge pull request #10344 from nupplaphil/bug/friendica-10342 
Update avatar after user creation
 2021-05-30 21:24:25 +02:00
Philipp
bdc2cd000b
Update avatar after user creation 2021-05-30 20:47:21 +02:00
Philipp
c22b4d5d30
Merge pull request #10343 from tobiasd/20210530-lng 
DE, JA translation updates
 2021-05-30 19:43:56 +02:00
Tobias Diekershoff
4045f42ac3 updated JA translation THXdaingewuvzeevisiddfddd 2021-05-30 19:33:56 +02:00
Tobias Diekershoff
54e3a19cb9 DE translation update 2021-05-30 19:33:46 +02:00
Hypolite Petovan
4e0e7d7f3d
Merge pull request #10341 from annando/create-public-contact 
Ensure that the public contact exists when a user is created
 2021-05-30 09:45:56 -04:00
Michael
2df14fab3b Ensure that the public contact exists when a user is created 2021-05-30 12:04:26 +00:00
Hypolite Petovan
9b9449c03c
Merge pull request #10340 from annando/relevant-url 
Add relevant link after media links had been removed
 2021-05-30 07:50:43 -04:00
Hypolite Petovan
15581ba91f
Merge pull request #10338 from annando/issue-9923 
Issue 9923: Fix DB Error 1055
 2021-05-30 07:48:49 -04:00
Hypolite Petovan
1f694257d0
Merge pull request #10337 from nupplaphil/bug/friendica-9064 
Replace build.xml with mods/phpdoc-config.xml
 2021-05-30 07:46:56 -04:00
Michael
6f730bd671 Add relevant link after media links had been removed 2021-05-30 06:13:20 +00:00
Philipp
2258544237
Merge pull request #10339 from annando/warning 
Avoid warning "array_merge(): Expected parameter 2 to be an array, null given"
 2021-05-30 07:45:52 +02:00
Michael
c05c447d0f Avoid warning "array_merge(): Expected parameter 2 to be an array, null given" 2021-05-29 22:48:06 +00:00
Michael
4cdfcb5cfb Avoid DB Errors with "group by" 2021-05-29 21:51:33 +00:00
Michael
6c90005363 Issue 9923: Fix DB Error 1055 2021-05-29 21:28:40 +00:00