]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoBetter way to fetch items
Michael [Thu, 26 Apr 2018 07:11:18 +0000 (07:11 +0000)]
Better way to fetch items

6 years agoUnneeded stuff removed, only fetch needed records
Michael [Thu, 26 Apr 2018 06:23:01 +0000 (06:23 +0000)]
Unneeded stuff removed, only fetch needed records

6 years agoCleaned up
Michael [Thu, 26 Apr 2018 05:45:05 +0000 (05:45 +0000)]
Cleaned up

6 years agoDelivery to non followers
Michael [Wed, 25 Apr 2018 21:55:24 +0000 (21:55 +0000)]
Delivery to non followers

6 years agoReworked delivery
Michael [Wed, 25 Apr 2018 21:18:21 +0000 (21:18 +0000)]
Reworked delivery

6 years agoMerge pull request #4929 from annando/diaspora-rework
Hypolite Petovan [Tue, 24 Apr 2018 18:56:35 +0000 (14:56 -0400)]
Merge pull request #4929 from annando/diaspora-rework

Improvements for the Diaspora protocol

6 years agoImprovements for the Diaspora protocol
Michael [Tue, 24 Apr 2018 18:34:35 +0000 (18:34 +0000)]
Improvements for the Diaspora protocol

6 years agoMerge pull request #4925 from rabuzarus/20180424_-_frio_invite_template
Hypolite Petovan [Tue, 24 Apr 2018 15:37:10 +0000 (11:37 -0400)]
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template

frio - provide a template for invite page

6 years agofrio - provide a template for invite page
rabuzarus [Tue, 24 Apr 2018 15:33:48 +0000 (17:33 +0200)]
frio - provide a template for invite page

6 years agoMerge pull request #4924 from annando/item-distribution
Hypolite Petovan [Tue, 24 Apr 2018 15:00:14 +0000 (11:00 -0400)]
Merge pull request #4924 from annando/item-distribution

Item distribution is now done via the public post

6 years agoWe only need the uid
Michael [Tue, 24 Apr 2018 14:58:39 +0000 (14:58 +0000)]
We only need the uid

6 years agoItem distribution is now done via the public post
Michael [Tue, 24 Apr 2018 13:21:25 +0000 (13:21 +0000)]
Item distribution is now done via the public post

6 years agoMerge pull request #4922 from tobiasd/20180424-lng
Michael Vogel [Tue, 24 Apr 2018 08:03:04 +0000 (10:03 +0200)]
Merge pull request #4922 from tobiasd/20180424-lng

update FI translations THX Kris

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Tue, 24 Apr 2018 05:58:31 +0000 (07:58 +0200)]
update FI translations THX Kris

