]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #4614 from annando/dir-own-contact
Hypolite Petovan [Sat, 17 Mar 2018 12:42:51 +0000 (08:42 -0400)]
Merge pull request #4614 from annando/dir-own-contact

Fix: In the contact search you had been able to delete your own contact

6 years agoMerge pull request #4619 from annando/missing-doxygen
rabuzarus [Sat, 17 Mar 2018 09:47:03 +0000 (10:47 +0100)]
Merge pull request #4619 from annando/missing-doxygen

Added missing doxygen header

6 years agoAdded missing doxygen header
Michael [Sat, 17 Mar 2018 09:42:29 +0000 (09:42 +0000)]
Added missing doxygen header

6 years agoMerge pull request #4618 from tobiasd/210180317-htconfig
Michael Vogel [Sat, 17 Mar 2018 09:40:09 +0000 (10:40 +0100)]
Merge pull request #4618 from tobiasd/210180317-htconfig

activate the frio theme during installation

6 years agoMerge pull request #4617 from annando/issue-4611
Tobias Diekershoff [Sat, 17 Mar 2018 09:29:55 +0000 (10:29 +0100)]
Merge pull request #4617 from annando/issue-4611

Possible fix issue 4611: Don't write to database before it is created

6 years agoIf we aren't connected to the database, we shouldn't return "true" on connect
Michael [Sat, 17 Mar 2018 09:21:06 +0000 (09:21 +0000)]
If we aren't connected to the database, we shouldn't return "true" on connect

6 years agoactivate the frio theme during installation
Tobias Diekershoff [Sat, 17 Mar 2018 09:14:19 +0000 (10:14 +0100)]
activate the frio theme during installation

6 years agoPossible fix issue 4611: Don't write to database before it is created
Michael [Sat, 17 Mar 2018 09:04:38 +0000 (09:04 +0000)]
Possible fix issue 4611: Don't write to database before it is created

6 years agoIssue 4610: The query is simplified and shouldn't fail again
Michael [Sat, 17 Mar 2018 07:50:49 +0000 (07:50 +0000)]
Issue 4610: The query is simplified and shouldn't fail again

6 years agoSimplified query
Michael [Sat, 17 Mar 2018 07:12:28 +0000 (07:12 +0000)]
Simplified query

6 years agoIgnore obvious garbage results
Michael [Sat, 17 Mar 2018 06:54:47 +0000 (06:54 +0000)]
Ignore obvious garbage results

6 years agoMerge pull request #4615 from tobiasd/20180317-credits
Michael Vogel [Sat, 17 Mar 2018 06:27:43 +0000 (07:27 +0100)]
Merge pull request #4615 from tobiasd/20180317-credits

regen credits

6 years agoregen credits
Tobias Diekershoff [Sat, 17 Mar 2018 06:22:22 +0000 (07:22 +0100)]
regen credits

6 years agoFix: In the contact search you had been able to delete your own contact
Michael [Sat, 17 Mar 2018 06:17:32 +0000 (06:17 +0000)]
Fix: In the contact search you had been able to delete your own contact

6 years agoMerge pull request #4612 from annando/dfrn-batch-notify
Hypolite Petovan [Fri, 16 Mar 2018 20:52:38 +0000 (16:52 -0400)]
Merge pull request #4612 from annando/dfrn-batch-notify

Fix: Private transmission via Diaspora to Friendica servers

6 years agoFix: Private transmission via Diaspora to Friendica servers
Michael [Fri, 16 Mar 2018 20:34:28 +0000 (20:34 +0000)]
Fix: Private transmission via Diaspora to Friendica servers

6 years agoMerge pull request #4607 from annando/dfrn-relationship
Hypolite Petovan [Fri, 16 Mar 2018 07:55:34 +0000 (03:55 -0400)]
Merge pull request #4607 from annando/dfrn-relationship

DFRN: The relationship between contacts can now be changed afterwards

6 years agoAdded to-do
Michael [Fri, 16 Mar 2018 07:27:18 +0000 (07:27 +0000)]
Added to-do

6 years agoWe now change relationships not only for OStatus contacts
Michael [Fri, 16 Mar 2018 06:58:54 +0000 (06:58 +0000)]
We now change relationships not only for OStatus contacts

6 years agoDFRN: The relationship between contacts can now be changed afterwards
Michael [Fri, 16 Mar 2018 06:43:10 +0000 (06:43 +0000)]
DFRN: The relationship between contacts can now be changed afterwards

6 years agoMerge pull request #4603 from annando/pleroma-like
Hypolite Petovan [Thu, 15 Mar 2018 21:42:53 +0000 (17:42 -0400)]
Merge pull request #4603 from annando/pleroma-like

