]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #5009 from tobiasd/20180509-msg
Michael Vogel [Wed, 9 May 2018 15:14:30 +0000 (17:14 +0200)]
Merge pull request #5009 from tobiasd/20180509-msg

regenerated master messages.po file

6 years agoregenerated master messages.po file
Tobias Diekershoff [Wed, 9 May 2018 13:05:19 +0000 (15:05 +0200)]
regenerated master messages.po file

6 years agoMerge pull request #5008 from tobiasd/20180509-2115
Hypolite Petovan [Wed, 9 May 2018 12:19:26 +0000 (08:19 -0400)]
Merge pull request #5008 from tobiasd/20180509-2115

Issue #2115

6 years agoMerge pull request #5007 from tobiasd/20180509-doc
Hypolite Petovan [Wed, 9 May 2018 12:13:58 +0000 (08:13 -0400)]
Merge pull request #5007 from tobiasd/20180509-doc

documentation update for !mentions of forum accounts

6 years agothe widget is not needed here
Tobias Diekershoff [Wed, 9 May 2018 10:49:29 +0000 (12:49 +0200)]
the widget is not needed here

6 years agouse Archives for the additional feature setting like it is used in the network sidebar
Tobias Diekershoff [Wed, 9 May 2018 10:32:47 +0000 (12:32 +0200)]
use Archives for the additional feature setting like it is used in the network sidebar

6 years agodocumentation update for !mentions of forum accounts
Tobias Diekershoff [Wed, 9 May 2018 09:49:29 +0000 (11:49 +0200)]
documentation update for !mentions of forum accounts

6 years agoMerge pull request #5006 from annando/fix-empty-avatar
Tobias Diekershoff [Wed, 9 May 2018 07:24:16 +0000 (09:24 +0200)]
Merge pull request #5006 from annando/fix-empty-avatar

Bugfix: Avoid empty avatar photos when a public contact is created

6 years agoEnsure avatar photo in update routine
Michael [Wed, 9 May 2018 07:09:47 +0000 (07:09 +0000)]
Ensure avatar photo in update routine

6 years agoBugfix: Avoid empty avatar photos when a public contact is created
Michael [Wed, 9 May 2018 06:53:57 +0000 (06:53 +0000)]
Bugfix: Avoid empty avatar photos when a public contact is created

6 years agoMerge pull request #5004 from annando/missing-posts
Hypolite Petovan [Tue, 8 May 2018 22:53:41 +0000 (18:53 -0400)]
Merge pull request #5004 from annando/missing-posts

Issue 4990: Fixes missing posts on network page

6 years agoMerge pull request #5005 from annando/missing-10n
Hypolite Petovan [Tue, 8 May 2018 22:51:17 +0000 (18:51 -0400)]
Merge pull request #5005 from annando/missing-10n

Fixes missing L10n class

6 years agoFixes missing L10n class
Michael [Tue, 8 May 2018 22:34:47 +0000 (22:34 +0000)]
Fixes missing L10n class

6 years agoEnsure to mostly fetch the item with an non zero user id
Michael [Tue, 8 May 2018 22:26:49 +0000 (22:26 +0000)]
Ensure to mostly fetch the item with an non zero user id

6 years agoReverted SQL sorting
Michael [Tue, 8 May 2018 22:08:25 +0000 (22:08 +0000)]
Reverted SQL sorting

6 years agoIssue 4990: Fixes missing posts on network page
Michael [Tue, 8 May 2018 22:00:32 +0000 (22:00 +0000)]
Issue 4990: Fixes missing posts on network page

6 years agoMerge pull request #5003 from annando/fix-author-id
Hypolite Petovan [Tue, 8 May 2018 21:03:32 +0000 (17:03 -0400)]
Merge pull request #5003 from annando/fix-author-id

Update script to set author-id and owner-id

6 years agoCorrected placeholders
Michael [Tue, 8 May 2018 20:22:21 +0000 (20:22 +0000)]
Corrected placeholders

6 years agoEnsure that there will always be an author-id and owner-id in the items
Michael [Tue, 8 May 2018 20:20:15 +0000 (20:20 +0000)]
Ensure that there will always be an author-id and owner-id in the items