6 years agoMerge remote-tracking branch 'upstream/develop' into item-distribution
Michael [Tue, 24 Apr 2018 04:23:38 +0000 (04:23 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-distribution

6 years agoMerge pull request #4917 from annando/show-private-forums
Tobias Diekershoff [Mon, 23 Apr 2018 16:47:21 +0000 (18:47 +0200)]
Merge pull request #4917 from annando/show-private-forums

Show private forums in the sidebar

6 years agoShow private forums in the sidebar
Michael [Mon, 23 Apr 2018 16:41:00 +0000 (16:41 +0000)]
Show private forums in the sidebar

6 years agoMerge pull request #4873 from astifter/develop
Hypolite Petovan [Mon, 23 Apr 2018 14:23:21 +0000 (10:23 -0400)]
Merge pull request #4873 from astifter/develop

Remove pagination when empty, move new Member Tips and use common widget to find people.

6 years agoMerge pull request #4913 from tobiasd/20180423-phpunit
Hypolite Petovan [Mon, 23 Apr 2018 12:00:13 +0000 (08:00 -0400)]
Merge pull request #4913 from tobiasd/20180423-phpunit

phpunit compat 5.6 vs 7.x

6 years agoMerge pull request #4916 from M-arcus/patch-5
Tobias Diekershoff [Mon, 23 Apr 2018 11:49:24 +0000 (13:49 +0200)]
Merge pull request #4916 from M-arcus/patch-5

[DOCS] Installation: Fix small errors

6 years agoPublic federated items now always are having an entry with "uid=0"
Michael [Mon, 23 Apr 2018 11:14:25 +0000 (11:14 +0000)]
Public federated items now always are having an entry with "uid=0"

6 years ago[DOCS] Installation: Fix multiple sentences
Marcus Müller [Mon, 23 Apr 2018 10:24:47 +0000 (12:24 +0200)]
[DOCS] Installation: Fix multiple sentences

6 years ago[DOCS] Installation: Fix title
Marcus Müller [Mon, 23 Apr 2018 10:22:39 +0000 (12:22 +0200)]
[DOCS] Installation: Fix title

6 years agoMerge pull request #4914 from AndyHee/doc20180423
Tobias Diekershoff [Mon, 23 Apr 2018 10:03:28 +0000 (12:03 +0200)]
Merge pull request #4914 from AndyHee/doc20180423

Update Profiles.md

6 years agoUpdate Profiles.md
Andy H3 [Mon, 23 Apr 2018 09:43:52 +0000 (16:43 +0700)]
Update Profiles.md

6 years agouse strlen instead of count(php7.2 fails)
Tobias Diekershoff [Mon, 23 Apr 2018 07:37:56 +0000 (09:37 +0200)]
use strlen instead of count(php7.2 fails)

6 years agoremove comment
Tobias Diekershoff [Mon, 23 Apr 2018 07:37:06 +0000 (09:37 +0200)]
remove comment

6 years agouse strlen instead of count as above (php7.2 fails)
Tobias Diekershoff [Mon, 23 Apr 2018 07:35:12 +0000 (09:35 +0200)]
use strlen instead of count as above (php7.2 fails)

6 years agothere are more then 1 test ATM
Tobias Diekershoff [Mon, 23 Apr 2018 06:53:46 +0000 (08:53 +0200)]
there are more then 1 test ATM

6 years agocomment out use clause
Tobias Diekershoff [Mon, 23 Apr 2018 06:47:42 +0000 (08:47 +0200)]
comment out use clause

6 years agophpunit compat 5.6 vs 7.x
Tobias Diekershoff [Mon, 23 Apr 2018 06:42:13 +0000 (08:42 +0200)]
phpunit compat 5.6 vs 7.x

6 years agoMerge pull request #4912 from annando/archivecontacts
Hypolite Petovan [Mon, 23 Apr 2018 06:07:53 +0000 (02:07 -0400)]
Merge pull request #4912 from annando/archivecontacts

Added console command to manually archive contacts

6 years agoDFRN: mark for archival at different places
Michael [Mon, 23 Apr 2018 06:03:55 +0000 (06:03 +0000)]
DFRN: mark for archival at different places

6 years agoMerge pull request #4911 from tobiasd/20180423-travis
Hypolite Petovan [Mon, 23 Apr 2018 05:49:16 +0000 (01:49 -0400)]
Merge pull request #4911 from tobiasd/20180423-travis

travis indentation

6 years agotravix indentation
Tobias Diekershoff [Mon, 23 Apr 2018 05:42:48 +0000 (07:42 +0200)]
travix indentation

6 years agoAdded console command to manually archive contacts
Michael [Mon, 23 Apr 2018 05:33:47 +0000 (05:33 +0000)]
Added console command to manually archive contacts

6 years agoMerge pull request #4910 from tobiasd/20180423-lng
Hypolite Petovan [Mon, 23 Apr 2018 05:32:15 +0000 (01:32 -0400)]
Merge pull request #4910 from tobiasd/20180423-lng

translation updates DE and FI

6 years agoupdate DE translations
Tobias Diekershoff [Mon, 23 Apr 2018 05:13:10 +0000 (07:13 +0200)]
update DE translations

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Mon, 23 Apr 2018 05:13:02 +0000 (07:13 +0200)]
update FI translations THX Kris

6 years agoMerge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings
Michael Vogel [Mon, 23 Apr 2018 04:50:21 +0000 (06:50 +0200)]
Merge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings

Fix PHP 7.2 warnings

6 years agoFix self warning in Util\Temporal
Hypolite Petovan [Mon, 23 Apr 2018 04:03:27 +0000 (00:03 -0400)]
Fix self warning in Util\Temporal

6 years agoFix count() warning in Object\Post
Hypolite Petovan [Mon, 23 Apr 2018 04:02:18 +0000 (00:02 -0400)]
Fix count() warning in Object\Post

6 years agoFix count() warning in Model\Profile
Hypolite Petovan [Mon, 23 Apr 2018 04:01:46 +0000 (00:01 -0400)]
Fix count() warning in Model\Profile

- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization

6 years agoFix count() warning in mod/friendica
Hypolite Petovan [Mon, 23 Apr 2018 04:00:29 +0000 (00:00 -0400)]
Fix count() warning in mod/friendica

- Add default value for Config call

6 years agoFix count() warning in include/dba.php
Hypolite Petovan [Mon, 23 Apr 2018 04:00:06 +0000 (00:00 -0400)]
Fix count() warning in include/dba.php

6 years agoMerge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates
Michael Vogel [Sun, 22 Apr 2018 22:32:52 +0000 (00:32 +0200)]
Merge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates

frio - Bugfix - there was a wrong user count in admin-users template

6 years agoMerge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext
Michael Vogel [Sun, 22 Apr 2018 22:26:05 +0000 (00:26 +0200)]
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext

Guess language from plaintext

6 years agofrio - Bugfix - there was a wrong user count in admin-users template
rabuzarus [Sun, 22 Apr 2018 22:26:00 +0000 (00:26 +0200)]
frio - Bugfix - there was a wrong user count in admin-users template

6 years agoMerge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates
Hypolite Petovan [Sun, 22 Apr 2018 22:14:50 +0000 (18:14 -0400)]
Merge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates

Frio - rework admin users  and admin  contactblock template to be more consistant with other setting pages

6 years agoMerge pull request #4906 from MrPetovan/task/content-filter-one-liner
rabuzarus [Sun, 22 Apr 2018 22:14:22 +0000 (00:14 +0200)]
Merge pull request #4906 from MrPetovan/task/content-filter-one-liner

Move content filter HTML in a template

6 years agoForgot new line at end of file in templates/wall/content_filter.tpl
Hypolite Petovan [Sun, 22 Apr 2018 22:13:13 +0000 (18:13 -0400)]
Forgot new line at end of file in templates/wall/content_filter.tpl

6 years agoMove content filter HTML in a template
Hypolite Petovan [Sun, 22 Apr 2018 22:02:00 +0000 (18:02 -0400)]
Move content filter HTML in a template

6 years agofrio - some work on the admin contactblock template to be more consistant with other...
rabuzarus [Sun, 22 Apr 2018 21:06:06 +0000 (23:06 +0200)]
frio - some work on the admin contactblock template to be more consistant with other setting pages

6 years agoMerge pull request #4905 from MrPetovan/task/content-filter-one-liner
rabuzarus [Sun, 22 Apr 2018 21:00:05 +0000 (23:00 +0200)]
Merge pull request #4905 from MrPetovan/task/content-filter-one-liner

Add one-line content filter when there's only one reason

6 years agoUpdated credits.txt.
Andreas Neustifter [Thu, 19 Apr 2018 21:24:23 +0000 (21:24 +0000)]
Updated credits.txt.

6 years agoHaromonize Find People Widget.
Friendica [Thu, 19 Apr 2018 20:54:14 +0000 (20:54 +0000)]
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.

6 years agoMove new member tips to tab bar.
Friendica [Thu, 19 Apr 2018 20:09:19 +0000 (20:09 +0000)]
Move new member tips to tab bar.

The new member tips link looks very misplaced and forlorn at the current position.
Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)

