friendica.git/.git
5 years agoUpdated .well-known location within Nginx Sample Config:
Wouter Broers [Sat, 1 Dec 2018 18:04:34 +0000 (19:04 +0100)]
Updated .well-known location within Nginx Sample Config:
Replaced try_files with a rewrite rule to prevent Nginx
from spitting out 404 errors on addresses like:
- <server.tld>/.well-known/host-meta
- <server.tld>/.well-known/x-social-ray
- <server.tld>/.well-known/nodeinfo
- <server.tld>/.well-known/webfinger?resource=<resource>

5 years agoMerge pull request #6199 from MrPetovan/task/move-config-to-php-array
Michael Vogel [Mon, 26 Nov 2018 22:57:56 +0000 (23:57 +0100)]
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array

Move config to PHP array

5 years agoMerge pull request #6204 from annando/escaping
Hypolite Petovan [Mon, 26 Nov 2018 21:31:13 +0000 (16:31 -0500)]
Merge pull request #6204 from annando/escaping

We are now escaping many template fields

5 years agoMerge pull request #6207 from tobiasd/20181126-fixmissingclose
Hypolite Petovan [Mon, 26 Nov 2018 12:45:04 +0000 (07:45 -0500)]
Merge pull request #6207 from tobiasd/20181126-fixmissingclose

Add missing closing tags

5 years agoUse constants instead of strings for register_policy
Hypolite Petovan [Mon, 26 Nov 2018 12:40:44 +0000 (07:40 -0500)]
Use constants instead of strings for register_policy

5 years agoAdd missing closing tags
Tobias Diekershoff [Mon, 26 Nov 2018 10:58:58 +0000 (11:58 +0100)]
Add missing closing tags

The summery template for the admin panel was missing a closing link tag
for the deferred worker queue. This tag has been added for the general
template and the template used by the frio theme.

5 years agoMerge pull request #6206 from annando/parent
Tobias Diekershoff [Mon, 26 Nov 2018 10:43:16 +0000 (11:43 +0100)]
Merge pull request #6206 from annando/parent

Missing '

5 years agoMissing '
Michael [Mon, 26 Nov 2018 08:52:40 +0000 (08:52 +0000)]
Missing '

5 years agoJust some misspelling
Michael [Sun, 25 Nov 2018 23:49:40 +0000 (23:49 +0000)]
Just some misspelling

5 years agoSome correction
Michael [Sun, 25 Nov 2018 20:40:30 +0000 (20:40 +0000)]
Some correction

5 years agoMuch more escapes
Michael [Sun, 25 Nov 2018 20:34:02 +0000 (20:34 +0000)]
Much more escapes

5 years agoEscaping the address field
Michael [Sun, 25 Nov 2018 20:04:01 +0000 (20:04 +0000)]
Escaping the address field

5 years agoContact search is now escaped
Michael [Sun, 25 Nov 2018 19:48:26 +0000 (19:48 +0000)]
Contact search is now escaped

5 years agoSome more escaping
Michael [Sun, 25 Nov 2018 19:26:46 +0000 (19:26 +0000)]
Some more escaping

5 years agoMerge pull request #6203 from annando/hidden-user
Hypolite Petovan [Sun, 25 Nov 2018 19:16:51 +0000 (14:16 -0500)]
Merge pull request #6203 from annando/hidden-user

Show contact posts from hidden users

5 years agoWe are now escaping many template fields
Michael [Sun, 25 Nov 2018 18:56:26 +0000 (18:56 +0000)]
We are now escaping many template fields

5 years agoShow contact posts from hidden users
Michael [Sun, 25 Nov 2018 18:50:41 +0000 (18:50 +0000)]
Show contact posts from hidden users

5 years agoMerge pull request #6201 from JonnyTischbein/feature_admin_subsubpages
Michael Vogel [Sun, 25 Nov 2018 09:46:22 +0000 (10:46 +0100)]
Merge pull request #6201 from JonnyTischbein/feature_admin_subsubpages

admin/site Change html b to strong

5 years agoChange html b to strong
Jonny Tischbein [Sun, 25 Nov 2018 08:03:01 +0000 (09:03 +0100)]
Change html b to strong

5 years agoMerge pull request #6198 from MrPetovan/task/user-removal-improvements
Tobias Diekershoff [Sun, 25 Nov 2018 07:45:45 +0000 (08:45 +0100)]
Merge pull request #6198 from MrPetovan/task/user-removal-improvements

User removal improvements

