]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #3620 from tobiasd/20170809-issue3592
Michael Vogel [Wed, 9 Aug 2017 21:46:00 +0000 (23:46 +0200)]
Merge pull request #3620 from tobiasd/20170809-issue3592

add a switch to the Markdown parser for using hard line wraps

7 years agosome simplification
Tobias Diekershoff [Wed, 9 Aug 2017 17:19:42 +0000 (19:19 +0200)]
some simplification

7 years agoadd more space
Tobias Diekershoff [Wed, 9 Aug 2017 17:18:38 +0000 (19:18 +0200)]
add more space

7 years agoit is hardwrap for consistency
Tobias Diekershoff [Wed, 9 Aug 2017 14:10:09 +0000 (16:10 +0200)]
it is hardwrap for consistency

7 years agoadd a switch to the Markdown parser for using hard line breaks (issue 3592)
Tobias Diekershoff [Wed, 9 Aug 2017 14:04:53 +0000 (16:04 +0200)]
add a switch to the Markdown parser for using hard line breaks (issue 3592)

7 years agoMerge pull request #3619 from annando/dba-connect
Tobias Diekershoff [Wed, 9 Aug 2017 06:13:57 +0000 (08:13 +0200)]
Merge pull request #3619 from annando/dba-connect

DBA: Do a fallback to other db functions on problems

7 years agoDBA: Do a fallback to other db functions on problems
Michael [Wed, 9 Aug 2017 06:02:48 +0000 (06:02 +0000)]
DBA: Do a fallback to other db functions on problems

7 years agoMerge pull request #3618 from annando/mysqli-fix
Tobias Diekershoff [Tue, 8 Aug 2017 07:32:26 +0000 (09:32 +0200)]
Merge pull request #3618 from annando/mysqli-fix

Quickfix for MYSQLi (prepared statement problem)

7 years agoQuickfix for MYSQLi (prepared statement problem)
Michael [Tue, 8 Aug 2017 06:07:04 +0000 (06:07 +0000)]
Quickfix for MYSQLi (prepared statement problem)

7 years agoMerge pull request #3617 from ddorian1/develop
Michael Vogel [Sat, 5 Aug 2017 13:42:29 +0000 (15:42 +0200)]
Merge pull request #3617 from ddorian1/develop

Catch exceptions in PDO constructor

7 years agoCatch exceptions in PDO constructor
Johannes Schwab [Fri, 4 Aug 2017 09:01:29 +0000 (11:01 +0200)]
Catch exceptions in PDO constructor

7 years agoMerge pull request #3613 from annando/some-ostatus
Tobias Diekershoff [Thu, 3 Aug 2017 06:01:04 +0000 (08:01 +0200)]
Merge pull request #3613 from annando/some-ostatus

Speed up of OStatus transmission/Ignoring "created" with remote self

7 years agoMerge pull request #3614 from annando/avoid-warnings
Tobias Diekershoff [Thu, 3 Aug 2017 05:58:16 +0000 (07:58 +0200)]
Merge pull request #3614 from annando/avoid-warnings

Avoid some PHP warnings, no functional changes

7 years agoMerge pull request #3612 from tobiasd/20170802-issue2121
Michael Vogel [Thu, 3 Aug 2017 05:54:35 +0000 (07:54 +0200)]
Merge pull request #3612 from tobiasd/20170802-issue2121

invitations

7 years agoAvoid some PHP warnings, no functional changes
Michael [Thu, 3 Aug 2017 05:50:44 +0000 (05:50 +0000)]
Avoid some PHP warnings, no functional changes

7 years agoSpeed up of OStatus transmission/Ignoring "created" with remote self
Michael [Thu, 3 Aug 2017 05:42:44 +0000 (05:42 +0000)]
Speed up of OStatus transmission/Ignoring "created" with remote self

7 years agoelse is sufficient here
Tobias Diekershoff [Thu, 3 Aug 2017 05:23:05 +0000 (07:23 +0200)]
else is sufficient here

7 years agono global directory URL defined?
Tobias Diekershoff [Thu, 3 Aug 2017 05:22:29 +0000 (07:22 +0200)]
no global directory URL defined?

7 years agoMerge pull request #3609 from rabuzarus/20170802_-_probe_camelcase
Michael Vogel [Wed, 2 Aug 2017 17:45:37 +0000 (19:45 +0200)]
Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase

fix some method names (camelcase) in Probe.php and Lock.php

7 years agoMerge pull request #3610 from rabuzarus/20170802_-_frio_subthread
Tobias Diekershoff [Wed, 2 Aug 2017 15:24:35 +0000 (17:24 +0200)]
Merge pull request #3610 from rabuzarus/20170802_-_frio_subthread