OStatus: Likes from Pleroma will now work

6 years agoOStatus: Likes from Pleroma will now work
Michael [Thu, 15 Mar 2018 21:33:28 +0000 (21:33 +0000)]
OStatus: Likes from Pleroma will now work

6 years agoMerge pull request #4602 from tobiasd/20180316-installdoc
Hypolite Petovan [Thu, 15 Mar 2018 20:27:04 +0000 (16:27 -0400)]
Merge pull request #4602 from tobiasd/20180316-installdoc

php-zip module is needed for composer

6 years agophp-zip module is needed for composer
Tobias Diekershoff [Thu, 15 Mar 2018 19:40:22 +0000 (20:40 +0100)]
php-zip module is needed for composer

6 years agoMerge pull request #4598 from MrPetovan/spoiler-cache
Michael Vogel [Thu, 15 Mar 2018 09:29:35 +0000 (10:29 +0100)]
Merge pull request #4598 from MrPetovan/spoiler-cache

Fix for CW: Items weren't cached (alt)

6 years agoAdd rendred-hash to put_item_in_cache todo
Hypolite Petovan [Thu, 15 Mar 2018 07:23:11 +0000 (03:23 -0400)]
Add rendred-hash to put_item_in_cache todo

6 years agoEnsure the item body stays the same in put_item_in_cache()
Hypolite Petovan [Thu, 15 Mar 2018 06:13:00 +0000 (02:13 -0400)]
Ensure the item body stays the same in put_item_in_cache()

- Add documentation

6 years agoFix for CW: Items weren't cached
Hypolite Petovan [Thu, 15 Mar 2018 05:32:04 +0000 (01:32 -0400)]
Fix for CW: Items weren't cached

6 years agoMerge pull request #4596 from annando/attachment-encode
Hypolite Petovan [Wed, 14 Mar 2018 22:59:25 +0000 (18:59 -0400)]
Merge pull request #4596 from annando/attachment-encode

Attachment encode

6 years agoThe attachment text had already been in HTML and mustn't be converted again
Michael [Wed, 14 Mar 2018 22:51:14 +0000 (22:51 +0000)]
The attachment text had already been in HTML and mustn't be converted again

6 years agoMerge pull request #4593 from annando/fix-ostatus
Hypolite Petovan [Wed, 14 Mar 2018 22:46:21 +0000 (18:46 -0400)]
Merge pull request #4593 from annando/fix-ostatus

OStatus: Fixed communication issues with deleted contacts

6 years agoRemove commented code
Michael [Wed, 14 Mar 2018 22:31:52 +0000 (22:31 +0000)]
Remove commented code

6 years agoRemove unused description
Michael [Wed, 14 Mar 2018 22:30:05 +0000 (22:30 +0000)]
Remove unused description

6 years agoThere is now a "content-warning" field
Michael [Wed, 14 Mar 2018 22:28:35 +0000 (22:28 +0000)]
There is now a "content-warning" field

6 years agoAvoid double encoding of the attachment content
Michael [Wed, 14 Mar 2018 21:47:24 +0000 (21:47 +0000)]
Avoid double encoding of the attachment content

6 years agoMerge pull request #4595 from annando/empty-contact
Hypolite Petovan [Wed, 14 Mar 2018 21:00:43 +0000 (17:00 -0400)]
Merge pull request #4595 from annando/empty-contact

Avoid an error in OnePoll when the contact was "null".

6 years ago$contact isn't called by reference anymore
Michael [Wed, 14 Mar 2018 20:53:03 +0000 (20:53 +0000)]
$contact isn't called by reference anymore

6 years agoAvoid an error in OnePoll when the contact was "null".
Michael [Wed, 14 Mar 2018 19:47:14 +0000 (19:47 +0000)]
Avoid an error in OnePoll when the contact was "null".

6 years agoAdd the nsfw removal behind a config switch
Michael [Wed, 14 Mar 2018 07:13:17 +0000 (07:13 +0000)]
Add the nsfw removal behind a config switch

6 years agoFix: subscribing to the old followers hadn't worked
Michael [Wed, 14 Mar 2018 00:27:15 +0000 (00:27 +0000)]
Fix: subscribing to the old followers hadn't worked

6 years agoFix indentation
Michael [Tue, 13 Mar 2018 23:32:38 +0000 (23:32 +0000)]
Fix indentation

6 years ago"nsfw" at "content warning" content doesn't fit together
Michael [Tue, 13 Mar 2018 22:39:08 +0000 (22:39 +0000)]
"nsfw" at "content warning" content doesn't fit together

