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

26724 Commits

Author SHA1 Message Date
Hypolite Petovan d9c817df1a Update documentation in bin/auth_ejabberd 2020-03-29 12:46:16 -04:00
Tobias Diekershoff 8eaab2cecb
Merge pull request #8465 from AlfredSK/AlfredSK-dont_mention_multiprofiles 
Remove multi profile mention in settings
 2020-03-29 14:35:50 +02:00
Michael Vogel 11f38ee303
Merge pull request #8466 from annando/internal-psid 
Should fix the unknown "internal-psid" field
 2020-03-29 14:31:44 +02:00
Michael e17e385c41 Fix: Queries with empty selections hadn't worked anymore 2020-03-29 12:29:57 +00:00
Michael 979199c442 Should fix the unknown "internal-psid" field 2020-03-29 11:16:40 +00:00
Steffen K9 6ea9c1764c
remove default from match.php 2020-03-29 11:37:23 +02:00
Steffen K9 154109f9ee
remove default from welcome.php 2020-03-29 11:36:04 +02:00
Steffen K9 0ddda6160b
Remove multi profile mention in settings 
Remove multi/default profile mention in settings privacy.
 2020-03-29 11:17:08 +02:00
Tobias Diekershoff cb1696bfaf
Merge pull request #8464 from annando/notice 
Fixes two notices
 2020-03-29 08:37:57 +02:00
Hypolite Petovan 1d8bb726d6
Merge pull request #8462 from annando/issue-8254-3 
Issue 8254: Some more fixes for too long data for columns
 2020-03-29 00:32:03 -04:00
Hypolite Petovan 9fd23c407b
Merge pull request #8463 from annando/issue-8299 
Issue 8299: Don't manipulate DFRN content upon receiving
 2020-03-28 23:18:44 -04:00
Michael Vogel 1194f9a58c (hopefully) Fixes "Undefined index: internal-psid" 2020-03-28 23:11:57 +01:00
Michael Vogel 3ca88f53ec Fixes "Undefined index: object" 2020-03-28 22:37:03 +01:00
Michael Vogel 01d6bfd2dd Issue 8299: Don't manipulate DFRN content upon receiving 2020-03-28 20:41:25 +01:00
Michael 2ba4333f70 Exchange "part" with "fragment" 2020-03-28 15:18:12 +00:00
Michael 3761e9ee51 Issue 8254: Some more fixes for too long data for columns 2020-03-28 15:14:40 +00:00
Tobias Diekershoff 66fe39f175
Merge pull request #8461 from annando/issue-8341 
Issue 8341: Make events sharable
 2020-03-28 15:30:43 +01:00
Michael b5cdd78523 Issue 8341: Make events sharable 2020-03-28 14:02:49 +00:00
Tobias Diekershoff b791966f93
Merge pull request #8459 from annando/ap-loop 
Prevent another endless loop while fetching AP items
 2020-03-28 14:06:19 +01:00
Michael cc913bcf7c Prevent another endless loop while fetching AP items 2020-03-28 10:34:23 +00:00
Hypolite Petovan 8a4a65f418
Merge pull request #8456 from annando/fix-ap 
Fix: Fetching content via the "objects" endpoint behaved wrong
 2020-03-26 08:45:10 -04:00
Hypolite Petovan b139e3477a
Merge pull request #8455 from annando/issue-8254-2 
Issue 8254 More length shortenings
 2020-03-26 08:29:26 -04:00
Michael Vogel fcb0fa4cfa Fix: Fetching content via the "objects" endpoint behaved wrong 2020-03-26 07:52:48 +01:00
Michael 6f22e3909b Issue 8254 More length shortenings 2020-03-25 23:18:07 +00:00
Hypolite Petovan 85b0b676c1
Merge pull request #8454 from annando/issue-7892 
Issue 7892: Improve "plink" generation for Diaspora posts
 2020-03-25 14:53:37 -04:00
