friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
36,501 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

36501 Commits

Author SHA1 Message Date
Michael 64a8ad6601 Fix variable name 2023-02-14 20:43:54 +00:00
Michael Vogel d3acdd3229
Merge pull request #12791 from HankG/mastodon-notifications-api-fixes 
Mastodon notifications api fixes
 2023-02-14 01:02:28 +01:00
Michael 41f6e72aa0 Some more standards 2023-02-13 23:57:39 +00:00
Michael c643eb8cb2 Fix more standards 2023-02-13 23:53:43 +00:00
Michael 2367f54d41 Soem more C2S stuff moved 2023-02-13 23:49:08 +00:00
Michael 12be32249b Merge remote-tracking branch 'upstream/develop' into c2s-post 2023-02-13 23:37:40 +00:00
Michael Vogel 5e84fc849b
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-02-14 00:34:47 +01:00
Hank Grabowski e384a9d6ca Automatic PHPCBF style fix 2023-02-13 17:27:06 -05:00
Hank Grabowski 7e91a88d9b Add unsupported Friendica notification types to built query 2023-02-13 17:26:24 -05:00
Hypolite Petovan 262f960120
Merge pull request #12789 from nupplaphil/bug/flasky_test 
[tests] Fix flaky tests
 2023-02-13 17:06:26 -05:00
Michael 8fe6419d39 New class for c2s activities 2023-02-13 21:27:11 +00:00
Hank Grabowski 8bfca6373a Remove extraneous, unused, non-standard 'count' parameter from request list 
- artifact of when I was playing around with the endpoint that somehow
    didn't get deleted when I did the ultimate commit.
 2023-02-13 15:13:17 -05:00
Philipp Holzer 1e4ed3d5a1
revert api.fixture.php change 2023-02-13 21:06:02 +01:00
Philipp Holzer 51ab7f4fcb
code review 2023-02-13 20:56:19 +01:00
Philipp Holzer e1813e3d73
Restructure tests 
- Avoid database leftovers
 2023-02-13 20:52:24 +01:00
Michael 7b871f3ecd Merge remote-tracking branch 'upstream/develop' into c2s-post 2023-02-13 19:20:18 +00:00
Philipp Holzer 704508fc65
Remove flasky testpart 2023-02-13 19:24:01 +01:00
Michael b02e48e9c3 Split C2S activity 2023-02-13 15:32:14 +00:00
Hypolite Petovan b168ff3e17
Merge pull request #12772 from nupplaphil/feat/config_hybrid 
Revert node.config.php into Config table
 2023-02-13 08:16:29 -05:00
Michael a7b3949ca0 Added documentation 2023-02-13 11:57:02 +00:00
Philipp Holzer 3894b6fa41
Fix logic 2023-02-13 11:34:32 +01:00
Philipp Holzer 3db2778fcd
remove unnecessary comments 2023-02-13 11:32:10 +01:00
Michael 2c41ebbfaa passing the return value 2023-02-13 06:27:45 +00:00
Philipp Holzer 2bc9f085df
Add docs 2023-02-12 23:54:11 +01:00
Philipp Holzer 9b095f475b
add license header ;) 2023-02-12 17:09:06 +01:00
Philipp Holzer 4dc164a5a1
manually check and create the Config table before running the update 2023-02-12 16:44:56 +01:00
Philipp Holzer aeb3c7e96c
don't try to use the Config table if it doesn't exist 2023-02-12 16:23:51 +01:00
Philipp Holzer a9c0636573
remove maybeSerialize (always serialize) 2023-02-12 15:48:41 +01:00
Philipp Holzer 8881882bce
another phpunit optimiziation .. 2023-02-12 15:41:25 +01:00
Michael edb1ce0417 C2S: Posting is now possible 2023-02-12 14:18:03 +00:00
Philipp Holzer 4d6c8241fc
Optimize phpunit 2023-02-12 14:57:55 +01:00
Philipp Holzer 3edc5553c6
use own local.config.php for CI 2023-02-12 14:38:43 +01:00
Philipp Holzer 0d41752cfe
Update messages.po 2023-02-12 13:38:10 +01:00
Philipp Holzer 553c909195
adapt update script 2023-02-12 13:38:02 +01:00
Philipp Holzer ab281d5190
Fix dba cache 2023-02-12 13:23:39 +01:00
Philipp Holzer 2d090f0d80
adhere php-cs 2023-02-12 13:17:55 +01:00
Philipp Holzer a153c3f594
Fix and adapt tests 2023-02-12 13:09:14 +01:00
Philipp Holzer ad284208ee
Fix and adapt tests 2023-02-12 13:09:05 +01:00
Philipp Holzer 23742c22c3
suppress E_WARNING at tests with vfs:// 2023-02-12 11:41:20 +01:00
Philipp Holzer 7895024e75
add license 2023-02-10 14:54:17 +01:00
Hypolite Petovan 02f6d0e5f9
Merge pull request #12784 from annando/redirect-root 
Redirect AP requests to the root to the system actor
 2023-02-10 08:10:36 -05:00
Philipp Holzer 513ef03421
Revert node.config.php into Config table 2023-02-10 14:06:22 +01:00
Philipp Holzer 6db89adc04
Re-Add Config table 2023-02-10 14:06:22 +01:00
Philipp Holzer 98857f8d7a
Add exception if lock wasn't successful 2023-02-10 14:06:21 +01:00
Michael 6eadbb35dc Redirect AP requests to the root to the system actor 2023-02-10 10:29:35 +00:00
Hypolite Petovan ffa44b8dc0
Merge pull request #12782 from annando/c2s-2 
C2S: Improve C2S-API, fix inbox endpoint
 2023-02-08 15:30:00 -05:00
Michael 5fdeed8ed8 C2S: Improve C2S-API, fix inbox endpoint 2023-02-08 20:16:19 +00:00
Philipp 881b32425d
Merge pull request #12774 from MrPetovan/bug/albumname-xss 
[frio] Fix XSS vulneralibity in Justified-Gallery Javascript dependency
 2023-02-08 15:56:36 +01:00
Michael Vogel 3aa7b338b8
Merge pull request #12781 from MrPetovan/bug/12779-security-txt 
Switch date format to RFC 3339 in security.txt
 2023-02-08 15:25:10 +01:00
Hypolite Petovan 1c7e129f3b Switch date format to RFC 3339 in security.txt 2023-02-08 08:35:06 -05:00