6 years agoAdded maintenance notice
Michael [Tue, 8 May 2018 18:46:47 +0000 (18:46 +0000)]
Added maintenance notice

6 years agoUpdate script for setting author-id and owner-id in item and thread table
Michael [Tue, 8 May 2018 17:50:06 +0000 (17:50 +0000)]
Update script for setting author-id and owner-id in item and thread table

6 years agoMerge pull request #5001 from tobiasd/20180508-lng2
Hypolite Petovan [Tue, 8 May 2018 16:58:20 +0000 (12:58 -0400)]
Merge pull request #5001 from tobiasd/20180508-lng2

translation updates DE, FI, PL

6 years agoupdate DE translations
Tobias Diekershoff [Tue, 8 May 2018 16:55:18 +0000 (18:55 +0200)]
update DE translations

6 years agoupdate PL translations THX waldis
Tobias Diekershoff [Tue, 8 May 2018 16:55:14 +0000 (18:55 +0200)]
update PL translations THX waldis

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Tue, 8 May 2018 16:55:10 +0000 (18:55 +0200)]
update FI translations THX Kris

6 years agoMerge pull request #4995 from annando/vanished-feeds
Tobias Diekershoff [Tue, 8 May 2018 06:33:47 +0000 (08:33 +0200)]
Merge pull request #4995 from annando/vanished-feeds

Fix for issue 4994: Feed items now appear again

6 years agoFix for issue 4994: Feed items now appear again
Michael [Tue, 8 May 2018 06:11:46 +0000 (06:11 +0000)]
Fix for issue 4994: Feed items now appear again

6 years agotime for a RC
Tobias Diekershoff [Mon, 7 May 2018 18:28:13 +0000 (20:28 +0200)]
time for a RC

6 years agoMerge pull request #4991 from annando/dbclean
Tobias Diekershoff [Mon, 7 May 2018 12:28:59 +0000 (14:28 +0200)]
Merge pull request #4991 from annando/dbclean

dbclean settings are now available from the frontend

6 years agoText for translations
Michael [Mon, 7 May 2018 08:46:32 +0000 (08:46 +0000)]
Text for translations

6 years agodbclean settings are now available from the frontend
Michael [Mon, 7 May 2018 05:37:20 +0000 (05:37 +0000)]
dbclean settings are now available from the frontend

6 years agoMerge pull request #4989 from annando/video-bbcode
Hypolite Petovan [Sun, 6 May 2018 21:59:05 +0000 (17:59 -0400)]
Merge pull request #4989 from annando/video-bbcode

Fix video display problems with videos with parameters

6 years agoFix video display problems with videos with parameters
Michael [Sun, 6 May 2018 16:57:46 +0000 (16:57 +0000)]
Fix video display problems with videos with parameters

6 years agoMerge pull request #4987 from tobiasd/20180506-lng
Michael Vogel [Sun, 6 May 2018 11:57:41 +0000 (13:57 +0200)]
Merge pull request #4987 from tobiasd/20180506-lng

translation updates for FI, PL and ZH CN

6 years agoMerge pull request #4988 from tobiasd/20180506-4689
Michael Vogel [Sun, 6 May 2018 11:56:21 +0000 (13:56 +0200)]
Merge pull request #4988 from tobiasd/20180506-4689

API docs, the count parameter

6 years agoAPI docs, the count parameter
Tobias Diekershoff [Sun, 6 May 2018 10:25:23 +0000 (12:25 +0200)]
API docs, the count parameter

6 years agoupdate PL translations THX waldis
Tobias Diekershoff [Sun, 6 May 2018 09:18:56 +0000 (11:18 +0200)]
update PL translations THX waldis

6 years agoupdate FI translations THX Samuli Valavuo
Tobias Diekershoff [Sun, 6 May 2018 09:18:08 +0000 (11:18 +0200)]
update FI translations THX Samuli Valavuo

6 years agoupdate to the zh-cn translation THX 朱陈锬
Tobias Diekershoff [Sun, 6 May 2018 09:17:15 +0000 (11:17 +0200)]
update to the zh-cn translation THX 朱陈锬

6 years agoMerge pull request #4978 from annando/dba-2
Hypolite Petovan [Fri, 4 May 2018 22:04:38 +0000 (18:04 -0400)]
Merge pull request #4978 from annando/dba-2