6 years agoPleroma with the Mastodon UI handles content warning different
Michael [Tue, 13 Mar 2018 21:58:05 +0000 (21:58 +0000)]
Pleroma with the Mastodon UI handles content warning different

6 years agoImproved logging
Michael [Tue, 13 Mar 2018 21:33:45 +0000 (21:33 +0000)]
Improved logging

6 years agoAdded logging
Michael [Tue, 13 Mar 2018 21:10:19 +0000 (21:10 +0000)]
Added logging

6 years agoCompletely reformatted and restructured code, using dba functions now.
Michael [Tue, 13 Mar 2018 21:03:56 +0000 (21:03 +0000)]
Completely reformatted and restructured code, using dba functions now.

6 years agoWe don't need the contact-id anymore
Michael [Tue, 13 Mar 2018 07:16:31 +0000 (07:16 +0000)]
We don't need the contact-id anymore

6 years agoOStatus: Fixed communication issues with deleted contacts
Michael [Tue, 13 Mar 2018 06:21:44 +0000 (06:21 +0000)]
OStatus: Fixed communication issues with deleted contacts

6 years agoMerge pull request #4589 from annando/issue-4369
Hypolite Petovan [Mon, 12 Mar 2018 12:09:08 +0000 (08:09 -0400)]
Merge pull request #4589 from annando/issue-4369

OStatus: Only posts from followers will be imported (Issue 4369)

6 years agoOStatus: Only posts from followers will be imported (Issue 4369)
Michael [Mon, 12 Mar 2018 10:45:40 +0000 (10:45 +0000)]
OStatus: Only posts from followers will be imported (Issue 4369)

6 years agoMerge pull request #4587 from annando/acl-thread
Tobias Diekershoff [Mon, 12 Mar 2018 06:55:23 +0000 (07:55 +0100)]
Merge pull request #4587 from annando/acl-thread

Fix: The acl lookup now works in multi threaded posts as well

6 years agoMerge pull request #4588 from annando/delegate-zero
Tobias Diekershoff [Mon, 12 Mar 2018 06:53:46 +0000 (07:53 +0100)]
Merge pull request #4588 from annando/delegate-zero

Fix: We have to be able to remove delegations as well

6 years agoFix: The acl lookup now works in multi threaded posts as well
Michael [Mon, 12 Mar 2018 04:51:27 +0000 (04:51 +0000)]
Fix: The acl lookup now works in multi threaded posts as well

6 years agoFix: We have to be able to remove delegations as well
Michael [Mon, 12 Mar 2018 04:50:07 +0000 (04:50 +0000)]
Fix: We have to be able to remove delegations as well

6 years agoMerge pull request #4586 from annando/issue-4115
Hypolite Petovan [Sun, 11 Mar 2018 22:31:28 +0000 (18:31 -0400)]
Merge pull request #4586 from annando/issue-4115

Issue 4115: Events are now formatted better for Diaspora

6 years agoIssue 4115: Events are now formatted better for Diaspora
Michael [Sun, 11 Mar 2018 21:10:36 +0000 (21:10 +0000)]
Issue 4115: Events are now formatted better for Diaspora

6 years agoMerge pull request #4585 from annando/forum-stuff
Hypolite Petovan [Sun, 11 Mar 2018 19:49:04 +0000 (15:49 -0400)]
Merge pull request #4585 from annando/forum-stuff

Fix: The ownership of forum items had been wrong

6 years agoFix: The ownership of forum items had been wrong
Michael [Sun, 11 Mar 2018 18:12:38 +0000 (18:12 +0000)]
Fix: The ownership of forum items had been wrong

6 years agoMerge pull request #4583 from tobiasd/20180311-doc2
Hypolite Petovan [Sun, 11 Mar 2018 17:09:39 +0000 (13:09 -0400)]
Merge pull request #4583 from tobiasd/20180311-doc2

Documentation about the Community Pages

6 years agocommunity pages
Tobias Diekershoff [Sun, 11 Mar 2018 16:41:56 +0000 (17:41 +0100)]
community pages

6 years agoMerge pull request #4582 from tobiasd/20180311-doc
Hypolite Petovan [Sun, 11 Mar 2018 16:35:12 +0000 (12:35 -0400)]
Merge pull request #4582 from tobiasd/20180311-doc

installation docs

6 years agono poormancron in the installs
Tobias Diekershoff [Sun, 11 Mar 2018 15:54:03 +0000 (16:54 +0100)]
no poormancron in the installs

6 years agoMerge pull request #4581 from annando/issue-4497
Hypolite Petovan [Sun, 11 Mar 2018 14:10:06 +0000 (10:10 -0400)]
Merge pull request #4581 from annando/issue-4497