Add subthread to frio (needs reanabling the frio theme)

7 years agoAdd subthread to frio (needs reanabling the frio theme)
rabuzarus [Wed, 2 Aug 2017 13:52:11 +0000 (15:52 +0200)]
Add subthread to frio (needs reanabling the frio theme)

7 years agofix some method names (camelcase) in Probe.php and Lock.php
rabuzarus [Wed, 2 Aug 2017 11:09:42 +0000 (13:09 +0200)]
fix some method names (camelcase) in Probe.php and Lock.php

7 years agouse /servers instead of /siteinfo for the directory link in invitations
Tobias Diekershoff [Wed, 2 Aug 2017 06:48:01 +0000 (08:48 +0200)]
use /servers instead of /siteinfo for the directory link in invitations

7 years agouse /servers instead of /siteinfo for the directory link in invitations
Tobias Diekershoff [Wed, 2 Aug 2017 06:47:09 +0000 (08:47 +0200)]
use /servers instead of /siteinfo for the directory link in invitations

7 years agoMerge pull request #3608 from tobiasd/20170801-issue2998
Michael Vogel [Tue, 1 Aug 2017 20:18:00 +0000 (22:18 +0200)]
Merge pull request #3608 from tobiasd/20170801-issue2998

Show contacts personal message in local profile

7 years agoShow contacts personal message in local profile
Tobias Diekershoff [Tue, 1 Aug 2017 15:47:13 +0000 (17:47 +0200)]
Show contacts personal message in local profile

7 years agoMerge pull request #3607 from annando/issue-3536
Tobias Diekershoff [Tue, 1 Aug 2017 04:51:41 +0000 (06:51 +0200)]
Merge pull request #3607 from annando/issue-3536

Issue 3536. Now likes aren't show anymore on the community page

7 years agoThis is a fix for issue 3536. Now likes aren't show anymore on the community page.
Michael [Mon, 31 Jul 2017 19:29:43 +0000 (19:29 +0000)]
This is a fix for issue 3536. Now likes aren't show anymore on the community page.

7 years agoMerge pull request #3606 from AndyHee/20170731-en_USGB_translations
Tobias Diekershoff [Mon, 31 Jul 2017 17:35:04 +0000 (19:35 +0200)]
Merge pull request #3606 from AndyHee/20170731-en_USGB_translations

Update US and GB Translations

7 years agoUpdate US and GB Translations
AndyHee [Mon, 31 Jul 2017 14:18:22 +0000 (21:18 +0700)]
Update US and GB Translations

7 years agoMerge pull request #3605 from annando/better-endless-scroll
Tobias Diekershoff [Mon, 31 Jul 2017 09:09:45 +0000 (11:09 +0200)]
Merge pull request #3605 from annando/better-endless-scroll

Endless scroll now avoids showing the same items

7 years agoEndless scroll now avoids showing the same items
Michael [Mon, 31 Jul 2017 06:04:37 +0000 (06:04 +0000)]
Endless scroll now avoids showing the same items

7 years agoMerge pull request #3604 from annando/bugfix-acl
Tobias Diekershoff [Thu, 27 Jul 2017 15:03:46 +0000 (17:03 +0200)]
Merge pull request #3604 from annando/bugfix-acl

Bugfix: The ACL lookup had its problems after the last changes

7 years agoBugfix: The ACL lookup had its problems after the last changes
Michael [Thu, 27 Jul 2017 14:02:25 +0000 (14:02 +0000)]
Bugfix: The ACL lookup had its problems after the last changes

7 years agoMerge pull request #3603 from annando/fix-ostatus
Tobias Diekershoff [Wed, 26 Jul 2017 05:27:37 +0000 (07:27 +0200)]
Merge pull request #3603 from annando/fix-ostatus

Fix incomplete webfinger data for OStatus

7 years agoFix incomplete webfinger data for OStatus
Michael [Tue, 25 Jul 2017 21:46:14 +0000 (21:46 +0000)]
Fix incomplete webfinger data for OStatus

7 years agoMerge pull request #3602 from annando/1707-expiration
Tobias Diekershoff [Sun, 23 Jul 2017 20:21:30 +0000 (22:21 +0200)]
Merge pull request #3602 from annando/1707-expiration

Bugfix: the expiration check in item_store now works again

7 years agoMerge pull request #3600 from tobiasd/20170723-doc
Michael Vogel [Sun, 23 Jul 2017 20:07:06 +0000 (22:07 +0200)]
Merge pull request #3600 from tobiasd/20170723-doc