6 years agoOnly shown pagination when not empty.
Friendica [Thu, 19 Apr 2018 19:47:12 +0000 (19:47 +0000)]
Only shown pagination when not empty.

Currenty the pagination bar is always shown, even when no prev/next buttons are active.
This only shows the bar when actual navigation is possible.

6 years agoImage in /contacts/xx is shifted.
Friendica [Thu, 19 Apr 2018 19:49:58 +0000 (19:49 +0000)]
Image in /contacts/xx is shifted.

The contact image for a single contact in /contacts/xx is next to the contact name
instead of below, fix that.

6 years agoAdd one-line content filter when there's only one reason
Hypolite Petovan [Sun, 22 Apr 2018 18:28:34 +0000 (14:28 -0400)]
Add one-line content filter when there's only one reason

6 years agofrio - some work on the admin users template to be more consistant with other setting...
rabuzarus [Sun, 22 Apr 2018 18:23:24 +0000 (20:23 +0200)]
frio - some work on the admin users template to be more consistant with other setting pages

6 years agoMerge pull request #4904 from M-arcus/patch-4
Hypolite Petovan [Sun, 22 Apr 2018 17:30:28 +0000 (13:30 -0400)]
Merge pull request #4904 from M-arcus/patch-4

[DOCS] Automatic install: Add documentation