Issue 4497: Forum feeds had been empty

6 years agoIssue 4497: Forum feeds had been empty
Michael [Sun, 11 Mar 2018 14:01:40 +0000 (14:01 +0000)]
Issue 4497: Forum feeds had been empty

6 years agoMerge pull request #4580 from annando/parent-password
Hypolite Petovan [Sun, 11 Mar 2018 13:42:56 +0000 (09:42 -0400)]
Merge pull request #4580 from annando/parent-password

Security: You have to enter the password of the parent for delegations

6 years agoMerge pull request #4579 from annando/fix-diaspora-link
Hypolite Petovan [Sun, 11 Mar 2018 13:41:12 +0000 (09:41 -0400)]
Merge pull request #4579 from annando/fix-diaspora-link

Links to Diaspora had sometimes been cut

6 years agoSecurity: You have to enter the password of the parent to delegate to this account
Michael [Sun, 11 Mar 2018 13:12:15 +0000 (13:12 +0000)]
Security: You have to enter the password of the parent to delegate to this account

6 years agoMerge pull request #4578 from annando/bugfix-directory
Hypolite Petovan [Sun, 11 Mar 2018 12:23:16 +0000 (08:23 -0400)]
Merge pull request #4578 from annando/bugfix-directory

Bugfix: Old dba function was used

6 years agoBugfix: Old dba function was used
Michael [Sun, 11 Mar 2018 12:19:41 +0000 (12:19 +0000)]
Bugfix: Old dba function was used

6 years agoShortener deactivated, due to Diaspora problems
Michael [Sun, 11 Mar 2018 12:16:17 +0000 (12:16 +0000)]
Shortener deactivated, due to Diaspora problems

6 years agoLinks to Diaspora had sometimes been cut
Michael [Sun, 11 Mar 2018 10:54:02 +0000 (10:54 +0000)]
Links to Diaspora had sometimes been cut

6 years agoMerge pull request #4576 from MrPetovan/bug/fix-attach-display
Michael Vogel [Sat, 10 Mar 2018 23:43:16 +0000 (00:43 +0100)]
Merge pull request #4576 from MrPetovan/bug/fix-attach-display

Formatting changes to Protocol/Feed

6 years agoFormatting changes to Protocol/Feed
Hypolite Petovan [Sat, 10 Mar 2018 23:35:24 +0000 (18:35 -0500)]
Formatting changes to Protocol/Feed

- Change attribute name condition
- Singularize $attributes variable name

6 years agoMerge pull request #4573 from MrPetovan/bug/fix-attach-display
Michael Vogel [Sat, 10 Mar 2018 23:34:26 +0000 (00:34 +0100)]
Merge pull request #4573 from MrPetovan/bug/fix-attach-display

Add support for Atom enclosure

6 years agoAdd support for Atom enclosure
Hypolite Petovan [Sat, 10 Mar 2018 17:40:21 +0000 (12:40 -0500)]
Add support for Atom enclosure

6 years agoMerge pull request #4570 from annando/issue-4556
Hypolite Petovan [Sat, 10 Mar 2018 02:07:37 +0000 (21:07 -0500)]
Merge pull request #4570 from annando/issue-4556

Issue 4556: Adding index hints to improve the notifications speed

6 years agoIssue 4556: Adding index hints to improve the notifications speed (hopefully)
Michael [Fri, 9 Mar 2018 22:53:19 +0000 (22:53 +0000)]
Issue 4556: Adding index hints to improve the notifications speed (hopefully)

6 years agoMerge pull request #4569 from annando/bugfix-diaspora-reshare
Hypolite Petovan [Fri, 9 Mar 2018 20:23:11 +0000 (15:23 -0500)]
Merge pull request #4569 from annando/bugfix-diaspora-reshare

Bugfix: Reshare with added content to Diaspora looked ugly

6 years agoBugfix: Reshare with added content to Diaspora looked ugly
Michael [Fri, 9 Mar 2018 20:04:31 +0000 (20:04 +0000)]
Bugfix: Reshare with added content to Diaspora looked ugly

6 years agoMerge pull request #4566 from MrPetovan/bug/fix-attach-display
Michael Vogel [Fri, 9 Mar 2018 13:17:30 +0000 (14:17 +0100)]
Merge pull request #4566 from MrPetovan/bug/fix-attach-display

Display attach with missing title

6 years agoMerge pull request #4568 from tobiasd/20180309-invites
Hypolite Petovan [Fri, 9 Mar 2018 13:01:14 +0000 (08:01 -0500)]
Merge pull request #4568 from tobiasd/20180309-invites

