friendica/friendica
6
2
Fork 1
mirror of https://github.com/friendica/friendica synced 2026-01-19 06:08:39 +01:00
Code Issues Projects Releases 3 Packages Wiki Activity
35,474 commits 3 branches 67 tags 228 MiB
Commit graph

35,474 commits

This branch
This branch
All branches
Author SHA1 Message Date
MarekBenjamin
3cf0b9b9fd
 		Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Hypolite Petovan
24e4dfa541
 		Merge pull request #12293 from annando/report-status 
Added status to the report
 2022-11-29 15:01:57 -05:00
Michael
8eca961aeb Added status to the report 2022-11-29 19:50:12 +00:00
Michael Vogel
dddf17b5c5
 		Merge pull request #12290 from MrPetovan/bug/frio-contact-follow 
[frio] Add page wrapper to contact follow page
 2022-11-29 19:59:10 +01:00
Hypolite Petovan
ebe512edfd
 		Merge pull request #12292 from annando/api-speed 
API: Speed improvements
 2022-11-29 13:55:33 -05:00
Michael
8b41d62a88 API: Speed improvements 2022-11-29 18:45:30 +00:00
Hypolite Petovan
c0c414ab95 [frio] Add page wrapper to contact follow page 2022-11-29 06:37:41 -05:00
Marek Bachmann
77c68d10e8 Merge branch 'develop' into show_image_upload_limit 2022-11-29 00:28:05 +01:00
Hypolite Petovan
624231c665
 		Merge pull request #12289 from annando/fatal 
Fix fatal errors because of unknown function/variable names
 2022-11-28 16:46:19 -05:00
Michael
3288efb323 Fix fatal errors because of unknown function/variable names 2022-11-28 21:22:21 +00:00
Hypolite Petovan
0ba111d99c
 		Merge pull request #12288 from annando/api-tags 
API: Added trending links
 2022-11-28 16:13:37 -05:00
Michael Vogel
7898f9cccb
 		Update src/Module/Api/Mastodon/Trends/Links.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 21:42:34 +01:00
Michael
437419bbd9 Updated database.sql 2022-11-28 20:22:08 +00:00
Michael
de76e860ad API: Added trending links 2022-11-28 20:19:57 +00:00
Hypolite Petovan
d6a7303991
 		Merge pull request #12283 from annando/api-tags 
Issue 12191: API tag handling
 2022-11-28 14:52:29 -05:00
Hypolite Petovan
1ec4c14501
 		Merge pull request #12287 from nupplaphil/bug/fix_router 
Fix Legacy Router class routing
 2022-11-28 14:52:01 -05:00
Michael
e391328cbf Added changelog entry 2022-11-28 19:31:04 +00:00
Philipp
de25d3a7ee
 		Fix Legacy Router class routing 2022-11-28 20:14:37 +01:00
Michael
bded1c3989 Only use items that had originally been posted in the last week 2022-11-28 14:51:37 +00:00
Michael
0e160040d4 Code standards 2022-11-28 10:54:26 +00:00
MarekBenjamin
bfe220c344
 		Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-28 10:53:50 +01:00
Michael
c00004f6ea API: Tredning statuses added 2022-11-28 09:30:41 +00:00
Philipp
5e7e2b65b2
 		Merge pull request #12284 from tobiasd/20221128-de 
DE translation update THX  MarekBenjamin
 2022-11-28 08:12:53 +01:00
Michael
6b36bd893b API: Trending tags are added 2022-11-28 07:08:01 +00:00
Michael
73ba7d8005 Coding styles 2022-11-28 06:52:55 +00:00
Michael
a7639a2341 Updated documentation 2022-11-28 06:46:18 +00:00
Tobias Diekershoff
3092975523 DE translation update THX MarekBenjamin 2022-11-28 07:00:11 +01:00
Michael
f7167acc74 Standards 2022-11-28 04:07:25 +00:00
Michael
56c4727fe1 Merge branch 'api-tags' of github.com:annando/friendica into api-tags 2022-11-28 04:04:35 +00:00
Michael
934766c364 Trim the tag 2022-11-28 04:04:27 +00:00
Michael Vogel
4e6b6fd76b
 		Update src/Module/Api/Mastodon/FollowedTags.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 05:00:08 +01:00
Michael
85f57e69fa Issue 12191: We can now follow and unfollow tags via API 2022-11-28 03:29:43 +00:00
Michael
a6d060b0e4 Merge remote-tracking branch 'upstream/develop' into api-tags 2022-11-28 02:13:20 +00:00
Marek Bachmann
361908ce3b and the messages.po 2022-11-28 01:23:00 +01:00
Marek Bachmann
d43e393921 and now the missing ')' at the correct position 2022-11-28 01:16:54 +01:00
Marek Bachmann
5b2ac7b944 Added missing ')' 2022-11-28 01:11:02 +01:00
MarekBenjamin
6877f8a473
 		Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 01:06:40 +01:00
Marek Bachmann
6ebf0f860b messages.po 2022-11-27 23:53:34 +01:00
Marek Bachmann
a01872a117 Merge branch 'develop' into show_image_upload_limit 
# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
 2022-11-27 23:52:58 +01:00
Philipp
a60467ed78
 		Merge pull request #12281 from annando/issue-12149 
Issue 12149: Show that a post was reshared
 2022-11-27 22:11:17 +01:00
Michael
6d74d74a26 Issue 12149: Show that a post was reshared 2022-11-27 20:47:08 +00:00
Michael
0e2c2cd0e0 API: Support new tag endpoints 2022-11-27 19:22:41 +00:00
Philipp
4c64c6ed98
 		Merge pull request #12279 from MrPetovan/bug/12273-api-search-exact-results 
Return only one result in case of exact match in Api\Mastodon\Search
 2022-11-27 15:15:59 +01:00
Hypolite Petovan
db987999b5 Return only one result in case of exact match in Api\Mastodon\Search 2022-11-27 08:28:52 -05:00
Hypolite Petovan
9fbdcb5459
 		Merge pull request #12277 from nupplaphil/mod/fbrowser 
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser
 2022-11-27 07:55:55 -05:00
Philipp
b56e6f4b5b
 		Merge pull request #12280 from MrPetovan/bug/11804-delete-notifications-item 
Remove related notifications when marking an item for deletion
 2022-11-27 09:01:28 +01:00
Hypolite Petovan
25e1412174 Remove related notifications when marking an item for deletion 2022-11-26 21:48:26 -05:00
Philipp
3ac3b3d2af
 		Perfection! 2022-11-27 01:52:49 +01:00
Philipp
272911527c
 		Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:52:14 +01:00
Philipp
4e53ba0c20
 		Cache the Module class 2022-11-27 01:48:52 +01:00