include the delete item page in the docs for the admin panel

7 years agoMerge pull request #3601 from tobiasd/20170723-credits
Michael Vogel [Sun, 23 Jul 2017 20:06:39 +0000 (22:06 +0200)]
Merge pull request #3601 from tobiasd/20170723-credits

regen credits

7 years agoBugfix: the expiration check in item_store now works again
Michael [Sun, 23 Jul 2017 19:59:29 +0000 (19:59 +0000)]
Bugfix: the expiration check in item_store now works again

7 years agoregen credits
Tobias Diekershoff [Sun, 23 Jul 2017 17:54:08 +0000 (19:54 +0200)]
regen credits

7 years agoinclude the delete item page in the docs for the admin panel
Tobias Diekershoff [Sun, 23 Jul 2017 17:51:03 +0000 (19:51 +0200)]
include the delete item page in the docs for the admin panel

7 years agoMerge pull request #3597 from annando/1707-acl-separator
Tobias Diekershoff [Sun, 23 Jul 2017 08:27:40 +0000 (10:27 +0200)]
Merge pull request #3597 from annando/1707-acl-separator

In the acl there is now a separation between groups, forums and contacts

7 years agoMerge pull request #3598 from annando/1707-expiration
Tobias Diekershoff [Sun, 23 Jul 2017 08:26:58 +0000 (10:26 +0200)]
Merge pull request #3598 from annando/1707-expiration

Check general expiration time at item storing as well

7 years agoIn the acl there is now a separation between groups, forums and contacts
Michael [Sun, 23 Jul 2017 06:49:31 +0000 (06:49 +0000)]
In the acl there is now a separation between groups, forums and contacts

7 years agoCheck general expiration time at item storing as well
Michael [Sun, 23 Jul 2017 05:51:55 +0000 (05:51 +0000)]
Check general expiration time at item storing as well

7 years agoMerge pull request #3595 from annando/1707-realpath
Tobias Diekershoff [Sat, 22 Jul 2017 07:32:29 +0000 (09:32 +0200)]
Merge pull request #3595 from annando/1707-realpath

Better use a wrapper

7 years agoBetter use a wrapper
Michael [Sat, 22 Jul 2017 06:43:04 +0000 (06:43 +0000)]
Better use a wrapper

7 years agoMerge pull request #3594 from annando/1707-realpath
Tobias Diekershoff [Sat, 22 Jul 2017 06:14:08 +0000 (08:14 +0200)]
Merge pull request #3594 from annando/1707-realpath

Use the realpath for the handling with (temporary) paths

7 years agoUse the realpath for the handling with (temporary) paths
Michael [Sat, 22 Jul 2017 05:50:25 +0000 (05:50 +0000)]
Use the realpath for the handling with (temporary) paths

7 years agoMerge pull request #3591 from zotlabs/spammy_server_detection
Michael Vogel [Fri, 21 Jul 2017 17:37:11 +0000 (19:37 +0200)]
Merge pull request #3591 from zotlabs/spammy_server_detection

reduce the number of network fetches for server detection of hubzilla…

7 years agoUpdate socgraph.php
Michael Vogel [Fri, 21 Jul 2017 17:36:13 +0000 (19:36 +0200)]
Update socgraph.php

Two little style changes

7 years agoreduce the number of network fetches for server detection of hubzilla/red systems...
zotlabs [Thu, 20 Jul 2017 00:56:40 +0000 (17:56 -0700)]
reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes.

7 years agoMerge pull request #3590 from annando/1707-bugfixes
Tobias Diekershoff [Wed, 19 Jul 2017 15:06:01 +0000 (17:06 +0200)]
Merge pull request #3590 from annando/1707-bugfixes

Fix crash with expiration, false logger constant, no empty postings

7 years agoFix crash with expiration, false logger constant, no empty postings
Michael [Wed, 19 Jul 2017 05:51:39 +0000 (05:51 +0000)]
Fix crash with expiration, false logger constant, no empty postings

7 years agoMerge pull request #3587 from annando/1706-ostatus-attach
Tobias Diekershoff [Mon, 17 Jul 2017 20:38:56 +0000 (22:38 +0200)]
Merge pull request #3587 from annando/1706-ostatus-attach

Attached picture from OStatus posts are now displayed

7 years agoOnly show the attachment elements if there are one.
Michael [Mon, 17 Jul 2017 19:49:58 +0000 (19:49 +0000)]
Only show the attachment elements if there are one.