5 years agoMerge pull request #6181 from JonnyTischbein/feature_admin_subsubpages
Hypolite Petovan [Sun, 25 Nov 2018 07:36:48 +0000 (02:36 -0500)]
Merge pull request #6181 from JonnyTischbein/feature_admin_subsubpages

[Frio] Add collapsable panel groups for admin/site with anchors at headlines

5 years agoMove all warning text in L10n + frio: make warning closable
Jonny Tischbein [Sun, 25 Nov 2018 07:32:05 +0000 (08:32 +0100)]
Move all warning text in L10n + frio: make warning closable

5 years agoRemove obsolete INI config files
Hypolite Petovan [Sun, 25 Nov 2018 06:56:28 +0000 (01:56 -0500)]
Remove obsolete INI config files

5 years agoUpdate documentation with new config style/name
Hypolite Petovan [Sun, 25 Nov 2018 06:56:02 +0000 (01:56 -0500)]
Update documentation with new config style/name

- Fix typos

5 years agoReplace *.ini.php by *.config.php in comments
Hypolite Petovan [Sun, 25 Nov 2018 06:44:51 +0000 (01:44 -0500)]
Replace *.ini.php by *.config.php in comments

5 years agoUpdate install to generate config/local.config.php
Hypolite Petovan [Sun, 25 Nov 2018 06:44:09 +0000 (01:44 -0500)]
Update install to generate config/local.config.php

5 years agoAdd support for PHP array config files
Hypolite Petovan [Sun, 25 Nov 2018 06:42:05 +0000 (01:42 -0500)]
Add support for PHP array config files

- Add new base config files
- Remove useless DIRECTORY_SEPARATOR instances

5 years agoMove config/dbstructure.php to config/dbstructure.config.php
Hypolite Petovan [Sun, 25 Nov 2018 06:07:31 +0000 (01:07 -0500)]
Move config/dbstructure.php to config/dbstructure.config.php

5 years agoAdd self-removal prevention in mod/admin
Hypolite Petovan [Sun, 25 Nov 2018 01:59:38 +0000 (20:59 -0500)]
Add self-removal prevention in mod/admin

5 years agoFix user account removal expiration delay
Hypolite Petovan [Sun, 25 Nov 2018 01:59:18 +0000 (20:59 -0500)]
Fix user account removal expiration delay

5 years agoRemove redirection from User::remove
Hypolite Petovan [Sun, 25 Nov 2018 01:58:41 +0000 (20:58 -0500)]
Remove redirection from User::remove

5 years agoNormalize quotes in User::remove
Hypolite Petovan [Sun, 25 Nov 2018 01:58:11 +0000 (20:58 -0500)]
Normalize quotes in User::remove

5 years agoUpdate deprecated calls in Model\user and mod/removeme
Hypolite Petovan [Sun, 25 Nov 2018 01:56:38 +0000 (20:56 -0500)]
Update deprecated calls in Model\user and mod/removeme

5 years agoFix open registration email
Hypolite Petovan [Sun, 25 Nov 2018 01:55:18 +0000 (20:55 -0500)]
Fix open registration email

5 years agoReadd relocate warning for non-frio themes
Jonny Tischbein [Sat, 24 Nov 2018 22:00:33 +0000 (23:00 +0100)]
Readd relocate warning for non-frio themes

5 years agoFrio: Move relocation warning from headline to bootstrap danger box
Jonny Tischbein [Sat, 24 Nov 2018 21:50:42 +0000 (22:50 +0100)]
Frio: Move relocation warning from headline to bootstrap danger box

5 years agoMerge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays
Michael Vogel [Sat, 24 Nov 2018 14:55:43 +0000 (15:55 +0100)]
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays

Hide follower-only birthday reminders

5 years agoMerge pull request #6197 from annando/hide-short-groups
Hypolite Petovan [Sat, 24 Nov 2018 13:22:43 +0000 (08:22 -0500)]
Merge pull request #6197 from annando/hide-short-groups

Don't show the group filter where there is only one

5 years agoMerge pull request #6196 from annando/notices
Hypolite Petovan [Sat, 24 Nov 2018 13:21:23 +0000 (08:21 -0500)]
Merge pull request #6196 from annando/notices

Fixes a notice and wrong counting of nodes

5 years agoMerge pull request #6193 from annando/redirection
Hypolite Petovan [Sat, 24 Nov 2018 13:13:35 +0000 (08:13 -0500)]
Merge pull request #6193 from annando/redirection

Fixing redirection problems with parameters

5 years agoMerge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags
Michael Vogel [Sat, 24 Nov 2018 12:14:50 +0000 (13:14 +0100)]
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags

Normalize BBCode hashtags links