Diaspora: Fix person/contact retraction

6 years agoMerge pull request #4981 from annando/remote-self
Hypolite Petovan [Fri, 4 May 2018 21:50:17 +0000 (17:50 -0400)]
Merge pull request #4981 from annando/remote-self

"remote-self" is now working for Diaspora and Twitter as well

6 years agoMerge pull request #4982 from annando/no-blocked-contact
Hypolite Petovan [Fri, 4 May 2018 21:49:21 +0000 (17:49 -0400)]
Merge pull request #4982 from annando/no-blocked-contact

Suppress blocked contacts from being displayed

6 years agoSome more replaced queries
Michael [Fri, 4 May 2018 21:43:29 +0000 (21:43 +0000)]
Some more replaced queries

6 years agoUps
Michael [Fri, 4 May 2018 21:33:15 +0000 (21:33 +0000)]
Ups

6 years agoSuppress blocked contacts from being displayed
Michael [Fri, 4 May 2018 21:27:20 +0000 (21:27 +0000)]
Suppress blocked contacts from being displayed

6 years ago"remote-self" is now working for Diaspora and Twitter as well
Michael [Fri, 4 May 2018 21:12:13 +0000 (21:12 +0000)]
"remote-self" is now working for Diaspora and Twitter as well

6 years agoMerge pull request #4980 from nupplaphil/install-pdo-bugfix
Hypolite Petovan [Fri, 4 May 2018 18:23:36 +0000 (14:23 -0400)]
Merge pull request #4980 from nupplaphil/install-pdo-bugfix

using \PDO instead of PDO (bugfix)

6 years agousing \PDO instead PDO (bugfix)
Philipp Holzer [Fri, 4 May 2018 17:48:01 +0000 (19:48 +0200)]
using \PDO instead PDO (bugfix)

6 years agoRemoved activities that aren't in the Diaspora protocol
Michael [Fri, 4 May 2018 06:34:02 +0000 (06:34 +0000)]
Removed activities that aren't in the Diaspora protocol

6 years agoSome more dba stuff
Michael [Fri, 4 May 2018 06:33:36 +0000 (06:33 +0000)]
Some more dba stuff

6 years agoMerge pull request #4977 from annando/dba-error
Hypolite Petovan [Thu, 3 May 2018 21:03:30 +0000 (17:03 -0400)]
Merge pull request #4977 from annando/dba-error

 Avoid SQL error with wrong formatted datetime value

6 years agoReformat wrong expansion
Michael [Thu, 3 May 2018 20:49:32 +0000 (20:49 +0000)]
Reformat wrong expansion

6 years agoAvoid SQL error with wrong formatted datetime value
Michael [Thu, 3 May 2018 20:48:35 +0000 (20:48 +0000)]
Avoid SQL error with wrong formatted datetime value

6 years agoMerge pull request #4975 from annando/fix-blocked-contacts
Hypolite Petovan [Thu, 3 May 2018 18:22:50 +0000 (14:22 -0400)]
Merge pull request #4975 from annando/fix-blocked-contacts

"pending" shouldn't be set as well by default ...

6 years ago"pending" shouldn't be set as well by default ...
Michael [Thu, 3 May 2018 18:19:40 +0000 (18:19 +0000)]
"pending" shouldn't be set as well by default ...

6 years agoMerge pull request #4974 from annando/fix-blocked-contacts
Hypolite Petovan [Thu, 3 May 2018 18:06:01 +0000 (14:06 -0400)]
Merge pull request #4974 from annando/fix-blocked-contacts

Ugly bugfix: Public contacts had been blocked automatically when created

6 years agoUrgent bugfix: Public contacts had been blocked automatically when created
Michael [Thu, 3 May 2018 17:43:10 +0000 (17:43 +0000)]
Urgent bugfix: Public contacts had been blocked automatically when created

6 years agoMerge pull request #4973 from annando/diaspora-link
Hypolite Petovan [Thu, 3 May 2018 14:20:18 +0000 (10:20 -0400)]
Merge pull request #4973 from annando/diaspora-link

Bugfix: Twitter "Reshares" are now appearing again on Diaspora