6 years ago[DOCS] Install: Add intendation for list (en)
Marcus Müller [Sun, 22 Apr 2018 17:28:27 +0000 (19:28 +0200)]
[DOCS] Install: Add intendation for list (en)

6 years ago[DOCS] Install: Add intendation for list (de)
Marcus Müller [Sun, 22 Apr 2018 17:27:56 +0000 (19:27 +0200)]
[DOCS] Install: Add intendation for list (de)

6 years ago[DOCS] Installation: Fix minor text error
Marcus Müller [Sun, 22 Apr 2018 17:11:37 +0000 (19:11 +0200)]
[DOCS] Installation: Fix minor text error

6 years ago[DOCS] Installation: Update german instructions
Marcus Müller [Sun, 22 Apr 2018 17:10:27 +0000 (19:10 +0200)]
[DOCS] Installation: Update german instructions

6 years ago[DOCS] Automatic install: Add documentation
Marcus Müller [Sun, 22 Apr 2018 15:55:43 +0000 (17:55 +0200)]
[DOCS] Automatic install: Add documentation

6 years agoUncomment some code in ItemContent::getPlaintextPost
Hypolite Petovan [Sun, 22 Apr 2018 15:43:27 +0000 (11:43 -0400)]
Uncomment some code in ItemContent::getPlaintextPost

- I have no idea what I'm doing

6 years agoMerge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence
Michael Vogel [Sun, 22 Apr 2018 15:38:32 +0000 (17:38 +0200)]
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence

Only show event reminders of events attendyes or attendmaybe

6 years agoMerge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete
rabuzarus [Sun, 22 Apr 2018 15:35:52 +0000 (17:35 +0200)]
Merge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete

Add documentation for new $options parameter in dba::delete

6 years agoMerge pull request #4900 from annando/dfrn-rework
Hypolite Petovan [Sun, 22 Apr 2018 15:35:41 +0000 (11:35 -0400)]
Merge pull request #4900 from annando/dfrn-rework

Preparation for transmitting public posts via DFRN

6 years agoAdd default value doc for options.cascade in dba::delete
Hypolite Petovan [Sun, 22 Apr 2018 15:34:41 +0000 (11:34 -0400)]
Add default value doc for options.cascade in dba::delete

6 years agoAdd documentation for $options parameter in dba::delete
Hypolite Petovan [Sun, 22 Apr 2018 15:33:20 +0000 (11:33 -0400)]
Add documentation for $options parameter in dba::delete

6 years agoUse public_contact() instead of wrong query in Profile::getEventsReminderHTML
Hypolite Petovan [Sun, 22 Apr 2018 15:29:55 +0000 (11:29 -0400)]
Use public_contact() instead of wrong query in Profile::getEventsReminderHTML

6 years agoMerge pull request #4901 from tobiasd/20180422-travis
Hypolite Petovan [Sun, 22 Apr 2018 15:17:06 +0000 (11:17 -0400)]
Merge pull request #4901 from tobiasd/20180422-travis

check more PHP version

6 years agocheck more PHP version
Tobias Diekershoff [Sun, 22 Apr 2018 12:56:59 +0000 (14:56 +0200)]
check more PHP version

6 years agoCurrently disabled
Michael [Sun, 22 Apr 2018 11:33:32 +0000 (11:33 +0000)]
Currently disabled

6 years agoReceiving of public posts is now working
Michael [Sun, 22 Apr 2018 10:58:03 +0000 (10:58 +0000)]
Receiving of public posts is now working

6 years agoPublic posts are now transferred successfully to the DFRN part
Michael [Sun, 22 Apr 2018 10:42:01 +0000 (10:42 +0000)]
Public posts are now transferred successfully to the DFRN part

6 years agoMerge pull request #4896 from MrPetovan/bug/infinite-loop-in-dba-delete
Tobias Diekershoff [Sun, 22 Apr 2018 10:23:11 +0000 (12:23 +0200)]
Merge pull request #4896 from MrPetovan/bug/infinite-loop-in-dba-delete

Prevent side effect with cascade => false in dba::delete