5 years agoDon't show the group filter where there is only one
Michael [Sat, 24 Nov 2018 12:10:30 +0000 (12:10 +0000)]
Don't show the group filter where there is only one

5 years agoFixes a notice and wrong counting of nodes
Michael [Sat, 24 Nov 2018 11:38:36 +0000 (11:38 +0000)]
Fixes a notice and wrong counting of nodes

5 years agoMerge pull request #6194 from tobiasd/20181124-messages
Michael Vogel [Sat, 24 Nov 2018 09:58:43 +0000 (10:58 +0100)]
Merge pull request #6194 from tobiasd/20181124-messages

regen master messages.po

5 years agoMaking the tests happy
Michael [Sat, 24 Nov 2018 09:01:10 +0000 (09:01 +0000)]
Making the tests happy

5 years agoregen master messages.po
Tobias Diekershoff [Sat, 24 Nov 2018 06:51:28 +0000 (07:51 +0100)]
regen master messages.po

5 years agoFixing redirection problems with parameters
Michael [Sat, 24 Nov 2018 00:27:00 +0000 (00:27 +0000)]
Fixing redirection problems with parameters

5 years agoChange saving active panel from js localStorage to via html #anker
Jonny Tischbein [Fri, 23 Nov 2018 23:44:11 +0000 (00:44 +0100)]
Change saving active panel from js localStorage to via html #anker

5 years agoMerge pull request #6191 from MrPetovan/task/urlencode-file-param
Michael Vogel [Fri, 23 Nov 2018 20:37:31 +0000 (21:37 +0100)]
Merge pull request #6191 from MrPetovan/task/urlencode-file-param

URL encode /network file query parameter

5 years agoMerge pull request #6192 from MrPetovan/bug/6012-fix-contact-relationship-links
Michael Vogel [Fri, 23 Nov 2018 19:51:40 +0000 (20:51 +0100)]
Merge pull request #6192 from MrPetovan/bug/6012-fix-contact-relationship-links

Fix display of Connect/Disconnect links on contact page

5 years agoFix display of Connect/Disconnect links on contact page
Hypolite Petovan [Fri, 23 Nov 2018 16:09:43 +0000 (11:09 -0500)]
Fix display of Connect/Disconnect links on contact page

5 years agoUrlencode /network file parameter
Hypolite Petovan [Fri, 23 Nov 2018 15:02:30 +0000 (10:02 -0500)]
Urlencode /network file parameter

5 years agoRemove unused parameter $save in HTML::search
Hypolite Petovan [Fri, 23 Nov 2018 14:53:14 +0000 (09:53 -0500)]
Remove unused parameter $save in HTML::search

- Remove unused variables in saved_search()

5 years agoMerge pull request #6189 from MrPetovan/bug/5737-hide-ignore-anonymous
Tobias Diekershoff [Fri, 23 Nov 2018 09:01:56 +0000 (10:01 +0100)]
Merge pull request #6189 from MrPetovan/bug/5737-hide-ignore-anonymous

Fix ignore link showing for anonymous users

5 years agoFix ignore link showing for anonymous users
Hypolite Petovan [Fri, 23 Nov 2018 06:25:38 +0000 (01:25 -0500)]
Fix ignore link showing for anonymous users

5 years agoMerge pull request #6188 from MrPetovan/bug/5928-protect-oauthexception
Michael Vogel [Fri, 23 Nov 2018 06:09:49 +0000 (07:09 +0100)]
Merge pull request #6188 from MrPetovan/bug/5928-protect-oauthexception

Protect OAuthException declaration to avoid conflict with php-pecl-oauth

5 years agoMerge pull request #6186 from MrPetovan/bug/6081-fix-ostatus-subscribe
Michael Vogel [Fri, 23 Nov 2018 06:09:00 +0000 (07:09 +0100)]
Merge pull request #6186 from MrPetovan/bug/6081-fix-ostatus-subscribe

Fix OStatus Subscribe fatal error

5 years agoProtect OAuthException declaration to avoid conflict with php-pecl-oauth
Hypolite Petovan [Fri, 23 Nov 2018 03:21:57 +0000 (22:21 -0500)]
Protect OAuthException declaration to avoid conflict with php-pecl-oauth

5 years agoPrevent fatal error when $friends isn't an array
Hypolite Petovan [Fri, 23 Nov 2018 00:03:24 +0000 (19:03 -0500)]
Prevent fatal error when $friends isn't an array

5 years agoFix formatting in mod/ostatus_subscribe
Hypolite Petovan [Fri, 23 Nov 2018 00:03:02 +0000 (19:03 -0500)]
Fix formatting in mod/ostatus_subscribe

