Michael
8c23fea1df
Added some explanation, beautified code
2018-04-26 21:16:16 +00:00
Michael
a785d8c2f9
Merge remote-tracking branch 'upstream/develop' into reworked-delivery
2018-04-26 20:42:57 +00:00
Michael
4957ab8fbb
Avoid PHP warning with a missing key
2018-04-26 20:41:06 +00:00
Hypolite Petovan
33a551235e
Merge pull request #4934 from annando/distribute-precaution
...
Item distribution: Better don't store these values
2018-04-26 16:26:23 -04:00
Michael
4a792761d1
Item distribution: Better don't store these values
2018-04-26 20:11:29 +00:00
Hypolite Petovan
9e700ba6ea
Merge pull request #4933 from annando/bugfix-distribute
...
Bugfix: The Distribition of public items failed with comments
2018-04-26 16:02:56 -04:00
Michael
da3658c80d
Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
2018-04-26 19:47:12 +00:00
Hypolite Petovan
f7f640175a
Fix PHP 7.2 warning in Model\Profile
2018-04-26 04:56:42 -04:00
Michael
a0c5a84ce8
Better way to fetch items
2018-04-26 07:11:18 +00:00
Michael
b70b020490
Unneeded stuff removed, only fetch needed records
2018-04-26 06:23:01 +00:00
Michael
71d4c6e4a0
Cleaned up
2018-04-26 05:45:05 +00:00
Michael
c437dac3a0
Delivery to non followers
2018-04-25 21:55:24 +00:00
Michael
3abd0b54cc
Reworked delivery
2018-04-25 21:18:21 +00:00
Hypolite Petovan
a9f1f47be2
Merge pull request #4931 from annando/no-ignored
...
Don't distribute for ignored contacts
2018-04-25 12:07:00 -04:00
Michael
66547e5107
Don't distribute for ignored contacts
2018-04-25 16:00:21 +00:00
Michael
ad45a73bf3
Improvements for the Diaspora protocol
2018-04-24 18:34:35 +00:00
Michael
5019d46071
We only need the uid
2018-04-24 14:58:39 +00:00
Michael
5cf745af44
Item distribution is now done via the public post
2018-04-24 13:21:25 +00:00
Michael
7230cc0bed
Merge remote-tracking branch 'upstream/develop' into item-distribution
2018-04-24 04:23:38 +00:00
Tobias Diekershoff
e51a017d92
Merge pull request #4917 from annando/show-private-forums
...
Show private forums in the sidebar
2018-04-23 18:47:21 +02:00
Michael
c3ee596ff4
Show private forums in the sidebar
2018-04-23 16:41:00 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
...
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
Michael
ba35b19af6
Public federated items now always are having an entry with "uid=0"
2018-04-23 11:14:25 +00:00
Hypolite Petovan
a25c07b162
Merge pull request #4912 from annando/archivecontacts
...
Added console command to manually archive contacts
2018-04-23 02:07:53 -04:00
Michael
b3d24f0ff2
DFRN: mark for archival at different places
2018-04-23 06:03:55 +00:00
Michael
866fbb4d80
Added console command to manually archive contacts
2018-04-23 05:33:47 +00:00
Hypolite Petovan
00985fe340
Fix self warning in Util\Temporal
2018-04-23 00:03:27 -04:00
Hypolite Petovan
9b052b5ea8
Fix count() warning in Object\Post
2018-04-23 00:02:18 -04:00
Hypolite Petovan
b0564ea40d
Fix count() warning in Model\Profile
...
- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization
2018-04-23 00:01:46 -04:00
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext
...
Guess language from plaintext
2018-04-23 00:26:05 +02:00
Friendica
390983a331
Haromonize Find People Widget.
...
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
2018-04-22 20:44:22 +00:00
Hypolite Petovan
d977ff78df
Uncomment some code in ItemContent::getPlaintextPost
...
- I have no idea what I'm doing
2018-04-22 11:43:27 -04:00
Michael Vogel
6e9ed3f01b
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence
...
Only show event reminders of events attendyes or attendmaybe
2018-04-22 17:38:32 +02:00
Hypolite Petovan
82ed6fff9f
Use public_contact() instead of wrong query in Profile::getEventsReminderHTML
2018-04-22 11:29:55 -04:00
Michael
8f2db61538
Receiving of public posts is now working
2018-04-22 10:58:03 +00:00
Michael
c59b28a8c4
create public endpoint
2018-04-22 10:04:30 +00:00
Hypolite Petovan
e0b33b36a2
Decrease scope of query in Profile::getEventsReminderHTML
...
- Use specific SELECT fields
- Use INNER JOIN
2018-04-22 04:41:53 -04:00
Michael Vogel
25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete
...
Prevent infinite loop when a dbstructure_definition hook is orphan
2018-04-22 07:55:39 +02:00
Michael Vogel
39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
...
Fix quoting style in DFRN::birthdayEvent()
2018-04-22 07:54:07 +02:00
Hypolite Petovan
08afec3170
Only show event reminders of events attendyes or attendmaybe
2018-04-21 22:53:13 -04:00
Hypolite Petovan
851c5d841f
Fix quoting style in DFRN::birthdayEvent()
2018-04-21 21:03:12 -04:00
Hypolite Petovan
6d88984ee5
Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost
2018-04-21 20:50:13 -04:00
Hypolite Petovan
18078ce7a4
Prevent infinite loop when a dbstructure_definition hook is orphan
...
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
2018-04-21 20:34:07 -04:00
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux
...
Better working with private forums
2018-04-21 18:19:27 -04:00
Michael
16beab4652
Better working with private forums
2018-04-21 21:59:02 +00:00
Tobias Diekershoff
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic"
2018-04-21 16:28:22 +02:00
Philipp Holzer
334d392154
Merge remote-tracking branch 'origin/develop' into install_config
2018-04-21 14:23:49 +02:00
Philipp Holzer
346697d771
Moved .htconfig file
...
Extracted install business functions to new Class `Install.php`
2018-04-21 14:10:53 +02:00
Tobias Diekershoff
ebe203336f
Merge pull request #4882 from annando/private-forums
...
Contact requests from Diaspora for private forums aren't accepted automatically anymore
2018-04-21 13:54:10 +02:00
Michael
fd7658a70a
Contact requests from Diaspora for private forums aren't accepted automatically anymore
2018-04-21 10:39:46 +00:00
