]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMaybe we shouldn't count pending contacts
Michael [Tue, 29 Nov 2016 18:23:34 +0000 (18:23 +0000)]
Maybe we shouldn't count pending contacts

7 years agoPending contacts shouldn't be displayed in the sidebar
Michael [Tue, 29 Nov 2016 06:40:35 +0000 (06:40 +0000)]
Pending contacts shouldn't be displayed in the sidebar

7 years agoIssue 2772: Pending contacts should now be displayed
Michael [Mon, 28 Nov 2016 22:11:13 +0000 (22:11 +0000)]
Issue 2772: Pending contacts should now be displayed

7 years agoMerge pull request #2972 from annando/1611-term-date
rabuzarus [Thu, 24 Nov 2016 21:14:09 +0000 (22:14 +0100)]
Merge pull request #2972 from annando/1611-term-date

Delivery to other systems was needlessly deferred.

7 years agoDelivery to other systems was needlessly deferred.
Michael [Thu, 24 Nov 2016 03:34:11 +0000 (03:34 +0000)]
Delivery to other systems was needlessly deferred.

7 years agoMerge pull request #2969 from gerhard6380/develop
Michael Vogel [Wed, 23 Nov 2016 04:13:31 +0000 (05:13 +0100)]
Merge pull request #2969 from gerhard6380/develop

Develop

