]>
git.mxchange.org Git - friendica.git/log
Michael [Tue, 6 Jun 2017 17:30:40 +0000 (17:30 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced
Tobias Diekershoff [Tue, 6 Jun 2017 10:22:06 +0000 (12:22 +0200)]
Friendica version 3.5.3dev
Tobias Diekershoff [Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)]
Merge branch 'master' into develop
Tobias Diekershoff [Tue, 6 Jun 2017 10:18:29 +0000 (12:18 +0200)]
Friendica version 3.5.2
Tobias Diekershoff [Tue, 6 Jun 2017 10:16:22 +0000 (12:16 +0200)]
Merge pull request #3486 from tobiasd/3.5.2-CHANGELOG
Tobias Diekershoff [Tue, 6 Jun 2017 07:27:25 +0000 (09:27 +0200)]
Merge pull request #3520 from AndyHee/3.5.2rc
Andy H3 [Tue, 6 Jun 2017 06:00:20 +0000 (13:00 +0700)]
Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php
Andy H3 [Tue, 6 Jun 2017 05:58:59 +0000 (12:58 +0700)]
Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po
Andy H3 [Tue, 6 Jun 2017 05:58:20 +0000 (12:58 +0700)]
Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php
Andy H3 [Tue, 6 Jun 2017 05:57:08 +0000 (12:57 +0700)]
Rename view/lang/en-GB/messages.po to view/lang/en-gb/messages.po
Michael Vogel [Tue, 6 Jun 2017 05:47:18 +0000 (07:47 +0200)]
Merge pull request #3519 from tobiasd/
20170606 -es
ES translation THX Albert
Tobias Diekershoff [Tue, 6 Jun 2017 05:22:28 +0000 (07:22 +0200)]
there can only be one annando
Tobias Diekershoff [Tue, 6 Jun 2017 05:20:37 +0000 (07:20 +0200)]
improved compatibility to MySQL version 5.7 for the CHANGELOG
Tobias Diekershoff [Tue, 6 Jun 2017 05:11:27 +0000 (07:11 +0200)]
ES translation THX Albert
Tobias Diekershoff [Tue, 6 Jun 2017 05:00:02 +0000 (07:00 +0200)]
Merge pull request #3490 from tobiasd/
20170524 -credits
regen credits
Tobias Diekershoff [Tue, 6 Jun 2017 04:57:46 +0000 (06:57 +0200)]
added EN-US to the translation list
Tobias Diekershoff [Tue, 6 Jun 2017 04:56:02 +0000 (06:56 +0200)]
Merge pull request #3518 from AndyHee/3.5.2rc
Andy H3 [Mon, 5 Jun 2017 15:22:16 +0000 (22:22 +0700)]
Update messages.po
Andy H3 [Mon, 5 Jun 2017 15:21:31 +0000 (22:21 +0700)]
Create strings.php
Andy H3 [Mon, 5 Jun 2017 15:20:27 +0000 (22:20 +0700)]
Create messages.po
Andy H3 [Mon, 5 Jun 2017 14:37:56 +0000 (21:37 +0700)]
Update strings.php
Andy H3 [Mon, 5 Jun 2017 14:36:26 +0000 (21:36 +0700)]
Update messages.po
Tobias Diekershoff [Mon, 5 Jun 2017 06:50:37 +0000 (08:50 +0200)]
it is June, and some additions
Tobias Diekershoff [Sun, 4 Jun 2017 18:06:05 +0000 (20:06 +0200)]
Merge pull request #3517 from annando/bugfix-curl
Michael [Sun, 4 Jun 2017 09:00:07 +0000 (09:00 +0000)]
It should be "e" not "p"
Michael [Sat, 3 Jun 2017 19:46:19 +0000 (19:46 +0000)]
The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions
Tobias Diekershoff [Sat, 3 Jun 2017 09:02:50 +0000 (11:02 +0200)]
Merge pull request #3514 from annando/worker-locking
Michael [Sat, 3 Jun 2017 07:25:01 +0000 (07:25 +0000)]
Fixed locking behaviour for the worker
Michael Vogel [Sat, 3 Jun 2017 06:01:04 +0000 (08:01 +0200)]
Merge pull request #3513 from Hypolite/bug/update-directory-url
Hypolite Petovan [Sat, 3 Jun 2017 02:15:43 +0000 (22:15 -0400)]
Update remaining "dir.friendi.ca" instances
Michael Vogel [Thu, 1 Jun 2017 12:57:09 +0000 (14:57 +0200)]
Merge pull request #3509 from rabuzarus/20170531_-_fix_notifications_intros
rabuzarus [Thu, 1 Jun 2017 10:47:47 +0000 (12:47 +0200)]
restructure the conditions if gnetwork and gaddr is empty
rabuzarus [Thu, 1 Jun 2017 09:44:59 +0000 (11:44 +0200)]
use get_contact_details_by_url() instead of Probe:uri()
rabuzarus [Wed, 31 May 2017 16:43:57 +0000 (18:43 +0200)]
use Probe:uri() instead of probe_url
rabuzarus [Wed, 31 May 2017 12:29:33 +0000 (14:29 +0200)]
Bugfix: don't probe for introduction if it is not necessary
rabuzarus [Wed, 31 May 2017 11:07:23 +0000 (13:07 +0200)]
Merge pull request #3505 from annando/1705-probe-timeout
Michael Vogel [Wed, 31 May 2017 09:03:28 +0000 (11:03 +0200)]
Merge pull request #3508 from gerhard6380/patch-1
gerhard6380 [Wed, 31 May 2017 08:33:35 +0000 (10:33 +0200)]
corrected change
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
gerhard6380 [Wed, 31 May 2017 00:24:09 +0000 (02:24 +0200)]
API: link to original page for feed posts
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
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
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
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
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
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
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
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
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
Hypolite Petovan [Tue, 23 May 2017 21:21:10 +0000 (17:21 -0400)]
Merge pull request #3488 from annando/ptobr-no-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
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
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
Tobias Diekershoff [Tue, 23 May 2017 06:16:34 +0000 (08:16 +0200)]
Merge pull request #3485 from annando/range-curl
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
rabuzarus [Mon, 22 May 2017 12:44:51 +0000 (14:44 +0200)]
Bugfix: fix frio's event dropdown color
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
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
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
projects / friendica.git / log