5 years agoMerge pull request #6185 from annando/blocked
Hypolite Petovan [Thu, 22 Nov 2018 23:38:14 +0000 (18:38 -0500)]
Merge pull request #6185 from annando/blocked

Checking for blocked user does now check for blocked domain as well

5 years agoSome more AP blocking
Michael [Thu, 22 Nov 2018 22:31:48 +0000 (22:31 +0000)]
Some more AP blocking

5 years agoBlock AP delivery
Michael [Thu, 22 Nov 2018 22:23:31 +0000 (22:23 +0000)]
Block AP delivery

5 years agoDon't deliver to blocked domains
Michael [Thu, 22 Nov 2018 22:09:22 +0000 (22:09 +0000)]
Don't deliver to blocked domains

5 years agoChecking for blocked user does now check for blocked domain as well
Michael [Thu, 22 Nov 2018 21:43:16 +0000 (21:43 +0000)]
Checking for blocked user does now check for blocked domain as well

5 years agoNormalize BBCode Hashtag replacement
Hypolite Petovan [Thu, 22 Nov 2018 14:34:17 +0000 (09:34 -0500)]
Normalize BBCode Hashtag replacement

5 years agoRemove stored URL from hashtag terms
Hypolite Petovan [Thu, 22 Nov 2018 14:33:42 +0000 (09:33 -0500)]
Remove stored URL from hashtag terms

5 years agoRemove useless rawurlencode calls for building hashtag bbcode
Hypolite Petovan [Thu, 22 Nov 2018 14:23:42 +0000 (09:23 -0500)]
Remove useless rawurlencode calls for building hashtag bbcode

- Fix some formatting

5 years agoMerge pull request #6182 from MrPetovan/task/6172-add-registration-invitation
Tobias Diekershoff [Thu, 22 Nov 2018 07:01:19 +0000 (08:01 +0100)]
Merge pull request #6182 from MrPetovan/task/6172-add-registration-invitation

Add new REGISTRATION_INVITATION value to mod/friendica output

5 years ago[Composer] Add missing PHP extension dependencies
Hypolite Petovan [Thu, 22 Nov 2018 05:24:43 +0000 (00:24 -0500)]
[Composer] Add missing PHP extension dependencies

5 years agoAdd contact conditions to getBirthdays/updateBirthdays
Hypolite Petovan [Thu, 22 Nov 2018 05:15:44 +0000 (00:15 -0500)]
Add contact conditions to getBirthdays/updateBirthdays

5 years agoMove DFRN::birthdayEvent() to Event::createBirthday
Hypolite Petovan [Thu, 22 Nov 2018 05:15:09 +0000 (00:15 -0500)]
Move DFRN::birthdayEvent() to Event::createBirthday

5 years agoReplace remaining occurrences of "0001-01-01" with DBA::NULL_DATE
Hypolite Petovan [Thu, 22 Nov 2018 04:53:45 +0000 (23:53 -0500)]
Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE

5 years agoFix typo in comment in mod/redir
Hypolite Petovan [Thu, 22 Nov 2018 03:27:57 +0000 (22:27 -0500)]
Fix typo in comment in mod/redir

5 years agoAdd new REGISTER_INVITATION value to mod/friendica output
Hypolite Petovan [Thu, 22 Nov 2018 03:27:28 +0000 (22:27 -0500)]
Add new REGISTER_INVITATION value to mod/friendica output

5 years agoOnly store last opened panel for one reload (the POST reload after a submit)
Jonny Tischbein [Wed, 21 Nov 2018 18:23:06 +0000 (19:23 +0100)]
Only store last opened panel for one reload (the POST reload after a submit)

5 years agoSave last collapsed panel + restore to open and scroll to top of panel
Jonny Tischbein [Wed, 21 Nov 2018 18:15:59 +0000 (19:15 +0100)]
Save last collapsed panel + restore to open and scroll to top of panel

5 years agoMerge pull request #6176 from annando/ap-security
Tobias Diekershoff [Wed, 21 Nov 2018 17:10:45 +0000 (18:10 +0100)]
Merge pull request #6176 from annando/ap-security

AP: Security check against forged "create" activities

5 years agoFrio: Add collapsable panel-groups for admin/site
Jonny Tischbein [Wed, 21 Nov 2018 16:27:10 +0000 (17:27 +0100)]
Frio: Add collapsable panel-groups for admin/site

5 years agoMerge pull request #6179 from Alkarex/sql-distinct-fix
Hypolite Petovan [Wed, 21 Nov 2018 13:07:33 +0000 (08:07 -0500)]
Merge pull request #6179 from Alkarex/sql-distinct-fix

