]>
git.mxchange.org Git - friendica.git/log
Marcus Müller [Sun, 13 May 2018 10:50:53 +0000 (12:50 +0200)]
[TASK] Automatic installation: Install theme
Hypolite Petovan [Tue, 8 May 2018 08:02:37 +0000 (04:02 -0400)]
Merge pull request #4996 from fabrixxm/docs-theme-dev
Docs: add a note on adding `use` on theme.php
fabrixxm [Mon, 7 May 2018 16:28:55 +0000 (18:28 +0200)]
Docs: add a note on adding `use` on theme.php
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
Michael [Mon, 7 May 2018 08:46:32 +0000 (08:46 +0000)]
Text for translations
Michael [Mon, 7 May 2018 05:37:20 +0000 (05:37 +0000)]
dbclean settings are now available from the frontend
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
Michael [Sun, 6 May 2018 16:57:46 +0000 (16:57 +0000)]
Fix video display problems with videos with parameters
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
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
Tobias Diekershoff [Sun, 6 May 2018 10:25:23 +0000 (12:25 +0200)]
API docs, the count parameter
Tobias Diekershoff [Sun, 6 May 2018 09:18:56 +0000 (11:18 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sun, 6 May 2018 09:18:08 +0000 (11:18 +0200)]
update FI translations THX Samuli Valavuo
Tobias Diekershoff [Sun, 6 May 2018 09:17:15 +0000 (11:17 +0200)]
update to the zh-cn translation THX 朱陈锬
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
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
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
Michael [Fri, 4 May 2018 21:43:29 +0000 (21:43 +0000)]
Some more replaced queries
Michael [Fri, 4 May 2018 21:33:15 +0000 (21:33 +0000)]
Ups
Michael [Fri, 4 May 2018 21:27:20 +0000 (21:27 +0000)]
Suppress blocked contacts from being displayed
Michael [Fri, 4 May 2018 21:12:13 +0000 (21:12 +0000)]
"remote-self" is now working for Diaspora and Twitter as well
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)
Philipp Holzer [Fri, 4 May 2018 17:48:01 +0000 (19:48 +0200)]
using \PDO instead PDO (bugfix)
Michael [Fri, 4 May 2018 06:34:02 +0000 (06:34 +0000)]
Removed activities that aren't in the Diaspora protocol
Michael [Fri, 4 May 2018 06:33:36 +0000 (06:33 +0000)]
Some more dba stuff
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
Michael [Thu, 3 May 2018 20:49:32 +0000 (20:49 +0000)]
Reformat wrong expansion
Michael [Thu, 3 May 2018 20:48:35 +0000 (20:48 +0000)]
Avoid SQL error with wrong formatted datetime value
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 ...
Michael [Thu, 3 May 2018 18:19:40 +0000 (18:19 +0000)]
"pending" shouldn't be set as well by default ...
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
Michael [Thu, 3 May 2018 17:43:10 +0000 (17:43 +0000)]
Urgent bugfix: Public contacts had been blocked automatically when created
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
Michael [Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)]
Reshares had been detected falsely so that were rejected by Diaspora
Michael [Thu, 3 May 2018 04:43:50 +0000 (04:43 +0000)]
Ensure that the link will be displayed correctly on Diaspora
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
Michael [Wed, 2 May 2018 21:12:48 +0000 (21:12 +0000)]
Some corrections
Michael [Wed, 2 May 2018 19:26:15 +0000 (19:26 +0000)]
Replace old database queries with the new ones
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.
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
Philipp Holzer [Tue, 1 May 2018 11:21:42 +0000 (13:21 +0200)]
Updated help-text
accidentaly changed `htconfig.php` (reverted)
Philipp Holzer [Tue, 1 May 2018 11:14:41 +0000 (13:14 +0200)]
Updated help-text
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`
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
Michael [Tue, 1 May 2018 06:37:12 +0000 (06:37 +0000)]
Fixed private messaging/relaying is controlled by the parent
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.
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
Michael [Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 16:46:49 +0000 (16:46 +0000)]
Improved logging, avoiding PHP warning
Michael [Mon, 30 Apr 2018 16:45:00 +0000 (16:45 +0000)]
Bugfix: Contact wasn't added on probing
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
Koyu Berteon [Mon, 30 Apr 2018 13:38:46 +0000 (15:38 +0200)]
Renamed files as requested
Koyu Berteon [Mon, 30 Apr 2018 13:34:23 +0000 (15:34 +0200)]
Corrected time
Koyu Berteon [Mon, 30 Apr 2018 13:27:40 +0000 (15:27 +0200)]
Fixed identation in dark.php
Koyu Berteon [Mon, 30 Apr 2018 13:25:31 +0000 (15:25 +0200)]
Added dark scheme to frio
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
Michael [Mon, 30 Apr 2018 13:09:11 +0000 (13:09 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 13:08:48 +0000 (13:08 +0000)]
Improved logging
Michael [Mon, 30 Apr 2018 13:07:40 +0000 (13:07 +0000)]
Deliver with the new function when delivering to a "uid=0" contact
rabuzarus [Mon, 30 Apr 2018 12:56:25 +0000 (14:56 +0200)]
Merge develop into 20180425_-_fix_help_aside
Michael [Mon, 30 Apr 2018 12:41:56 +0000 (12:41 +0000)]
Additional logging
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
Tobias Diekershoff [Mon, 30 Apr 2018 06:34:47 +0000 (08:34 +0200)]
update FI translations THX Kris
Michael [Mon, 30 Apr 2018 05:56:40 +0000 (05:56 +0000)]
Don't spool relay deliveries
Michael [Mon, 30 Apr 2018 05:33:47 +0000 (05:33 +0000)]
Update or create relay contact from discovery / process new protocol values
Michael [Mon, 30 Apr 2018 04:01:04 +0000 (04:01 +0000)]
"x-social-relay" now exposes all supported protocols
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)
Philipp Holzer [Sun, 29 Apr 2018 18:15:12 +0000 (20:15 +0200)]
Add Install Mode
- merge `friendica/develop` to `nupplaphil/install_mode`
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
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
Michael [Sun, 29 Apr 2018 16:32:46 +0000 (16:32 +0000)]
Fix PR 4942: Fixed item query
Philipp Holzer [Sun, 29 Apr 2018 16:13:24 +0000 (18:13 +0200)]
Add Install Mode
- increased code quality
Philipp Holzer [Sun, 29 Apr 2018 16:11:24 +0000 (18:11 +0200)]
Add Install Mode
- added PHP docBlock to methods
- increased code quality
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
Tobias Diekershoff [Sun, 29 Apr 2018 05:19:20 +0000 (07:19 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 29 Apr 2018 04:41:55 +0000 (06:41 +0200)]
Merge pull request #4952 from MrPetovan/bug/4947-fix-content-filter-self
Fix own post check for content filter
Hypolite Petovan [Sun, 29 Apr 2018 00:37:47 +0000 (20:37 -0400)]
Merge pull request #4948 from annando/hash-ignored
Corrected query to don't show hash tag posts from blocked or ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 23:11:11 +0000 (19:11 -0400)]
Fix own post check for content filter
Hypolite Petovan [Sat, 28 Apr 2018 22:37:41 +0000 (18:37 -0400)]
Remove current_theme() and current_theme_url() functions
Hypolite Petovan [Sat, 28 Apr 2018 22:37:04 +0000 (18:37 -0400)]
Replace current_theme() and current_theme_url() calls
Hypolite Petovan [Sat, 28 Apr 2018 22:33:52 +0000 (18:33 -0400)]
Fix formatting in frio_boot.php
Hypolite Petovan [Sat, 28 Apr 2018 22:30:13 +0000 (18:30 -0400)]
Add new methods to src
- Add App::getCurrentTheme()
- Add App::getCurrentThemeStylesheetPath()
- Add Theme::getStylesheetPath()
Hypolite Petovan [Sat, 28 Apr 2018 22:28:23 +0000 (18:28 -0400)]
Fix formatting in Core\Theme
Michael Vogel [Sat, 28 Apr 2018 16:16:30 +0000 (18:16 +0200)]
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
Import posts from ignored contacts
Michael [Sat, 28 Apr 2018 16:12:45 +0000 (16:12 +0000)]
Corrected query to don't show hash tag posts from blocked or ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 15:38:01 +0000 (11:38 -0400)]
Add exception for self-contact in item_joins()
Philipp Holzer [Sat, 28 Apr 2018 15:06:08 +0000 (17:06 +0200)]
Add Install Mode
- fixed mistake
Philipp Holzer [Sat, 28 Apr 2018 13:15:54 +0000 (15:15 +0200)]
Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
Philipp Holzer [Sat, 28 Apr 2018 13:11:01 +0000 (15:11 +0200)]
Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
Hypolite Petovan [Sat, 28 Apr 2018 11:47:02 +0000 (07:47 -0400)]
Add missing readonly check for displaying items in item_joins
Philipp Holzer [Sat, 28 Apr 2018 10:36:40 +0000 (12:36 +0200)]
Add Install Mode (Part 2)
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
Michael Vogel [Sat, 28 Apr 2018 09:03:28 +0000 (11:03 +0200)]
Merge pull request #4945 from tobiasd/
20180428 -pl
update PL translations THX waldis
Michael [Sat, 28 Apr 2018 08:57:52 +0000 (08:57 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
Tobias Diekershoff [Sat, 28 Apr 2018 08:08:52 +0000 (10:08 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sat, 28 Apr 2018 07:42:06 +0000 (09:42 +0200)]
Merge pull request #4941 from MrPetovan/task/4938-update-dir-url-protocol
Update directory URL protocol
Tobias Diekershoff [Sat, 28 Apr 2018 06:58:45 +0000 (08:58 +0200)]
Merge pull request #4944 from astifter/fix_better_curl_error_during_install
Fix #4943.
Andreas Neustifter [Sat, 28 Apr 2018 06:46:46 +0000 (06:46 +0000)]
Fix #4943.
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
Hypolite Petovan [Sat, 28 Apr 2018 01:08:19 +0000 (21:08 -0400)]
Import posts from ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 00:56:34 +0000 (20:56 -0400)]
Update directory URL protocol
Hypolite Petovan [Fri, 27 Apr 2018 20:57:01 +0000 (16:57 -0400)]
Merge pull request #4939 from astifter/better_curl_error_during_install
Better curl error during install.