]>
git.mxchange.org Git - friendica.git/log
gerhard6380 [Wed, 31 May 2017 08:33:35 +0000 (10:33 +0200)]
corrected change
sorry, I should not change code late in the evening when I am already tired.
Michael [Wed, 31 May 2017 03:46:43 +0000 (03:46 +0000)]
Better handling of timeout issues while probing
Hypolite Petovan [Wed, 31 May 2017 02:20:14 +0000 (22:20 -0400)]
Merge pull request #3504 from gerhard6380/patch-1
API: link to original page for feed posts
gerhard6380 [Wed, 31 May 2017 00:24:09 +0000 (02:24 +0200)]
API: link to original page for feed posts
link to original page added to html output of feed posts if body is empty
Michael [Tue, 30 May 2017 21:07:28 +0000 (21:07 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Hypolite Petovan [Tue, 30 May 2017 18:18:15 +0000 (14:18 -0400)]
Merge pull request #3503 from annando/1705-bugfix-poller
Bugfix: The poller often couldn't store the pid in the workerqueue
Michael [Tue, 30 May 2017 13:20:29 +0000 (13:20 +0000)]
Bugfix: The poller often couldn't store the pid in the workerqueue
Michael [Mon, 29 May 2017 20:54:43 +0000 (20:54 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Tobias Diekershoff [Mon, 29 May 2017 19:40:50 +0000 (21:40 +0200)]
Merge pull request #3502 from annando/1705-self-probing
Don't quit if the own host cannot be reached via SSL
Michael [Mon, 29 May 2017 19:14:44 +0000 (19:14 +0000)]
Don't quit if the own host cannot be reached via SSL
Tobias Diekershoff [Mon, 29 May 2017 09:18:42 +0000 (11:18 +0200)]
Merge pull request #3500 from AndyHee/3.5.2rc
Update EN-GB translation core
Andy H3 [Mon, 29 May 2017 08:36:12 +0000 (15:36 +0700)]
Update strings.php
Andy H3 [Mon, 29 May 2017 08:35:04 +0000 (15:35 +0700)]
Update messages.po
Hypolite Petovan [Mon, 29 May 2017 06:34:58 +0000 (02:34 -0400)]
Merge pull request #3499 from tobiasd/
20170529 -de
DE translations
Tobias Diekershoff [Mon, 29 May 2017 05:21:42 +0000 (07:21 +0200)]
DE translations
Hypolite Petovan [Sun, 28 May 2017 17:04:55 +0000 (13:04 -0400)]
Merge pull request #3498 from tobiasd/
20170528 -messages
regenerated master messages.po file
Tobias Diekershoff [Sun, 28 May 2017 09:10:48 +0000 (11:10 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 28 May 2017 09:07:45 +0000 (11:07 +0200)]
Merge pull request #3497 from annando/1705-dbstructure-admin-page
The database structure is now checked ad the admin summary page
Michael [Sun, 28 May 2017 08:39:41 +0000 (08:39 +0000)]
The database structure is now checked ad the admin summary page
Tobias Diekershoff [Sun, 28 May 2017 06:10:03 +0000 (08:10 +0200)]
Merge pull request #3496 from annando/1705-more-logging
Some more logging for the probing
Michael [Sun, 28 May 2017 05:38:12 +0000 (05:38 +0000)]
Some more logging for the probing
Michael Vogel [Sun, 28 May 2017 04:54:09 +0000 (06:54 +0200)]
Merge pull request #3495 from Hypolite/bug/profiles-missing-socgraph
Restore missing socgraph include in profiles
Hypolite Petovan [Sun, 28 May 2017 01:47:54 +0000 (21:47 -0400)]
Restore missing include
Hypolite Petovan [Sat, 27 May 2017 19:52:16 +0000 (15:52 -0400)]
Merge pull request #3494 from tobiasd/
20170527 -ru
PT-BR and RU translations
Tobias Diekershoff [Sat, 27 May 2017 07:35:23 +0000 (09:35 +0200)]
RU translations THX Frederico Gonçalves Guimarães
Tobias Diekershoff [Sat, 27 May 2017 07:09:41 +0000 (09:09 +0200)]
RU translations THX pztrn
Michael [Thu, 25 May 2017 06:03:08 +0000 (06:03 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Tobias Diekershoff [Thu, 25 May 2017 06:00:22 +0000 (08:00 +0200)]
MySQL version and annando
Hypolite Petovan [Thu, 25 May 2017 03:09:46 +0000 (23:09 -0400)]
Merge pull request #3492 from annando/1705-push-priority
Bugfix: pubsubpublish has always to be called with high priority
Michael [Thu, 25 May 2017 03:04:26 +0000 (03:04 +0000)]
Bugfix: pubsubpublish has always to be called with high priority
Michael [Wed, 24 May 2017 20:55:12 +0000 (20:55 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Tobias Diekershoff [Wed, 24 May 2017 16:42:42 +0000 (18:42 +0200)]
typo
Tobias Diekershoff [Wed, 24 May 2017 16:18:43 +0000 (18:18 +0200)]
Merge pull request #3491 from annando/1705-priorities
Improved priorities for handling the item expiration
Tobias Diekershoff [Wed, 24 May 2017 12:46:27 +0000 (14:46 +0200)]
regen credits
Tobias Diekershoff [Wed, 24 May 2017 12:33:43 +0000 (14:33 +0200)]
core
Michael [Wed, 24 May 2017 10:36:44 +0000 (10:36 +0000)]
Priority needs to be integer
Michael [Wed, 24 May 2017 08:21:05 +0000 (08:21 +0000)]
Minimal poll intervall
Michael [Wed, 24 May 2017 06:29:47 +0000 (06:29 +0000)]
Optimized priorities for the automated expiring of items
Michael Vogel [Wed, 24 May 2017 05:20:07 +0000 (07:20 +0200)]
Merge pull request #3481 from Hypolite/issue/#3480
Remove special case of "url" from insertFormatting
Hypolite Petovan [Tue, 23 May 2017 21:21:10 +0000 (17:21 -0400)]
Merge pull request #3488 from annando/ptobr-no-cache
Probing via web frontend shouldn't use the cache.
Michael [Tue, 23 May 2017 20:19:39 +0000 (20:19 +0000)]
some more logging
Michael [Tue, 23 May 2017 19:38:47 +0000 (19:38 +0000)]
Probing via web frontend shouldn't use the cache.
Tobias Diekershoff [Tue, 23 May 2017 19:00:44 +0000 (21:00 +0200)]
Merge pull request #3487 from AndyHee/3.5.2rc
EN-GB Translation
Andy H3 [Tue, 23 May 2017 15:05:34 +0000 (22:05 +0700)]
EN-GB Translation
Andy H3 [Tue, 23 May 2017 13:05:40 +0000 (20:05 +0700)]
Create messages.po
British English localisation that aims to address various issues in the source, including consistent spelling, appropriate level of capitalisation, succinct wording, and user-centred phrases at basic level.
Tobias Diekershoff [Tue, 23 May 2017 10:14:09 +0000 (12:14 +0200)]
addons
Tobias Diekershoff [Tue, 23 May 2017 09:54:00 +0000 (11:54 +0200)]
issues for the CHANGELOG
Michael [Tue, 23 May 2017 08:13:37 +0000 (08:13 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Hypolite Petovan [Tue, 23 May 2017 07:14:41 +0000 (03:14 -0400)]
Merge pull request #3484 from annando/fix-empty-author
Bugfix OStatus: Avoid empty author data
Tobias Diekershoff [Tue, 23 May 2017 06:16:34 +0000 (08:16 +0200)]
Merge pull request #3485 from annando/range-curl
Bugfix ParseUrl: Only fetch a range to avoid memory issues
Michael [Tue, 23 May 2017 06:07:02 +0000 (06:07 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Michael [Tue, 23 May 2017 05:28:51 +0000 (05:28 +0000)]
Bugfix OStatus: Avoid empty author data
Michael [Tue, 23 May 2017 05:26:22 +0000 (05:26 +0000)]
Bugfix ParseUrl: Only fetch a range to avoid memory issues
Michael Vogel [Mon, 22 May 2017 15:55:28 +0000 (17:55 +0200)]
Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix
Bugfix: fix frio's event dropdown color
rabuzarus [Mon, 22 May 2017 12:44:51 +0000 (14:44 +0200)]
Bugfix: fix frio's event dropdown color
Roland Häder [Mon, 22 May 2017 11:09:07 +0000 (13:09 +0200)]
Continued a bit:
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Mon, 22 May 2017 11:04:30 +0000 (13:04 +0200)]
Some improvements
Signed-off-by: Roland Häder <roland@mxchange.org>
Hypolite Petovan [Sun, 21 May 2017 17:41:28 +0000 (13:41 -0400)]
Remove special case of "url" from insertFormatting
Hypolite Petovan [Sun, 21 May 2017 17:40:51 +0000 (13:40 -0400)]
Standards
Michael Vogel [Sat, 20 May 2017 20:13:37 +0000 (22:13 +0200)]
Merge pull request #3479 from Hypolite/3.5.2rc
Frio: Fix Hubzilla scrollToItem
Michael [Sat, 20 May 2017 20:08:24 +0000 (20:08 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
Michael [Sat, 20 May 2017 20:02:06 +0000 (20:02 +0000)]
Central item expiration routine for external items
Hypolite Petovan [Sat, 20 May 2017 17:18:20 +0000 (13:18 -0400)]
Frio: Fix hubzilla scrollToItem
- Removed unnecessary item guid truncation
Michael Vogel [Sat, 20 May 2017 10:22:54 +0000 (12:22 +0200)]
Merge pull request #3478 from tobiasd/
20170520 -dedocs
DE documentation
Tobias Diekershoff [Sat, 20 May 2017 09:24:28 +0000 (11:24 +0200)]
removed some more files from doc/de
Tobias Diekershoff [Sat, 20 May 2017 09:22:47 +0000 (11:22 +0200)]
removed de/andfinally from docs
Tobias Diekershoff [Sat, 20 May 2017 09:20:31 +0000 (11:20 +0200)]
links in BBCode docs
Tobias Diekershoff [Sat, 20 May 2017 09:12:51 +0000 (11:12 +0200)]
links in Account Basics
Hypolite Petovan [Sat, 20 May 2017 01:48:11 +0000 (21:48 -0400)]
Merge pull request #3477 from beardyunixer/doco-without-making-a-shite-of-it-this-time
Update doco
Thomas Willingham [Sat, 20 May 2017 01:38:01 +0000 (02:38 +0100)]
Switch image URL to master branch
Hypolite Petovan [Sat, 20 May 2017 00:50:01 +0000 (20:50 -0400)]
Merge pull request #3476 from rabuzarus/20170519_-_frio_not_experimental
Frio: remove experimental flag + rise version number to 0.8
Thomas Willingham [Fri, 19 May 2017 20:37:45 +0000 (21:37 +0100)]
Update doco
rabuzarus [Fri, 19 May 2017 11:32:55 +0000 (13:32 +0200)]
Frio: some correction in grammar/expression - thx Hypolite
Hypolite Petovan [Fri, 19 May 2017 11:28:56 +0000 (07:28 -0400)]
Merge pull request #3475 from annando/bugfix-profile-change
Bugfix: Timeout problems when saving profile settings
rabuzarus [Fri, 19 May 2017 11:18:27 +0000 (13:18 +0200)]
Frio: a word was missing in the README
rabuzarus [Fri, 19 May 2017 11:11:30 +0000 (13:11 +0200)]
Frio: remove experimental flag + rise version number to 0.8
Michael [Fri, 19 May 2017 06:01:13 +0000 (06:01 +0000)]
Bugfix: Timeout problems when saving profile settings
Hypolite Petovan [Wed, 17 May 2017 19:58:17 +0000 (15:58 -0400)]
Merge pull request #3474 from annando/bugfix-mail
Bugfix Diaspora: We exited with the wrong return values
Michael [Wed, 17 May 2017 19:56:38 +0000 (19:56 +0000)]
Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail
Michael [Wed, 17 May 2017 19:25:30 +0000 (19:25 +0000)]
Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short
Roland Häder [Wed, 17 May 2017 16:42:40 +0000 (18:42 +0200)]
Opps, missed them
Signed-off-by: Roland Häder <roland@mxchange.org>
Hypolite Petovan [Wed, 17 May 2017 16:42:34 +0000 (12:42 -0400)]
Merge pull request #3471 from annando/issue-3309
Issue 3309: Avatar update should work now
Roland Häder [Wed, 17 May 2017 16:37:51 +0000 (18:37 +0200)]
Fixes:
- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:34:16 +0000 (18:34 +0200)]
removed TODOs
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:28:00 +0000 (18:28 +0200)]
Continued:
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:09:34 +0000 (18:09 +0200)]
reverted comments, but maintained multi-line comment.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:05:18 +0000 (18:05 +0200)]
Some CR applied:
- removed todo
- added explanation
- merged next if() block with already merged
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:02:32 +0000 (18:02 +0200)]
tpzo fixed again ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 13:40:50 +0000 (15:40 +0200)]
tpzo fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 13:31:46 +0000 (15:31 +0200)]
opps, went in again? :-/
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 13:28:01 +0000 (15:28 +0200)]
improved some comments
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Haeder [Tue, 4 Apr 2017 17:48:25 +0000 (19:48 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 4 Apr 2017 17:48:13 +0000 (19:48 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 4 Apr 2017 17:47:32 +0000 (19:47 +0200)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
Tobias Diekershoff [Wed, 17 May 2017 09:27:37 +0000 (11:27 +0200)]
Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2
Frio: better UX for aside bar
Michael [Wed, 17 May 2017 06:07:55 +0000 (06:07 +0000)]
It is better this way
Michael [Wed, 17 May 2017 06:00:20 +0000 (06:00 +0000)]
Use the contact picture instead of the profile picture
Hypolite Petovan [Wed, 17 May 2017 00:37:34 +0000 (20:37 -0400)]
Merge pull request #3469 from Quix0r/rewrites/coding-convention-split2-5-2
Coding convention applied split 2-5-2 (of 2-14-2)
Michael [Tue, 16 May 2017 21:21:54 +0000 (21:21 +0000)]
Issue 3309: Avatar update should work now
Roland Häder [Tue, 16 May 2017 18:13:08 +0000 (20:13 +0200)]
opps, re-introduced this out-dated code by mistake
Signed-off-by: Roland Häder <roland@mxchange.org>