7 years agoreverse change in proxy.php (issue with proxied images is within c#/uwp of windows...
gerhard6380 [Tue, 22 Nov 2016 23:14:45 +0000 (00:14 +0100)]
reverse change in proxy.php (issue with proxied images is within c#/uwp of windows, not in Friendica server)

7 years agoCorrections of duplicate entries in states (Albania, Bemruda, Laos, Hungary, Kiribati...
gerhard6380 [Tue, 22 Nov 2016 23:07:21 +0000 (00:07 +0100)]
Corrections of duplicate entries in states (Albania, Bemruda, Laos, Hungary, Kiribati, Moldova, Taiwan)

7 years agoMerge pull request #2967 from Hypolite/issue/#2955
Michael Vogel [Tue, 22 Nov 2016 20:00:34 +0000 (21:00 +0100)]
Merge pull request #2967 from Hypolite/issue/#2955

ping.php: Prevent $register_count from being undefined

7 years agoping.php improvement: Prevent $register_count from being undefined
Hypolite Petovan [Tue, 22 Nov 2016 19:17:05 +0000 (14:17 -0500)]
ping.php improvement: Prevent $register_count from being undefined

7 years agoMerge pull request #2966 from annando/1611-myisam
Tobias Diekershoff [Tue, 22 Nov 2016 16:53:01 +0000 (17:53 +0100)]
Merge pull request #2966 from annando/1611-myisam

Bugfix: We should only search in the current database for MyISAM tables

7 years agoBugfix: We should only search in the current database for MyISAM tables
Michael [Tue, 22 Nov 2016 16:47:08 +0000 (16:47 +0000)]
Bugfix: We should only search in the current database for MyISAM tables

7 years agoMerge pull request #2960 from Hypolite/issue/#2955
Tobias Diekershoff [Tue, 22 Nov 2016 07:13:36 +0000 (08:13 +0100)]
Merge pull request #2960 from Hypolite/issue/#2955

ping.php Fix confusion between count vars and array vars

7 years agoMerge pull request #2954 from tobiasd/20161121-de
rabuzarus [Mon, 21 Nov 2016 21:05:23 +0000 (22:05 +0100)]
Merge pull request #2954 from tobiasd/20161121-de

DE, ES translation of the core THX Andreas and Albert

7 years agoping.php Fix confusion between count vars and array vars
Hypolite Petovan [Mon, 21 Nov 2016 21:02:36 +0000 (16:02 -0500)]
ping.php Fix confusion between count vars and array vars

7 years agoES translation of the core THX Albert
Tobias Diekershoff [Mon, 21 Nov 2016 17:35:17 +0000 (18:35 +0100)]
ES translation of the core THX Albert

7 years agoDE translation of the core THX Andreas
Tobias Diekershoff [Mon, 21 Nov 2016 10:45:19 +0000 (11:45 +0100)]
DE translation of the core THX Andreas

7 years agoMerge pull request #2896 from rabuzarus/0311_fix_photo_albums
Michael Vogel [Mon, 21 Nov 2016 03:04:36 +0000 (04:04 +0100)]
Merge pull request #2896 from rabuzarus/0311_fix_photo_albums

chache: check for valid serialized data + uncomment caching of contac…

7 years agoMerge pull request #2953 from tobiasd/20161120-regenmsgHackathon
rabuzarus [Sun, 20 Nov 2016 23:40:25 +0000 (00:40 +0100)]
Merge pull request #2953 from tobiasd/20161120-regenmsgHackathon

regenerated master messages.po files after Hackathon 2016

7 years agoregenerated master messages.po files after Hackathon 2016
Tobias Diekershoff [Sun, 20 Nov 2016 20:47:51 +0000 (21:47 +0100)]
regenerated master messages.po files after Hackathon 2016

7 years agoMerge pull request #2952 from annando/issue-2772
Tobias Diekershoff [Sun, 20 Nov 2016 16:56:05 +0000 (17:56 +0100)]
Merge pull request #2952 from annando/issue-2772

Issue 2772: Posts from pending contacts should be displayed as well.

7 years agoIssue 2772: Posts from pending contacts should be displayed as well.
Michael [Sun, 20 Nov 2016 16:52:57 +0000 (16:52 +0000)]
Issue 2772: Posts from pending contacts should be displayed as well.

7 years agocache: use unserialize(false)
rabuzarus [Sun, 20 Nov 2016 16:32:37 +0000 (17:32 +0100)]
cache: use unserialize(false)

7 years agoMerge pull request #2951 from tobiasd/20161120-mysql
Michael Vogel [Sun, 20 Nov 2016 16:09:49 +0000 (17:09 +0100)]
Merge pull request #2951 from tobiasd/20161120-mysql

add MySQL warning in admin panel

7 years agoMerge pull request #2950 from rabuzarus/berlin_fix_post_preview
Tobias Diekershoff [Sun, 20 Nov 2016 15:46:31 +0000 (16:46 +0100)]
Merge pull request #2950 from rabuzarus/berlin_fix_post_preview

Bugfix: preview has sometimes phantom mentions and tags

7 years agoscript is moved
Tobias Diekershoff [Sun, 20 Nov 2016 15:33:56 +0000 (16:33 +0100)]
script is moved

7 years agoadd a warning to the admin panel when the MySQL version is problematic
Tobias Diekershoff [Sun, 20 Nov 2016 15:32:38 +0000 (16:32 +0100)]
add a warning to the admin panel when the MySQL version is problematic

7 years agoBugfix: preview has sometimes phantom mentions and tags
rabuzarus [Sun, 20 Nov 2016 15:19:55 +0000 (16:19 +0100)]
Bugfix: preview has sometimes phantom mentions and tags

7 years agouse an array for warnings in admin panel
Tobias Diekershoff [Sun, 20 Nov 2016 15:14:09 +0000 (16:14 +0100)]
use an array for warnings in admin panel

7 years agoMerge pull request #2947 from annando/1611-nowarn-insecure
Tobias Diekershoff [Sun, 20 Nov 2016 15:00:29 +0000 (16:00 +0100)]
Merge pull request #2947 from annando/1611-nowarn-insecure

The warning if a group contains members of several network types can â€¦

7 years agoMerge pull request #2949 from silke/vagrant-1604
Tobias Diekershoff [Sun, 20 Nov 2016 14:39:31 +0000 (15:39 +0100)]
Merge pull request #2949 from silke/vagrant-1604

Added Vagrant for Ubuntu 16.04

7 years agoSwitched to a vagrant box that works for Ubuntu Xenial
Silke Meyer [Sun, 20 Nov 2016 14:32:57 +0000 (15:32 +0100)]
Switched to a vagrant box that works for Ubuntu Xenial

7 years agoVagrant does not download addons by default
Silke Meyer [Sun, 20 Nov 2016 14:32:17 +0000 (15:32 +0100)]
Vagrant does not download addons by default

7 years agoThe warning if a group contains members of several network types can now be supressed.
Michael [Sun, 20 Nov 2016 12:09:18 +0000 (12:09 +0000)]
The warning if a group contains members of several network types can now be supressed.

7 years agoMerge pull request #2945 from tobiasd/20161119-admindbwarn
Michael Vogel [Sun, 20 Nov 2016 11:38:52 +0000 (12:38 +0100)]
Merge pull request #2945 from tobiasd/20161119-admindbwarn

Show a warning message in the admin panel when MyISAM is still in use

7 years agomysql keywords
Tobias Diekershoff [Sun, 20 Nov 2016 09:44:54 +0000 (10:44 +0100)]
mysql keywords

7 years agoMerge pull request #2946 from annando/1611-bugfix-groups
Tobias Diekershoff [Sun, 20 Nov 2016 09:39:01 +0000 (10:39 +0100)]
Merge pull request #2946 from annando/1611-bugfix-groups

Bugfix: Filtering by group has to be done with the contact id in the thread table

7 years agoBugfix: Filtering by group has always to be done with the contact id in the thread...
Michael [Sun, 20 Nov 2016 09:24:56 +0000 (09:24 +0000)]
Bugfix: Filtering by group has always to be done with the contact id in the thread table

7 years agoShow a warning message in the admin panel when MyISAM is still in use
Tobias Diekershoff [Sun, 20 Nov 2016 08:50:14 +0000 (09:50 +0100)]
Show a warning message in the admin panel when MyISAM is still in use

7 years agoMerge pull request #2944 from annando/1611-bugfix-utf8
Tobias Diekershoff [Sun, 20 Nov 2016 08:44:38 +0000 (09:44 +0100)]
Merge pull request #2944 from annando/1611-bugfix-utf8

Avoid UTF8 warning in mod/proxy.php

7 years agoAvoid UTF8 warning in mod/proxy.php
Michael [Sun, 20 Nov 2016 08:30:30 +0000 (08:30 +0000)]
Avoid UTF8 warning in mod/proxy.php

7 years agoMerge pull request #2943 from rabuzarus/berlin_frio_fix_code_wrap
Tobias Diekershoff [Sun, 20 Nov 2016 05:38:45 +0000 (06:38 +0100)]
Merge pull request #2943 from rabuzarus/berlin_frio_fix_code_wrap

Bugfix: frio - use white-space: pre-wrap for code elements

7 years agofix indent
rabuzarus [Sun, 20 Nov 2016 01:07:58 +0000 (02:07 +0100)]
fix indent

7 years agoBugfix: frio - use white-space: pre-wrap for code elements
rabuzarus [Sun, 20 Nov 2016 00:51:32 +0000 (01:51 +0100)]
Bugfix: frio - use white-space: pre-wrap for code elements

7 years agoMerge pull request #2942 from annando/1611-avoid-warning
rabuzarus [Sun, 20 Nov 2016 00:37:20 +0000 (01:37 +0100)]
Merge pull request #2942 from annando/1611-avoid-warning

Avoid a warning with activated rendertime

7 years agoAvoid a warning with activated rendertime
Michael [Sat, 19 Nov 2016 23:41:53 +0000 (23:41 +0000)]
Avoid a warning with activated rendertime

7 years agoMerge pull request #2940 from annando/1611-dead-contacts
Tobias Diekershoff [Sat, 19 Nov 2016 21:59:57 +0000 (22:59 +0100)]
Merge pull request #2940 from annando/1611-dead-contacts

Mark contacts as dead or undead while transmitting and receiving messages

7 years agoMerge pull request #2930 from Hypolite/issue/#2925
Michael Vogel [Sat, 19 Nov 2016 20:57:57 +0000 (21:57 +0100)]
Merge pull request #2930 from Hypolite/issue/#2925

Overhauling proxy_url/Fix encoded ampersand

7 years agoMerge pull request #2939 from rabuzarus/berlin_frio_fix_match_wrapper_floating
Michael Vogel [Sat, 19 Nov 2016 20:55:40 +0000 (21:55 +0100)]
Merge pull request #2939 from rabuzarus/berlin_frio_fix_match_wrapper_floating

Bugfix: float for remote-friends-in-common wrapper

7 years agoMerge pull request #2941 from Hypolite/improvement/ping-php-json
Michael Vogel [Sat, 19 Nov 2016 20:40:31 +0000 (21:40 +0100)]
Merge pull request #2941 from Hypolite/improvement/ping-php-json

ping.php performance: fix typo

7 years agoMerge pull request #2936 from tobiasd/20161119-issue844
Michael Vogel [Sat, 19 Nov 2016 20:40:02 +0000 (21:40 +0100)]
Merge pull request #2936 from tobiasd/20161119-issue844

Additional info in registration request

7 years agoping.php performance: fix typo
Hypolite Petovan [Sat, 19 Nov 2016 20:23:36 +0000 (15:23 -0500)]
ping.php performance: fix typo

7 years agoBugfix: float for remote-friends-in-common wrapper
rabuzarus [Sat, 19 Nov 2016 20:14:28 +0000 (21:14 +0100)]
Bugfix: float for remote-friends-in-common wrapper

7 years agoMark contacts as dead or undead while transmitting and receiving messages
Michael [Sat, 19 Nov 2016 20:10:29 +0000 (20:10 +0000)]
Mark contacts as dead or undead while transmitting and receiving messages

7 years agoOverhauling proxy_url: use $shortpath for long URL in writemode
Hypolite Petovan [Sat, 19 Nov 2016 19:03:31 +0000 (14:03 -0500)]
Overhauling proxy_url: use $shortpath for long URL in writemode

7 years agoMerge pull request #2937 from rabuzarus/1811_jot_charackter_counter
Tobias Diekershoff [Sat, 19 Nov 2016 18:37:42 +0000 (19:37 +0100)]
Merge pull request #2937 from rabuzarus/1811_jot_charackter_counter

frio: add a very simple character counter to the jot

7 years agoMerge pull request #2935 from silke/deprecated-themes
Tobias Diekershoff [Sat, 19 Nov 2016 18:36:39 +0000 (19:36 +0100)]
Merge pull request #2935 from silke/deprecated-themes

Deprecated themes

7 years agoAdditional info in registration request
Tobias Diekershoff [Sat, 19 Nov 2016 17:22:49 +0000 (18:22 +0100)]
Additional info in registration request

7 years agoRemoves a number of deprecated themes
Silke Meyer [Sat, 19 Nov 2016 17:19:15 +0000 (18:19 +0100)]
Removes a number of deprecated themes

7 years agoMarked themes frost and frost-mobile as unsupported
Silke Meyer [Sat, 19 Nov 2016 17:17:21 +0000 (18:17 +0100)]
Marked themes frost and frost-mobile as unsupported

7 years agoVagrant: corrected hostnames
Silke Meyer [Sat, 19 Nov 2016 17:05:38 +0000 (18:05 +0100)]
Vagrant: corrected hostnames

7 years agoMerge pull request #2934 from tobiasd/develop
Michael Vogel [Sat, 19 Nov 2016 15:24:59 +0000 (16:24 +0100)]
Merge pull request #2934 from tobiasd/develop

DE update of the SSL doc

7 years agoAdapted documentation for Vagrant multiple machines
Silke Meyer [Sat, 19 Nov 2016 15:09:20 +0000 (16:09 +0100)]
Adapted documentation for Vagrant multiple machines

7 years agoVagrant: Allow to choose between Ubuntu 14.04 und 16.04
Silke Meyer [Sat, 19 Nov 2016 15:08:08 +0000 (16:08 +0100)]
Vagrant: Allow to choose between Ubuntu 14.04 und 16.04

7 years agoDE update of the SSL doc
Tobias Diekershoff [Sat, 19 Nov 2016 14:51:12 +0000 (15:51 +0100)]
DE update of the SSL doc

7 years agoMerge pull request #2931 from tobiasd/20161118-issue2926
Michael Vogel [Sat, 19 Nov 2016 14:21:06 +0000 (15:21 +0100)]
Merge pull request #2931 from tobiasd/20161118-issue2926

send email confirming pending registration #2916

7 years agoadded return value to doxygen header
Tobias Diekershoff [Sat, 19 Nov 2016 13:34:06 +0000 (14:34 +0100)]
added return value to doxygen header

7 years agoadded return value to doxygen header
Tobias Diekershoff [Sat, 19 Nov 2016 13:32:01 +0000 (14:32 +0100)]
added return value to doxygen header

7 years agoMerge pull request #2933 from silke/develop
Michael Vogel [Sat, 19 Nov 2016 13:03:06 +0000 (14:03 +0100)]
Merge pull request #2933 from silke/develop

Updated SSL documentation

7 years agoUpdated SSL documentation
Silke Meyer [Sat, 19 Nov 2016 12:28:45 +0000 (13:28 +0100)]
Updated SSL documentation

7 years agoMerge pull request #2927 from Hypolite/improvement/ping-php-json
Michael Vogel [Sat, 19 Nov 2016 12:23:10 +0000 (13:23 +0100)]
Merge pull request #2927 from Hypolite/improvement/ping-php-json

ping.php performance: Add JSON output

7 years agofrio: add a very simple character counter to the jot
rabuzarus [Fri, 18 Nov 2016 22:48:31 +0000 (23:48 +0100)]
frio: add a very simple character counter to the jot

7 years agosend email confirming pending registration #2916
Tobias Diekershoff [Fri, 18 Nov 2016 19:16:22 +0000 (20:16 +0100)]
send email confirming pending registration #2916

7 years agoMerge pull request #2929 from annando/1611-onepoll-priority
Tobias Diekershoff [Fri, 18 Nov 2016 06:20:27 +0000 (07:20 +0100)]
Merge pull request #2929 from annando/1611-onepoll-priority

Polling feeds is now done with a higher priority.

7 years agooverhauling proxy_url
Hypolite Petovan [Fri, 18 Nov 2016 04:08:00 +0000 (23:08 -0500)]
overhauling proxy_url

- Decode possible HTML entities in the input URL
- Add the safe extension for the shortpath as well
- Formatting
- Documentation

7 years agoPolling feeds is now done with a higher priority.
Michael [Thu, 17 Nov 2016 23:06:22 +0000 (23:06 +0000)]
Polling feeds is now done with a higher priority.

7 years agoMerge pull request #2928 from tobiasd/20161117-es
fabrixxm [Thu, 17 Nov 2016 08:10:18 +0000 (09:10 +0100)]
Merge pull request #2928 from tobiasd/20161117-es

ES translation of the core THX Albert

7 years agoES translation of the core THX Albert
Tobias Diekershoff [Thu, 17 Nov 2016 06:42:41 +0000 (07:42 +0100)]
ES translation of the core THX Albert

7 years agoping.php performance: Add JSON output
Hypolite Petovan [Thu, 17 Nov 2016 04:26:43 +0000 (23:26 -0500)]
ping.php performance: Add JSON output

- Added JSON/JSONP support
- Added XML backward-compatible output
- Updated main.js to handle JSON data
- Removed unused references to non-existant DOM elements

7 years agoMerge pull request #2924 from rabuzarus/1611_fix_comment_edit
Tobias Diekershoff [Wed, 16 Nov 2016 13:32:05 +0000 (14:32 +0100)]
Merge pull request #2924 from rabuzarus/1611_fix_comment_edit

Frio Bugfix: clear float at the end of comment-edit

7 years agoFrio Bugfix: clear float at the end of comment-edit
rabuzarus [Wed, 16 Nov 2016 13:19:09 +0000 (14:19 +0100)]
Frio Bugfix: clear float at the end of comment-edit

7 years agoMerge pull request #2923 from rabuzarus/1611_fix_NotificationsManager_unseen
Tobias Diekershoff [Wed, 16 Nov 2016 13:09:18 +0000 (14:09 +0100)]
Merge pull request #2923 from rabuzarus/1611_fix_NotificationsManager_unseen

Bugfix: avatar images for activty like was not shown on notifications page

7 years agoBugfix: avatar images for activty like was not shown notifications page
rabuzarus [Wed, 16 Nov 2016 12:21:13 +0000 (13:21 +0100)]
Bugfix: avatar images for activty like was not shown notifications page

7 years agoMerge pull request #2921 from rabuzarus/1611_fix_NotificationsManager_unseen
Michael Vogel [Wed, 16 Nov 2016 06:02:06 +0000 (07:02 +0100)]
Merge pull request #2921 from rabuzarus/1611_fix_NotificationsManager_unseen

Bugfix: seen status was not handled correcty on the notifications page

7 years agoMerge pull request #2920 from rabuzarus/1611_fix_remove_baseurl
Michael Vogel [Wed, 16 Nov 2016 05:57:28 +0000 (06:57 +0100)]
Merge pull request #2920 from rabuzarus/1611_fix_remove_baseurl

Bugfix: "remove_baseurl" wasn't work correct if called statically

7 years agoBugfix: seen status was not handled correcty on the notifications page
rabuzarus [Wed, 16 Nov 2016 03:57:55 +0000 (04:57 +0100)]
Bugfix: seen status was not handled correcty on the notifications page

7 years agoBugfix: "remove_baseurl" wasn't work correct if called statically
rabuzarus [Wed, 16 Nov 2016 00:14:14 +0000 (01:14 +0100)]
Bugfix: "remove_baseurl" wasn't work correct if called statically

7 years agoMerge pull request #2919 from annando/1611-ssl-plink
rabuzarus [Tue, 15 Nov 2016 23:33:39 +0000 (00:33 +0100)]
Merge pull request #2919 from annando/1611-ssl-plink

Bugfix: "remove_baseurl" accidentally normalized all links

7 years agoBugfix: "remove_baseurl" accidentally normalized all links
Michael [Tue, 15 Nov 2016 21:56:28 +0000 (21:56 +0000)]
Bugfix: "remove_baseurl" accidentally normalized all links

7 years agoMerge pull request #2917 from annando/issue-2914
fabrixxm [Tue, 15 Nov 2016 13:14:00 +0000 (14:14 +0100)]
Merge pull request #2917 from annando/issue-2914

Bugfix: Avoid warning when posting items and the worker isn't active

7 years agoBugfix: Avoid warning when posting items and the worker isn't active
Michael [Tue, 15 Nov 2016 11:52:01 +0000 (11:52 +0000)]
Bugfix: Avoid warning when posting items and the worker isn't active

7 years agoMerge pull request #2910 from annando/1611-slinky
Tobias Diekershoff [Tue, 15 Nov 2016 08:53:38 +0000 (09:53 +0100)]
Merge pull request #2910 from annando/1611-slinky

Several shorteners doesn't work anymore

7 years agoMerge pull request #2911 from annando/1611-well-formatted-uri
Tobias Diekershoff [Tue, 15 Nov 2016 08:53:14 +0000 (09:53 +0100)]
Merge pull request #2911 from annando/1611-well-formatted-uri

URI of "remote self" are looking better now.

7 years agoAdded documentation
Michael [Tue, 15 Nov 2016 07:05:43 +0000 (07:05 +0000)]
Added documentation

7 years agoMerge pull request #2913 from rabuzarus/1411_fix_photo_permissions
Tobias Diekershoff [Mon, 14 Nov 2016 19:22:48 +0000 (20:22 +0100)]
Merge pull request #2913 from rabuzarus/1411_fix_photo_permissions

fix photos page permissions

7 years agofix photos page permissions
rabuzarus [Mon, 14 Nov 2016 17:49:51 +0000 (18:49 +0100)]
fix photos page permissions

7 years agoMerge pull request #2912 from sesom42/develop
Michael Vogel [Mon, 14 Nov 2016 09:37:22 +0000 (10:37 +0100)]
Merge pull request #2912 from sesom42/develop

fixes an sql syntax error in NotificationsManager

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Jens Tautenhahn [Mon, 14 Nov 2016 08:52:01 +0000 (09:52 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoRevert "count only version numbers starting with "numbers / dot or dash / numbers...
Jens Tautenhahn [Mon, 14 Nov 2016 08:48:19 +0000 (09:48 +0100)]
Revert "count only version numbers starting with "numbers / dot or dash / numbers" in federation statistics"

This reverts commit 7b5c5c0fa234852b7bc01621e1c9be5e1b5f92e1.

7 years agoURI of "remote self" are looking better now.
Michael [Mon, 14 Nov 2016 06:55:17 +0000 (06:55 +0000)]
URI of "remote self" are looking better now.