7 years agoAttachments now look fine.
Michael [Mon, 17 Jul 2017 19:38:15 +0000 (19:38 +0000)]
Attachments now look fine.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Michael [Sat, 15 Jul 2017 10:36:56 +0000 (10:36 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

7 years agoMerge pull request #3585 from annando/bugfix-like-signature
Tobias Diekershoff [Sat, 15 Jul 2017 06:22:27 +0000 (08:22 +0200)]
Merge pull request #3585 from annando/bugfix-like-signature

Bugfix: Signatures for likes hadn't been stored

7 years agoBugfix: Signatures for likes hadn't been stored
Michael [Sat, 15 Jul 2017 04:03:50 +0000 (04:03 +0000)]
Bugfix: Signatures for likes hadn't been stored

7 years agoThe attached image has now a class
Michael [Sat, 15 Jul 2017 04:02:12 +0000 (04:02 +0000)]
The attached image has now a class

7 years agoMerge pull request #3584 from tobiasd/20170714-missingstring
Michael Vogel [Fri, 14 Jul 2017 20:48:27 +0000 (22:48 +0200)]
Merge pull request #3584 from tobiasd/20170714-missingstring

there was a string not marked for translation

7 years agothere was a string not marked for translation
Tobias Diekershoff [Fri, 14 Jul 2017 13:21:08 +0000 (15:21 +0200)]
there was a string not marked for translation

7 years agoMerge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Michael [Thu, 13 Jul 2017 20:38:18 +0000 (20:38 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

Conflicts:
include/text.php

7 years agoMerge pull request #3580 from annando/issue-3571-2
Tobias Diekershoff [Thu, 13 Jul 2017 06:34:59 +0000 (08:34 +0200)]
Merge pull request #3580 from annando/issue-3571-2

Reworked "get_contact"

7 years agoMerge pull request #3582 from annando/duplicate-error
Tobias Diekershoff [Thu, 13 Jul 2017 06:30:20 +0000 (08:30 +0200)]
Merge pull request #3582 from annando/duplicate-error

Avoid duplicate database errors when storing the conversations

7 years agoMerge pull request #3581 from annando/bugfix-markdown
Tobias Diekershoff [Thu, 13 Jul 2017 06:29:04 +0000 (08:29 +0200)]
Merge pull request #3581 from annando/bugfix-markdown

Bugfix: Some special characters weren't converted correctly

7 years agoAvoid duplicate database errors when storing the conversations
Michael [Thu, 13 Jul 2017 06:00:53 +0000 (06:00 +0000)]
Avoid duplicate database errors when storing the conversations

7 years agoBugfix: Some special characters weren't converted correctly
Michael [Thu, 13 Jul 2017 05:57:37 +0000 (05:57 +0000)]
Bugfix: Some special characters weren't converted correctly

7 years agoFixed error reporting
Michael [Wed, 12 Jul 2017 08:14:36 +0000 (08:14 +0000)]
Fixed error reporting

7 years agoMerge pull request #3579 from tobiasd/20170712-de
Michael Vogel [Wed, 12 Jul 2017 06:29:10 +0000 (08:29 +0200)]
Merge pull request #3579 from tobiasd/20170712-de

DE translations

7 years agoDE translations
Tobias Diekershoff [Wed, 12 Jul 2017 06:26:26 +0000 (08:26 +0200)]
DE translations

7 years agoUpdate existing contact records with data from probing
Michael [Wed, 12 Jul 2017 06:07:22 +0000 (06:07 +0000)]
Update existing contact records with data from probing

7 years agoProcess all data that we can fetch via probing
Michael [Wed, 12 Jul 2017 05:56:35 +0000 (05:56 +0000)]
Process all data that we can fetch via probing

7 years agoMerge remote-tracking branch 'upstream/develop' into issue-3571-2
Michael [Wed, 12 Jul 2017 05:41:58 +0000 (05:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into issue-3571-2

7 years agoMerge pull request #3578 from annando/probe-warning
Tobias Diekershoff [Wed, 12 Jul 2017 05:21:31 +0000 (07:21 +0200)]
Merge pull request #3578 from annando/probe-warning

Avoid "Invalid argument" warning in probing.

7 years agodatabase logging now works for database errors
Michael [Tue, 11 Jul 2017 19:14:49 +0000 (19:14 +0000)]
database logging now works for database errors

7 years agoIssue 3571: Reworked "get_contact" function
Michael [Tue, 11 Jul 2017 18:32:35 +0000 (18:32 +0000)]
Issue 3571: Reworked "get_contact" function

7 years agoAvoid "Invalid argument" warning in probing.
Michael [Tue, 11 Jul 2017 17:34:38 +0000 (17:34 +0000)]
Avoid "Invalid argument" warning in probing.

7 years agoMerge pull request #3577 from annando/2in1
Tobias Diekershoff [Tue, 11 Jul 2017 06:31:39 +0000 (08:31 +0200)]
Merge pull request #3577 from annando/2in1

Issue 3571 and Diaspora mail bugfix

7 years agoMerge pull request #3576 from tobiasd/20170710-messages
Michael Vogel [Tue, 11 Jul 2017 03:58:43 +0000 (05:58 +0200)]
Merge pull request #3576 from tobiasd/20170710-messages

regenerated master messages.po file

7 years agoIssue 3571 and Diaspora mail bugfix
Michael [Mon, 10 Jul 2017 22:35:32 +0000 (22:35 +0000)]
Issue 3571 and Diaspora mail bugfix

7 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 10 Jul 2017 16:59:59 +0000 (18:59 +0200)]
regenerated master messages.po file

7 years agoMerge pull request #3569 from tobiasd/20170702-delete
Michael Vogel [Mon, 10 Jul 2017 16:44:19 +0000 (18:44 +0200)]
Merge pull request #3569 from tobiasd/20170702-delete

delete item from admin panel

7 years agoMerge pull request #3573 from irhen/issue-3529-fix-mega-age
Michael Vogel [Mon, 10 Jul 2017 16:43:05 +0000 (18:43 +0200)]
Merge pull request #3573 from irhen/issue-3529-fix-mega-age

fix big age

7 years agouse drop_item and some magic
Tobias Diekershoff [Mon, 10 Jul 2017 12:55:40 +0000 (14:55 +0200)]
use drop_item and some magic

7 years agois empty check
irhen [Mon, 10 Jul 2017 11:17:06 +0000 (14:17 +0300)]
is empty check

7 years agoMerge pull request #3575 from annando/dfrn-update-copy
Tobias Diekershoff [Sun, 9 Jul 2017 08:17:22 +0000 (10:17 +0200)]
Merge pull request #3575 from annando/dfrn-update-copy

DFRN: Update the public item copy as well

7 years agoMerge pull request #3574 from annando/further-expire-split
Tobias Diekershoff [Sun, 9 Jul 2017 08:15:34 +0000 (10:15 +0200)]
Merge pull request #3574 from annando/further-expire-split

Split the delete process into a separate expire process

7 years agoDFRN: Update the public item copy as well
Michael [Sun, 9 Jul 2017 04:29:35 +0000 (04:29 +0000)]
DFRN: Update the public item copy as well

7 years agoMerge pull request #3570 from beardyunixer/boot
Michael Vogel [Sun, 9 Jul 2017 03:56:03 +0000 (05:56 +0200)]
Merge pull request #3570 from beardyunixer/boot

Fix/workaround weird load order issue.

7 years agoMerge pull request #3572 from deantownsley/contactfix_basic
Michael Vogel [Sun, 9 Jul 2017 03:55:19 +0000 (05:55 +0200)]
Merge pull request #3572 from deantownsley/contactfix_basic

Only delete uid=0 entries when cleaning up extra public entries

7 years agoSplit the delete process into a separate expire process
Michael [Sun, 9 Jul 2017 03:37:20 +0000 (03:37 +0000)]
Split the delete process into a separate expire process

7 years agofix big age
irhen [Sat, 8 Jul 2017 20:30:30 +0000 (23:30 +0300)]
fix big age

7 years agoMerge pull request #3554 from Alkarex/semaphore_warning
Michael Vogel [Sat, 8 Jul 2017 16:32:07 +0000 (18:32 +0200)]
Merge pull request #3554 from Alkarex/semaphore_warning

Hide semaphore warning

7 years agoFix/workaround weird load order issue.
Thomas Willingham [Sat, 8 Jul 2017 15:25:13 +0000 (16:25 +0100)]
Fix/workaround weird load order issue.

7 years agoOnly delete uid=0 entries when cleaning up extra public entries
Dean Townsley [Sat, 8 Jul 2017 14:55:40 +0000 (09:55 -0500)]
Only delete uid=0 entries when cleaning up extra public entries

This delete can inadvertently remove contacts from normal users under
some conditions.  Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.

7 years agoUse unset after unlock
Alexandre Alapetite [Sat, 8 Jul 2017 09:03:41 +0000 (11:03 +0200)]
Use unset after unlock

https://github.com/friendica/friendica/pull/3554#issuecomment-313741392

7 years agoMerge pull request #3567 from rjm6823/develop
Tobias Diekershoff [Sat, 8 Jul 2017 06:36:54 +0000 (08:36 +0200)]
Merge pull request #3567 from rjm6823/develop

Contacts page directory link