documentation of invitation based registration

6 years agoMerge pull request #4567 from annando/diaspora-key
Tobias Diekershoff [Fri, 9 Mar 2018 09:10:39 +0000 (10:10 +0100)]
Merge pull request #4567 from annando/diaspora-key

Diaspora: Avoid warning "supplied key param cannot be coerced  …"

6 years agohelp not doc
Tobias Diekershoff [Fri, 9 Mar 2018 09:06:53 +0000 (10:06 +0100)]
help not doc

6 years agodocumentation of invitation based registration
Tobias Diekershoff [Fri, 9 Mar 2018 08:53:08 +0000 (09:53 +0100)]
documentation of invitation based registration

6 years agoAdditional checks
Michael [Fri, 9 Mar 2018 05:38:15 +0000 (05:38 +0000)]
Additional checks

6 years agoDiaspora: Avoid warning "supplied key param cannot be coerced into a public key"
Michael [Fri, 9 Mar 2018 05:31:13 +0000 (05:31 +0000)]
Diaspora: Avoid warning "supplied key param cannot be coerced into a public key"

6 years agoDisplay attach with missing title
Hypolite Petovan [Fri, 9 Mar 2018 04:52:01 +0000 (23:52 -0500)]
Display attach with missing title

- Rework preg_match_all call to remove 3 indentation levels

6 years agoMerge pull request #4564 from annando/avoid-duplicate
Hypolite Petovan [Thu, 8 Mar 2018 23:22:18 +0000 (18:22 -0500)]
Merge pull request #4564 from annando/avoid-duplicate

Avoid SQL errors due to duplicate entries in the "participation" table

6 years agoMerge pull request #4563 from annando/bugfix-xml-class
Hypolite Petovan [Thu, 8 Mar 2018 21:10:27 +0000 (16:10 -0500)]
Merge pull request #4563 from annando/bugfix-xml-class

Bugfix: missing "use"

6 years agoAvoid SQL errors due to duplicate entries in the "participation" table
Michael [Thu, 8 Mar 2018 21:04:11 +0000 (21:04 +0000)]
Avoid SQL errors due to duplicate entries in the "participation" table

6 years agoBugfix: missing "use"
Michael [Thu, 8 Mar 2018 20:48:00 +0000 (20:48 +0000)]
Bugfix: missing "use"

6 years agoMerge pull request #4559 from tobiasd/20160307-lng
Hypolite Petovan [Wed, 7 Mar 2018 17:15:52 +0000 (12:15 -0500)]
Merge pull request #4559 from tobiasd/20160307-lng

translations (DE, EN-GB, EN-US, ZH-CN)

6 years agoupdate for DE translation
Tobias Diekershoff [Wed, 7 Mar 2018 16:32:45 +0000 (17:32 +0100)]
update for DE translation

6 years agoupdate to the en gb and us translations THX Andy H3
Tobias Diekershoff [Wed, 7 Mar 2018 16:30:08 +0000 (17:30 +0100)]
update to the en gb and us translations THX Andy H3

6 years agoupdate to the zh-cn translation THX 朱陈锬
Tobias Diekershoff [Wed, 7 Mar 2018 16:27:50 +0000 (17:27 +0100)]
update to the zh-cn translation THX 朱陈锬

6 years agoMerge pull request #4554 from annando/avoid-deflate
Tobias Diekershoff [Tue, 6 Mar 2018 08:52:12 +0000 (09:52 +0100)]
Merge pull request #4554 from annando/avoid-deflate

Fix: In combination with "showmore" long posts aren't shrinked anymore

6 years agoFix: In combination with "showmore" long posts aren't shrinked anymore every few...
Michael [Tue, 6 Mar 2018 07:12:58 +0000 (07:12 +0000)]
Fix: In combination with "showmore" long posts aren't shrinked anymore every few seconds

6 years agoMerge pull request #4553 from tobiasd/20160305-enzh
Michael Vogel [Mon, 5 Mar 2018 18:15:08 +0000 (19:15 +0100)]
Merge pull request #4553 from tobiasd/20160305-enzh

updates to the ZH CN, EN GB and EN US translations

6 years agoMerge pull request #4552 from tobiasd/20180305-messagespo
Michael Vogel [Mon, 5 Mar 2018 18:14:31 +0000 (19:14 +0100)]
Merge pull request #4552 from tobiasd/20180305-messagespo

regenerated master messages.po file

6 years agoupdates to the ZH CN, EN GB and EN US translations
Tobias Diekershoff [Mon, 5 Mar 2018 15:48:21 +0000 (16:48 +0100)]
updates to the ZH CN, EN GB and EN US translations