Michael 52e6f97b61 Removed wrong comment 2020-03-25 18:27:35 +00:00
Michael 1e9d793d74 Socialhome added 2020-03-25 17:25:23 +00:00
Michael 6249b674dc Issue 7892: Improve "plink" generation for Diaspora posts 2020-03-25 16:42:53 +00:00
Tobias Diekershoff 37f0cb0697
Merge pull request #8429 from tobiasd/2020.03-credits 
updated the credits for 2020.03
 2020-03-25 12:07:55 +01:00
Tobias Diekershoff e4dbc09601
Merge pull request #8452 from annando/issue-8254 
Issue 8254: Length restriction for "title" and "uri"
 2020-03-25 12:07:26 +01:00
Tobias Diekershoff 41e336ffcb
Merge pull request #8453 from annando/notice 
OStatus: Avoid a notice
 2020-03-25 12:06:04 +01:00
Michael b36e0e58b7 OStatus: Avoid a notice 2020-03-25 07:29:47 +00:00
Michael 0486050d96 Issue 8254: Length restriction for "title" and "uri" 2020-03-25 07:07:34 +00:00
Hypolite Petovan 9604efae83
Merge pull request #8451 from annando/issue-7771-funkwhale 
Issue 7771: Funkwhale support
 2020-03-24 20:52:07 -04:00
Michael Vogel cda9883916
Merge pull request #8450 from MrPetovan/bug/8449-public-override 
Enable visibility request parameter to override default user permissions in mod/item
 2020-03-25 00:32:13 +01:00
Michael 1fef1ef6e9 Issue 7771: Funkwhale support 2020-03-24 23:12:53 +00:00
Hypolite Petovan 7fabafdce6 Enable visibility request parameter to override default user permissions in mod/item 2020-03-24 16:34:19 -04:00
Hypolite Petovan 8e8f97cce1
Merge pull request #8448 from tobiasd/20200323-nl 
NL translation update THX Casper
 2020-03-23 14:20:18 -04:00
Tobias Diekershoff 20f6948541 NL translation update THX Casper 2020-03-23 18:55:14 +01:00
Tobias Diekershoff 103769f4c2
Merge pull request #8447 from annando/issue-7771-funkwhale 
Funkwhale support added, Peertube support improved
 2020-03-23 06:44:18 +01:00
Michael Vogel d0a022c1f9
Merge pull request #8446 from MrPetovan/bug/notices 
Skip Contact::getDetailsByURL when url is empty in GContact::searchByName
 2020-03-23 06:04:22 +01:00
Michael 50e0ea5b3e Funkwhale support added, Peertube support improved 2020-03-23 04:43:06 +00:00
Hypolite Petovan 1187742c14 Skip Contact::getDetailsByURL when url is empty in GContact::searchByName 
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-602169147
 2020-03-22 22:46:22 -04:00
Hypolite Petovan 3b3085369c
Merge pull request #8443 from annando/loops 
Prevent endless loops and long running feed processing
 2020-03-22 11:26:13 -04:00
Michael 771fe881ef Use 20 maximum feed items as default 2020-03-22 15:22:48 +00:00
Michael 04eef79be0 Merge remote-tracking branch 'upstream/2020.03-rc' into loops 2020-03-22 15:00:14 +00:00
Michael Vogel 3a2082b840
Merge pull request #8444 from MrPetovan/bug/7134-remove-item-activity-relation 
Remove extraneous relation on item-activity.id
 2020-03-22 15:31:49 +01:00
Hypolite Petovan f2638ca65b Remove extraneous relation on item-content.id 2020-03-22 10:28:13 -04:00
Hypolite Petovan bfa598bb77
Merge pull request #8445 from annando/issue-8371-again 
Issue 8371: Use correct user id for photo upload
 2020-03-22 10:24:51 -04:00
Michael 8bde222fca Issue 8371: Use correct user id for photo upload 2020-03-22 14:07:34 +00:00