6 years agoReshares had been detected falsely so that were rejected by Diaspora
Michael [Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)]
Reshares had been detected falsely so that were rejected by Diaspora

6 years agoEnsure that the link will be displayed correctly on Diaspora
Michael [Thu, 3 May 2018 04:43:50 +0000 (04:43 +0000)]
Ensure that the link will be displayed correctly on Diaspora

6 years agoMerge pull request #4972 from annando/dba-stuff
Hypolite Petovan [Thu, 3 May 2018 00:55:58 +0000 (20:55 -0400)]
Merge pull request #4972 from annando/dba-stuff

Replace old database queries with the new ones

6 years agoSome corrections
Michael [Wed, 2 May 2018 21:12:48 +0000 (21:12 +0000)]
Some corrections

6 years agoReplace old database queries with the new ones
Michael [Wed, 2 May 2018 19:26:15 +0000 (19:26 +0000)]
Replace old database queries with the new ones

6 years agoMerge pull request #4962 from astifter/fix_cropped_find_button
Hypolite Petovan [Tue, 1 May 2018 12:43:45 +0000 (08:43 -0400)]
Merge pull request #4962 from astifter/fix_cropped_find_button

vier: Fix layout issue introduced with PR #4873.

6 years agoMerge pull request #4967 from nupplaphil/4899-autoinstall-with-file
Hypolite Petovan [Tue, 1 May 2018 12:19:02 +0000 (08:19 -0400)]
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file

AutomaticInstallation - use config file

6 years agoUpdated help-text
Philipp Holzer [Tue, 1 May 2018 11:21:42 +0000 (13:21 +0200)]
Updated help-text

accidentaly changed `htconfig.php` (reverted)

6 years agoUpdated help-text
Philipp Holzer [Tue, 1 May 2018 11:14:41 +0000 (13:14 +0200)]
Updated help-text

6 years agoAutomaticInstallation - use config file
Philipp Holzer [Tue, 1 May 2018 11:11:25 +0000 (13:11 +0200)]
AutomaticInstallation - use config file

- added new parameter "-f config file" to `AutomaticInstallation.php`

6 years agoMerge pull request #4964 from annando/delivery-foo
Tobias Diekershoff [Tue, 1 May 2018 09:30:31 +0000 (11:30 +0200)]
Merge pull request #4964 from annando/delivery-foo

Fixed private messaging/relaying is controlled by the parent

6 years agoFixed private messaging/relaying is controlled by the parent
Michael [Tue, 1 May 2018 06:37:12 +0000 (06:37 +0000)]
Fixed private messaging/relaying is controlled by the parent

6 years agoFix layout issue introduced with PR #4873.
Andreas Neustifter [Mon, 30 Apr 2018 21:22:59 +0000 (21:22 +0000)]
Fix layout issue introduced with PR #4873.

The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.

6 years agoMerge pull request #4961 from annando/direct-dfrn
Hypolite Petovan [Mon, 30 Apr 2018 18:06:35 +0000 (14:06 -0400)]
Merge pull request #4961 from annando/direct-dfrn

Direct Relay is now working with DFRN as well

6 years agoMerge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn

6 years agoImproved logging, avoiding PHP warning
Michael [Mon, 30 Apr 2018 16:46:49 +0000 (16:46 +0000)]
Improved logging, avoiding PHP warning

6 years agoBugfix: Contact wasn't added on probing
Michael [Mon, 30 Apr 2018 16:45:00 +0000 (16:45 +0000)]
Bugfix: Contact wasn't added on probing

6 years agoMerge pull request #4959 from koyuawsmbrtn/develop
Hypolite Petovan [Mon, 30 Apr 2018 14:30:01 +0000 (10:30 -0400)]
Merge pull request #4959 from koyuawsmbrtn/develop

Added dark scheme to frio

6 years agoRenamed files as requested
Koyu Berteon [Mon, 30 Apr 2018 13:38:46 +0000 (15:38 +0200)]
Renamed files as requested

6 years agoCorrected time
Koyu Berteon [Mon, 30 Apr 2018 13:34:23 +0000 (15:34 +0200)]
Corrected time

6 years agoFixed identation in dark.php
Koyu Berteon [Mon, 30 Apr 2018 13:27:40 +0000 (15:27 +0200)]
Fixed identation in dark.php

