friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-18 22:26:42 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
28705 commits 2 branches 63 tags 241 MiB
Commit graph

28705 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 7252e0b37c
Merge pull request #9310 from annando/contact-posts 
Contact posts: Only display reshared posts when they are the causer
 2020-09-28 18:14:25 +02:00
Michael 0b1a97ca9c Contact posts: Only display reshared posts when they are the causer 2020-09-28 15:20:08 +00:00
Tobias Diekershoff 41b4d23853
Merge pull request #9309 from annando/reshare-info 
Improve resharer information
 2020-09-28 16:52:31 +02:00
Michael 415a3a7926 Remove an "if" 2020-09-28 14:13:14 +00:00
Michael 5cf369c026 Improve resharer information 2020-09-28 14:09:45 +00:00
Tobias Diekershoff 6ee8aa889c
Merge pull request #9308 from annando/duplicate-reshare 
Don't display a resharer that was the causer of the post
 2020-09-28 14:31:32 +02:00
Tobias Diekershoff 584383101a
Merge pull request #9307 from annando/notice 
Fix notice "Undefined index: accounttype"
 2020-09-28 14:30:01 +02:00
Michael 90e0cae84e Don't display a resharer that was the causer of the post 2020-09-28 11:36:47 +00:00
Michael 52e150551e Fix notice "Undefined index: accounttype" 2020-09-28 11:27:48 +00:00
Hypolite Petovan 178e506917
Merge pull request #9304 from annando/suggestions 
Functionality to add suggestions
 2020-09-27 17:16:29 -04:00
Michael Vogel 4733683e91
Update src/Model/FContact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-09-27 22:31:59 +02:00
Hypolite Petovan d9658f42e7
Merge pull request #9275 from nupplaphil/task/9235-issue_template 
Github issue templates
 2020-09-27 16:17:30 -04:00
Philipp Holzer 7ce12dbc41
Take bug templat from https://github.com/friendica/friendica/issues/9235#issue-704864632 2020-09-27 21:23:58 +02:00
Michael 61fee84c15 Functionality to add suggestions 2020-09-27 18:58:02 +00:00
Hypolite Petovan 62ed8de568
Merge pull request #9301 from tobiasd/20200927-frio-js 
added license hints to the Frio javascript files
 2020-09-27 14:02:58 -04:00
Tobias Diekershoff 225e86e437 Please add an EOF EOL 2020-09-27 20:00:06 +02:00
Hypolite Petovan 329c44be3f
Merge pull request #9302 from tobiasd/20200927-duepunto 
duepuntozero styling of the address in the vcard
 2020-09-27 13:55:06 -04:00
Tobias Diekershoff 66a6292dfc duepuntozero styling of the address in the vcard 2020-09-27 19:50:30 +02:00
Tobias Diekershoff 1e7d9fdcf6 added license hints to the Frio javascript files 2020-09-27 18:36:33 +02:00
Hypolite Petovan 7c5f3a9c96
Merge pull request #9300 from annando/simplified-uexport 
Simplified code in the uexport
 2020-09-27 10:36:55 -04:00
Hypolite Petovan 2260c0957a
Merge pull request #9299 from annando/avoid-duplicates 
Avoid duplicate postings
 2020-09-27 10:10:43 -04:00
Michael 7ca7bf2b35 Simplified code in the uexport 2020-09-27 14:08:41 +00:00
Michael a7f6775f45 Avoid duplicate postings 2020-09-27 13:23:59 +00:00
Tobias Diekershoff 96147d331b
Merge pull request #9293 from annando/issue-9288 
Issue 9288: Endless scrolling on the community page
 2020-09-27 14:26:52 +02:00
Tobias Diekershoff 9702b1d679
Merge pull request #9297 from annando/updates-used-public-contacts 
Only update public contacts that are in use
 2020-09-27 14:22:52 +02:00
Tobias Diekershoff c7ac1dc9c1
Merge pull request #9295 from annando/issue-9281 
Issue 9281: User export now exports data
 2020-09-27 14:20:48 +02:00
Michael 7a50ec4815 Only update public contacts that are in use 2020-09-27 11:55:31 +00:00
Michael 845ab4b764 Prevent empty fields on contact export via CSV 2020-09-27 10:27:31 +00:00
Michael 4ba42bc06a Issue 9281: User export now exports data 2020-09-27 10:24:15 +00:00
Tobias Diekershoff 31630099ff
Merge pull request #9294 from annando/tag-cache 
Tags: Use the parameters for the cache key
 2020-09-27 10:45:04 +02:00
Michael fd6e750e80 Tags: Use the parameters for the cache key 2020-09-27 08:11:43 +00:00
Michael 9586577c5a Restructured code 2020-09-27 05:46:07 +00:00
Michael 08016710d4 Unused code fragment removed 2020-09-27 05:31:39 +00:00
Michael de9cd9881c We don't seem to need the date formatting 2020-09-27 05:27:52 +00:00
Michael 55aa9c1cca Issue 9288: Endless scrolling on the community page 2020-09-27 05:25:32 +00:00
Hypolite Petovan 26d23a3ee3
Merge pull request #9292 from annando/infinite-rework 
Network page: reworked infinite scrolling
 2020-09-26 20:06:27 -04:00
Michael 3a94625470 "o" has to be initialized 2020-09-26 22:52:01 +00:00
Michael 79d5e3f6cb Network page: reworked infinite scrolling 2020-09-26 22:44:34 +00:00
Hypolite Petovan f75150795a
Merge pull request #9290 from annando/infinite-pageno 
Removing the page number from the infinite scrolling
 2020-09-26 18:05:03 -04:00
Michael 99fc97f337 Removing the page number from the infinite scrolling 2020-09-26 21:46:22 +00:00
Hypolite Petovan 831ea99bd6
Merge pull request #9289 from annando/fix-self 
Fix the key fields in the self contacts
 2020-09-26 17:41:12 -04:00
Michael 9c675c3f01 Fix the key fields in the self contacts 2020-09-26 20:59:28 +00:00
Hypolite Petovan f1830b84cd
Merge pull request #9287 from annando/fix-noscrape 
Fix: Noscrape hadn't always returned a key
 2020-09-26 16:26:45 -04:00
Michael Vogel 78b5be12a3 Fix: Noscrape hadn't always returned a key 2020-09-26 22:13:00 +02:00
Michael Vogel af10ed8a15
Merge pull request #9274 from MrPetovan/bug/parse-url-charset 
Restrict character class for charset capture in Util\ParseUrl
 2020-09-26 21:43:14 +02:00
Hypolite Petovan 014f95538c
Merge pull request #9285 from annando/hide-sharer 
We now have a sidebar on the community page to hide own contacts
 2020-09-26 15:40:27 -04:00
Michael 3efbf1beb7 Fix notice 2020-09-26 18:59:31 +00:00
Michael 3aa255c6a1 Updated messages 2020-09-26 18:40:27 +00:00
Michael 3553b564b4 Template now collapses 2020-09-26 18:34:55 +00:00
Michael 4a40a40ed1 Merge remote-tracking branch 'upstream/develop' into hide-sharer 2020-09-26 18:05:15 +00:00