]> git.mxchange.org Git - friendica.git/log
friendica.git
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

7 years agoTypos
Tobias Diekershoff [Fri, 7 Jul 2017 18:54:26 +0000 (20:54 +0200)]
Typos

7 years agoMerge pull request #3564 from annando/1707-expire
Tobias Diekershoff [Fri, 7 Jul 2017 17:47:22 +0000 (19:47 +0200)]
Merge pull request #3564 from annando/1707-expire

Split expire.php in several processes / small worker changes

7 years agoMerge pull request #3568 from tobiasd/20170707-esde
Michael Vogel [Fri, 7 Jul 2017 16:56:26 +0000 (18:56 +0200)]
Merge pull request #3568 from tobiasd/20170707-esde

DE and ES translations

7 years agoOrder of semaphore processing
Alexandre Alapetite [Fri, 7 Jul 2017 16:26:43 +0000 (18:26 +0200)]
Order of semaphore processing

7 years agoMerge branch 'develop' into semaphore_warning
Alexandre Alapetite [Fri, 7 Jul 2017 15:49:52 +0000 (17:49 +0200)]
Merge branch 'develop' into semaphore_warning

7 years agoallow the admin to delete an item by GUID from the admin panel
Tobias Diekershoff [Fri, 7 Jul 2017 08:38:07 +0000 (10:38 +0200)]
allow the admin to delete an item by GUID from the admin panel

7 years agoadded template for delete item
Tobias Diekershoff [Fri, 7 Jul 2017 08:37:36 +0000 (10:37 +0200)]
added template for delete item

7 years agoDE and ES translations
Tobias Diekershoff [Fri, 7 Jul 2017 06:43:10 +0000 (08:43 +0200)]
DE and ES translations

7 years agoReplacing quotes around new directory link
RJ Madsen [Thu, 6 Jul 2017 21:56:18 +0000 (17:56 -0400)]
Replacing quotes around new directory link

7 years agoFixed minor spaces to tabs conversion
RJ Madsen [Thu, 6 Jul 2017 21:33:30 +0000 (17:33 -0400)]
Fixed minor spaces to tabs conversion

7 years agoSwitched to proper global directory instead of local directory
RJ Madsen [Thu, 6 Jul 2017 21:31:36 +0000 (17:31 -0400)]
Switched to proper global directory instead of local directory

7 years agore-named variable to match scheme
RJ Madsen [Thu, 6 Jul 2017 20:37:55 +0000 (16:37 -0400)]
re-named variable to match scheme

7 years agoConverted from space to tab indentation
RJ Madsen [Thu, 6 Jul 2017 19:27:03 +0000 (15:27 -0400)]
Converted from space to tab indentation

7 years agoAdded global directory link to the find people side panel
RJ Madsen [Thu, 6 Jul 2017 18:19:58 +0000 (14:19 -0400)]
Added global directory link to the find people side panel

7 years agoSplit expire.php in several processes / small worker changes
Michael [Thu, 6 Jul 2017 05:48:02 +0000 (05:48 +0000)]
Split expire.php in several processes / small worker changes

7 years agoMerge pull request #3559 from annando/some-more-poller
Tobias Diekershoff [Tue, 4 Jul 2017 06:38:38 +0000 (08:38 +0200)]
Merge pull request #3559 from annando/some-more-poller

The endless story "poller" just continues ;-)

7 years agoImproved logging
Michael [Tue, 4 Jul 2017 05:31:42 +0000 (05:31 +0000)]
Improved logging

7 years agoOnly kill the first stale process
Michael [Tue, 4 Jul 2017 05:01:06 +0000 (05:01 +0000)]
Only kill the first stale process

7 years agoMerge pull request #3561 from annando/issue-3560
rabuzarus [Mon, 3 Jul 2017 23:09:01 +0000 (01:09 +0200)]
Merge pull request #3561 from annando/issue-3560

Guests should be able to use the search as well

7 years agoGuests should be able to use the search as well
Michael [Mon, 3 Jul 2017 20:48:44 +0000 (20:48 +0000)]
Guests should be able to use the search as well

7 years agoMerge pull request #3556 from tobiasd/20170628-doc
Michael Vogel [Sun, 2 Jul 2017 19:45:12 +0000 (21:45 +0200)]
Merge pull request #3556 from tobiasd/20170628-doc

small additions to the docs

7 years agoAvoid the killing of the wrong process
Michael [Sun, 2 Jul 2017 19:43:36 +0000 (19:43 +0000)]
Avoid the killing of the wrong process

7 years agoUpdate INSTALL.txt
Tobias Diekershoff [Sun, 2 Jul 2017 19:39:15 +0000 (21:39 +0200)]
Update INSTALL.txt

7 years agoMerge pull request #3439 from tobiasd/20170506-token
Michael Vogel [Sun, 2 Jul 2017 19:31:53 +0000 (21:31 +0200)]
Merge pull request #3439 from tobiasd/20170506-token

[Needs OpenID testing] Add token to register

7 years agoUpdate Install.md
Tobias Diekershoff [Sun, 2 Jul 2017 05:52:07 +0000 (07:52 +0200)]
Update Install.md

7 years agoUpdate INSTALL.txt
Tobias Diekershoff [Sun, 2 Jul 2017 05:51:31 +0000 (07:51 +0200)]
Update INSTALL.txt

7 years agoDegrade priority step by step
Michael [Sat, 1 Jul 2017 18:55:12 +0000 (18:55 +0000)]
Degrade priority step by step

7 years agoPrevent soon killings
Michael [Fri, 30 Jun 2017 23:08:08 +0000 (23:08 +0000)]
Prevent soon killings