6 years agoAdded dark scheme to frio
Koyu Berteon [Mon, 30 Apr 2018 13:25:31 +0000 (15:25 +0200)]
Added dark scheme to frio

6 years agoMerge pull request #4958 from rabuzarus/20180425_-_fix_help_aside
Hypolite Petovan [Mon, 30 Apr 2018 13:20:43 +0000 (09:20 -0400)]
Merge pull request #4958 from rabuzarus/20180425_-_fix_help_aside

The add widget class to the left aside for /help

6 years agoMerge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 13:09:11 +0000 (13:09 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn

6 years agoImproved logging
Michael [Mon, 30 Apr 2018 13:08:48 +0000 (13:08 +0000)]
Improved logging

6 years agoDeliver with the new function when delivering to a "uid=0" contact
Michael [Mon, 30 Apr 2018 13:07:40 +0000 (13:07 +0000)]
Deliver with the new function when delivering to a "uid=0" contact

6 years agoMerge develop into 20180425_-_fix_help_aside
rabuzarus [Mon, 30 Apr 2018 12:56:25 +0000 (14:56 +0200)]
Merge develop into 20180425_-_fix_help_aside

6 years agoAdditional logging
Michael [Mon, 30 Apr 2018 12:41:56 +0000 (12:41 +0000)]
Additional logging

6 years agoMerge pull request #4955 from tobiasd/20180430-fi
Hypolite Petovan [Mon, 30 Apr 2018 10:51:52 +0000 (06:51 -0400)]
Merge pull request #4955 from tobiasd/20180430-fi

update FI translations THX Kris

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Mon, 30 Apr 2018 06:34:47 +0000 (08:34 +0200)]
update FI translations THX Kris

6 years agoDon't spool relay deliveries
Michael [Mon, 30 Apr 2018 05:56:40 +0000 (05:56 +0000)]
Don't spool relay deliveries

6 years agoUpdate or create relay contact from discovery / process new protocol values
Michael [Mon, 30 Apr 2018 05:33:47 +0000 (05:33 +0000)]
Update or create relay contact from discovery / process new protocol values

6 years ago"x-social-relay" now exposes all supported protocols
Michael [Mon, 30 Apr 2018 04:01:04 +0000 (04:01 +0000)]
"x-social-relay" now exposes all supported protocols

6 years agoMerge pull request #4920 from nupplaphil/install_mode
Hypolite Petovan [Sun, 29 Apr 2018 18:31:13 +0000 (14:31 -0400)]
Merge pull request #4920 from nupplaphil/install_mode

Add Application Mode (Install, Maintenance, Normal)

6 years agoAdd Install Mode
Philipp Holzer [Sun, 29 Apr 2018 18:15:12 +0000 (20:15 +0200)]
Add Install Mode

- merge `friendica/develop` to `nupplaphil/install_mode`

6 years agoMerge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Michael Vogel [Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)]
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app

Move current_theme() to App

6 years agoMerge pull request #4954 from annando/hide-contacts
Tobias Diekershoff [Sun, 29 Apr 2018 16:40:01 +0000 (18:40 +0200)]
Merge pull request #4954 from annando/hide-contacts

Fix PR 4942: Fixed item query

6 years agoFix PR 4942: Fixed item query
Michael [Sun, 29 Apr 2018 16:32:46 +0000 (16:32 +0000)]
Fix PR 4942: Fixed item query

6 years agoAdd Install Mode
Philipp Holzer [Sun, 29 Apr 2018 16:13:24 +0000 (18:13 +0200)]
Add Install Mode

- increased code quality

6 years agoAdd Install Mode
Philipp Holzer [Sun, 29 Apr 2018 16:11:24 +0000 (18:11 +0200)]
Add Install Mode

- added PHP docBlock to methods
- increased code quality

6 years agoMerge pull request #4953 from tobiasd/20180429-msg
Hypolite Petovan [Sun, 29 Apr 2018 11:05:02 +0000 (07:05 -0400)]
Merge pull request #4953 from tobiasd/20180429-msg

regenerated master messages.po file

6 years agoregenerated master messages.po file
Tobias Diekershoff [Sun, 29 Apr 2018 05:19:20 +0000 (07:19 +0200)]
regenerated master messages.po file