6 years agoMerge pull request #4897 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
Tobias Diekershoff [Sun, 22 Apr 2018 10:18:48 +0000 (12:18 +0200)]
Merge pull request #4897 from MrPetovan/bug/4879-remove-backslash-in-birthday-events

Regenerate messages.po after changing a translation string

6 years agocreate public endpoint
Michael [Sun, 22 Apr 2018 10:04:30 +0000 (10:04 +0000)]
create public endpoint

6 years agoUpdate messages.po after changing a translation string
Hypolite Petovan [Sun, 22 Apr 2018 09:17:42 +0000 (05:17 -0400)]
Update messages.po after changing a translation string

6 years agoPrevent side effect with cascade => false in dba::delete
Hypolite Petovan [Sun, 22 Apr 2018 08:46:46 +0000 (04:46 -0400)]
Prevent side effect with cascade => false in dba::delete

6 years agoDecrease scope of query in Profile::getEventsReminderHTML
Hypolite Petovan [Sun, 22 Apr 2018 08:41:53 +0000 (04:41 -0400)]
Decrease scope of query in Profile::getEventsReminderHTML

- Use specific SELECT fields
- Use INNER JOIN

6 years agoMerge remote-tracking branch 'upstream/develop' into dfrn-rework
Michael [Sun, 22 Apr 2018 07:45:28 +0000 (07:45 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-rework

6 years agoMerge pull request #4895 from tobiasd/20180422-fi
Michael Vogel [Sun, 22 Apr 2018 07:35:42 +0000 (09:35 +0200)]
Merge pull request #4895 from tobiasd/20180422-fi

update FI translations THX Kris

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Sun, 22 Apr 2018 06:28:53 +0000 (08:28 +0200)]
update FI translations THX Kris

6 years agoMerge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete
Michael Vogel [Sun, 22 Apr 2018 05:55:39 +0000 (07:55 +0200)]
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete

Prevent infinite loop when a dbstructure_definition hook is orphan

6 years agoMerge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
Michael Vogel [Sun, 22 Apr 2018 05:54:07 +0000 (07:54 +0200)]
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events

Fix quoting style in DFRN::birthdayEvent()

6 years agoOnly show event reminders of events attendyes or attendmaybe
Hypolite Petovan [Sun, 22 Apr 2018 02:49:06 +0000 (22:49 -0400)]
Only show event reminders of events attendyes or attendmaybe

6 years agoFix quoting style in DFRN::birthdayEvent()
Hypolite Petovan [Sun, 22 Apr 2018 01:03:12 +0000 (21:03 -0400)]
Fix quoting style in DFRN::birthdayEvent()

6 years agoMove Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost
Hypolite Petovan [Sun, 22 Apr 2018 00:50:13 +0000 (20:50 -0400)]
Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost

6 years agoPrevent infinite loop when a dbstructure_definition hook is orphan
Hypolite Petovan [Sun, 22 Apr 2018 00:34:07 +0000 (20:34 -0400)]
Prevent infinite loop when a dbstructure_definition hook is orphan

- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion

6 years agoAdd Text\BBCode::toPlaintext to mod/babel
Hypolite Petovan [Sat, 21 Apr 2018 22:48:10 +0000 (18:48 -0400)]
Add Text\BBCode::toPlaintext to mod/babel

6 years agoMerge pull request #4891 from annando/private-forum-redux
Hypolite Petovan [Sat, 21 Apr 2018 22:19:27 +0000 (18:19 -0400)]
Merge pull request #4891 from annando/private-forum-redux

Better working with private forums

6 years agoBetter working with private forums
Michael [Sat, 21 Apr 2018 21:59:02 +0000 (21:59 +0000)]
Better working with private forums

6 years agoMerge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css
Tobias Diekershoff [Sat, 21 Apr 2018 14:29:27 +0000 (16:29 +0200)]
Merge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css

frio - add missing page styles for user setting pages

6 years agoMerge pull request #4888 from friendica/revert-4883-install_config
Tobias Diekershoff [Sat, 21 Apr 2018 14:28:51 +0000 (16:28 +0200)]
Merge pull request #4888 from friendica/revert-4883-install_config

Revert "Moved .htconfig.php file & extracted Install business logic"

6 years agoRevert "Moved .htconfig.php file & extracted Install business logic"
Tobias Diekershoff [Sat, 21 Apr 2018 14:28:22 +0000 (16:28 +0200)]
Revert "Moved .htconfig.php file & extracted Install business logic"