7 years agoUpdate Install.md
Tobias Diekershoff [Fri, 30 Jun 2017 11:16:29 +0000 (13:16 +0200)]
Update Install.md

7 years agoUpdate INSTALL.txt
Tobias Diekershoff [Fri, 30 Jun 2017 11:15:47 +0000 (13:15 +0200)]
Update INSTALL.txt

7 years agoMerge pull request #3557 from tobiasd/20170630-de
Michael Vogel [Fri, 30 Jun 2017 09:46:58 +0000 (11:46 +0200)]
Merge pull request #3557 from tobiasd/20170630-de

DE translations

7 years agoLet there be...
Tobias Diekershoff [Fri, 30 Jun 2017 08:38:11 +0000 (10:38 +0200)]
Let there be...

7 years agoDE translations
Tobias Diekershoff [Fri, 30 Jun 2017 06:24:45 +0000 (08:24 +0200)]
DE translations

7 years agoJust found the handbrake ...
Michael [Thu, 29 Jun 2017 21:19:31 +0000 (21:19 +0000)]
Just found the handbrake ...

7 years agoMerge remote-tracking branch 'upstream/develop' into some-more-poller
Michael [Thu, 29 Jun 2017 05:41:06 +0000 (05:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into some-more-poller

7 years agoSome more performance stuff
Michael [Thu, 29 Jun 2017 05:40:02 +0000 (05:40 +0000)]
Some more performance stuff

7 years agoMerge pull request #3555 from annando/semaphore-fix
Tobias Diekershoff [Thu, 29 Jun 2017 04:40:32 +0000 (06:40 +0200)]
Merge pull request #3555 from annando/semaphore-fix

Hopefully a fix for semaphore warnings and for the missing field

7 years agoMore general check for semaphore
Alexandre Alapetite [Wed, 28 Jun 2017 20:38:22 +0000 (22:38 +0200)]
More general check for semaphore

7 years agoHopefully a fix for semaphore warnings and for the missing field in the workerqueue
Michael [Wed, 28 Jun 2017 18:31:33 +0000 (18:31 +0000)]
Hopefully a fix for semaphore warnings and for the missing field in the workerqueue

7 years agoHide semaphone warning
Alexandre Alapetite [Wed, 28 Jun 2017 16:38:18 +0000 (18:38 +0200)]
Hide semaphone warning

https://github.com/friendica/friendica/issues/3553

7 years agoAdded a short usage example of exportet profile data
Tobias Diekershoff [Wed, 28 Jun 2017 13:11:35 +0000 (15:11 +0200)]
Added a short usage example of exportet profile data

7 years agoadded a short note about backups to the INSTALL files
Tobias Diekershoff [Wed, 28 Jun 2017 13:10:57 +0000 (15:10 +0200)]
added a short note about backups to the INSTALL files

7 years agoMerge pull request #3551 from annando/semaphore-locking
Tobias Diekershoff [Wed, 28 Jun 2017 06:54:07 +0000 (08:54 +0200)]
Merge pull request #3551 from annando/semaphore-locking

Semaphore based locking and hopefully the fix for the workerqueue

7 years agoMerge pull request #3539 from AndyHee/20170617-admin_settings
Michael Vogel [Wed, 28 Jun 2017 05:24:41 +0000 (07:24 +0200)]
Merge pull request #3539 from AndyHee/20170617-admin_settings

Corrected names for counting/ listing account-types in admin panel

7 years agoSemaphore based locking and hopefully the fix for the workerqueue
Michael [Wed, 28 Jun 2017 04:53:11 +0000 (04:53 +0000)]
Semaphore based locking and hopefully the fix for the workerqueue

7 years agoMerge pull request #3550 from AndyHee/20170626-en_GBUS_translations
Tobias Diekershoff [Mon, 26 Jun 2017 11:29:50 +0000 (13:29 +0200)]
Merge pull request #3550 from AndyHee/20170626-en_GBUS_translations

EN-GB and EN-US Translations

7 years agoEN-GB and EN-US Translations
AndyHee [Mon, 26 Jun 2017 11:03:32 +0000 (18:03 +0700)]
EN-GB and EN-US Translations

7 years agoMerge pull request #3549 from AndyHee/20170626-DE_translations
rabuzarus [Mon, 26 Jun 2017 10:43:37 +0000 (12:43 +0200)]
Merge pull request #3549 from AndyHee/20170626-DE_translations

DE Translation

7 years agoDE Translation
AndyHee [Mon, 26 Jun 2017 10:43:00 +0000 (17:43 +0700)]
DE Translation

7 years agoDE Translation
AndyHee [Mon, 26 Jun 2017 10:31:12 +0000 (17:31 +0700)]
DE Translation

7 years agoMerge pull request #3547 from tobiasd/20170626-Vagrantfile
rabuzarus [Mon, 26 Jun 2017 09:45:03 +0000 (11:45 +0200)]
Merge pull request #3547 from tobiasd/20170626-Vagrantfile

Vagrant > 1.5 needs an additional parameter

7 years agoMerge pull request #3548 from tobiasd/20170626-de
rabuzarus [Mon, 26 Jun 2017 09:44:51 +0000 (11:44 +0200)]
Merge pull request #3548 from tobiasd/20170626-de

DE translations

7 years agoDE translations
Tobias Diekershoff [Mon, 26 Jun 2017 09:07:18 +0000 (11:07 +0200)]
DE translations

7 years agoVagrant > 1.5 needs an additional parameter
Tobias Diekershoff [Mon, 26 Jun 2017 09:03:28 +0000 (11:03 +0200)]
Vagrant > 1.5 needs an additional parameter