Fix SQL grammar error: ORDER BY clause is not in SELECT

5 years agoMerge pull request #6178 from annando/ap-viewcontacts
Hypolite Petovan [Wed, 21 Nov 2018 13:06:54 +0000 (08:06 -0500)]
Merge pull request #6178 from annando/ap-viewcontacts

"viewcontacts" hadn't displayed the AP contacts

5 years agoMerge pull request #6177 from annando/oembed-escaping
Hypolite Petovan [Wed, 21 Nov 2018 13:06:26 +0000 (08:06 -0500)]
Merge pull request #6177 from annando/oembed-escaping

Sanitize the OEmbed data before processing it

5 years agoFix SQL grammar error: ORDER BY clause is not in SELECT
Alexandre Alapetite [Wed, 21 Nov 2018 08:57:34 +0000 (09:57 +0100)]
Fix SQL grammar error: ORDER BY clause is not in SELECT

```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```

5 years ago"viewcontacts" hadn't displayed the AP contacts
Michael [Wed, 21 Nov 2018 08:50:43 +0000 (08:50 +0000)]
"viewcontacts" hadn't displayed the AP contacts

5 years agoSanitize the OEmbed data before processing it
Michael [Wed, 21 Nov 2018 07:07:24 +0000 (07:07 +0000)]
Sanitize the OEmbed data before processing it

5 years agoOne space too much
Michael [Tue, 20 Nov 2018 20:49:06 +0000 (20:49 +0000)]
One space too much

5 years agoAP: Security check against forged "create" activities
Michael [Tue, 20 Nov 2018 20:40:47 +0000 (20:40 +0000)]
AP: Security check against forged "create" activities

5 years agoMerge pull request #6171 from JonnyTischbein/issue_worker_free_mem
Hypolite Petovan [Tue, 20 Nov 2018 02:40:46 +0000 (21:40 -0500)]
Merge pull request #6171 from JonnyTischbein/issue_worker_free_mem

Change Worker to use only MemFree in isMinMemoryReached

5 years agoChange Worker to use only MemFree in isMinMemoryReached
Jonny Tischbein [Mon, 19 Nov 2018 22:21:40 +0000 (23:21 +0100)]
Change Worker to use only MemFree in isMinMemoryReached

5 years agoMerge pull request #6170 from annando/safe-save
Hypolite Petovan [Mon, 19 Nov 2018 16:51:39 +0000 (11:51 -0500)]
Merge pull request #6170 from annando/safe-save

To safe or not so save, that is the question

5 years agoMerge pull request #6169 from AndyHee/develop
Hypolite Petovan [Mon, 19 Nov 2018 16:41:49 +0000 (11:41 -0500)]
Merge pull request #6169 from AndyHee/develop

Update nginx sample config

5 years agoUpdate FAQ.md
Andy H3 [Mon, 19 Nov 2018 16:37:35 +0000 (23:37 +0700)]
Update FAQ.md

5 years agoTo safe or not so save, that is the question
Michael [Mon, 19 Nov 2018 16:36:31 +0000 (16:36 +0000)]
To safe or not so save, that is the question

5 years agoUpdate sample-nginx.config
Andy H3 [Mon, 19 Nov 2018 16:31:54 +0000 (23:31 +0700)]
Update sample-nginx.config

5 years agoUpdate sample-nginx.config
Andy H3 [Mon, 19 Nov 2018 16:26:34 +0000 (23:26 +0700)]
Update sample-nginx.config

Added buffers and buffer size

5 years agoMerge remote-tracking branch 'upstream/develop' into develop
AndyHee [Mon, 19 Nov 2018 14:54:56 +0000 (21:54 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop

5 years agoMerge pull request #6166 from annando/dbclean
Tobias Diekershoff [Mon, 19 Nov 2018 11:01:11 +0000 (12:01 +0100)]
Merge pull request #6166 from annando/dbclean

The expiry of conversations can now be configured in the admin panel

5 years ago14 days
Michael [Mon, 19 Nov 2018 10:02:44 +0000 (10:02 +0000)]
14 days

5 years agoMerge remote-tracking branch 'upstream/develop' into dbclean
Michael [Mon, 19 Nov 2018 10:01:09 +0000 (10:01 +0000)]
Merge remote-tracking branch 'upstream/develop' into dbclean

5 years agoMerge pull request #6165 from annando/default-features
Tobias Diekershoff [Mon, 19 Nov 2018 09:34:51 +0000 (10:34 +0100)]
Merge pull request #6165 from annando/default-features

Several default features are now in the core