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

6 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 5 Mar 2018 15:38:01 +0000 (16:38 +0100)]
regenerated master messages.po file

6 years agoMerge pull request #4547 from annando/multiple-accounts
Hypolite Petovan [Sun, 4 Mar 2018 22:59:51 +0000 (17:59 -0500)]
Merge pull request #4547 from annando/multiple-accounts

Fix: Multiple accounts per mail address are allowed

6 years agoFix: Multiple accounts per mail address are allowed when not explicit forbidden
Michael [Sun, 4 Mar 2018 22:23:52 +0000 (22:23 +0000)]
Fix: Multiple accounts per mail address are allowed when not explicit forbidden

6 years agoMerge pull request #4546 from annando/twidere-crash
Hypolite Petovan [Sun, 4 Mar 2018 19:58:08 +0000 (14:58 -0500)]
Merge pull request #4546 from annando/twidere-crash

Bugfix: Avoid that Twidere is crashing

6 years agoBugfix: Avoid that Twidere is crashing
Michael [Sun, 4 Mar 2018 19:25:02 +0000 (19:25 +0000)]
Bugfix: Avoid that Twidere is crashing

6 years agoMerge pull request #4545 from rabuzarus/20180304_-_localize_datepicker
Hypolite Petovan [Sun, 4 Mar 2018 14:07:31 +0000 (09:07 -0500)]
Merge pull request #4545 from rabuzarus/20180304_-_localize_datepicker

localize the datepicker

6 years agolocalize the datepicker
rabuzarus [Sun, 4 Mar 2018 13:56:51 +0000 (14:56 +0100)]
localize the datepicker

6 years agoMerge pull request #4544 from annando/no-cache-maintenance
Hypolite Petovan [Sun, 4 Mar 2018 13:29:33 +0000 (08:29 -0500)]
Merge pull request #4544 from annando/no-cache-maintenance

Bugfix: Don't cache when looking for maintenance mode

6 years agoBugfix: Don't cache when looking for maintenance mode
Michael [Sun, 4 Mar 2018 13:01:46 +0000 (13:01 +0000)]
Bugfix: Don't cache when looking for maintenance mode

6 years agoMerge pull request #4542 from AndyHee/3.6-rc
Tobias Diekershoff [Sun, 4 Mar 2018 09:05:41 +0000 (10:05 +0100)]
Merge pull request #4542 from AndyHee/3.6-rc

Corrected typo

6 years agoCorrected typo
AndyHee [Sun, 4 Mar 2018 08:07:34 +0000 (15:07 +0700)]
Corrected typo

6 years agoMerge pull request #4541 from rabuzarus/20180303_-_fix_directory_search
Hypolite Petovan [Sat, 3 Mar 2018 19:13:51 +0000 (14:13 -0500)]
Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search

fix page counter in directory module

6 years agodirectory - use dba::select_first()
rabuzarus [Sat, 3 Mar 2018 19:08:41 +0000 (20:08 +0100)]
directory - use dba::select_first()

6 years agofix page counter in directory module
rabuzarus [Sat, 3 Mar 2018 18:31:15 +0000 (19:31 +0100)]
fix page counter in directory module

6 years agoMerge pull request #4539 from tobiasd/20180303-docsDeadkinks
Hypolite Petovan [Sat, 3 Mar 2018 15:29:06 +0000 (10:29 -0500)]
Merge pull request #4539 from tobiasd/20180303-docsDeadkinks

removed dead link

6 years agoremoved dead link
Tobias Diekershoff [Sat, 3 Mar 2018 14:47:36 +0000 (15:47 +0100)]
removed dead link

6 years agoMerge pull request #4536 from MrPetovan/bug/fix-countable-warning
Tobias Diekershoff [Sat, 3 Mar 2018 14:39:28 +0000 (15:39 +0100)]
Merge pull request #4536 from MrPetovan/bug/fix-countable-warning

[PHP 7.2] Fix missing Countable warning

6 years agoMerge pull request #4538 from MrPetovan/bug/4535-user-not-found
Tobias Diekershoff [Sat, 3 Mar 2018 14:36:54 +0000 (15:36 +0100)]
Merge pull request #4538 from MrPetovan/bug/4535-user-not-found

Fix missing logical not in admin/users

6 years agoFix missing logical not in admin/users
Hypolite Petovan [Sat, 3 Mar 2018 14:34:48 +0000 (09:34 -0500)]
Fix missing logical not in admin/users

6 years agoMerge pull request #4537 from rabuzarus/20180303_-_fix_directory_search
Hypolite Petovan [Sat, 3 Mar 2018 14:18:41 +0000 (09:18 -0500)]
Merge pull request #4537 from rabuzarus/20180303_-_fix_directory_search

Bugfix: search in local directory didn't work

6 years ago[PHP 7.2] Fix missing Countable warning
Hypolite Petovan [Sat, 3 Mar 2018 13:48:30 +0000 (08:48 -0500)]
[PHP 7.2] Fix missing Countable warning

6 years agodirectory.php - code beautification (PSR)
rabuzarus [Sat, 3 Mar 2018 13:40:16 +0000 (14:40 +0100)]
directory.php - code beautification (PSR)

6 years agofix local directory search
rabuzarus [Sat, 3 Mar 2018 13:06:42 +0000 (14:06 +0100)]
fix local directory search

6 years agoMerge pull request #4534 from tobiasd/20180303-zhcn
Michael Vogel [Sat, 3 Mar 2018 10:44:53 +0000 (11:44 +0100)]
Merge pull request #4534 from tobiasd/20180303-zhcn

update to the zh-cn  translation THX 朱陈锬

6 years agoMerge pull request #4533 from tobiasd/20180303-typo
Michael Vogel [Sat, 3 Mar 2018 10:44:37 +0000 (11:44 +0100)]
Merge pull request #4533 from tobiasd/20180303-typo

tyoi, found by 朱陈锬 thanks for that!

6 years agoupdate to the zh-cn THX 朱陈锬
Tobias Diekershoff [Sat, 3 Mar 2018 10:13:14 +0000 (11:13 +0100)]
update to the zh-cn THX 朱陈锬

6 years agotyoi, found by 朱陈锬 thanks for that!
Tobias Diekershoff [Sat, 3 Mar 2018 10:02:40 +0000 (11:02 +0100)]
tyoi, found by 朱陈锬 thanks for that!

6 years agoMerge pull request #4531 from tobiasd/20180303-FAQ
Michael Vogel [Sat, 3 Mar 2018 08:55:42 +0000 (09:55 +0100)]
Merge pull request #4531 from tobiasd/20180303-FAQ

added support channels to the FAQ

6 years agoremoved dead link
Tobias Diekershoff [Sat, 3 Mar 2018 08:50:42 +0000 (09:50 +0100)]
removed dead link

6 years agoadded support channels to the FAQ
Tobias Diekershoff [Sat, 3 Mar 2018 07:13:46 +0000 (08:13 +0100)]
added support channels to the FAQ

6 years agoVersion 3.6-rc for the RC branch
Tobias Diekershoff [Sat, 3 Mar 2018 06:36:58 +0000 (07:36 +0100)]
Version 3.6-rc for the RC branch

6 years agoMerge pull request #4530 from annando/db-timestamp
Hypolite Petovan [Fri, 2 Mar 2018 19:11:32 +0000 (14:11 -0500)]
Merge pull request #4530 from annando/db-timestamp

Some more performance measuring for database stuff

6 years agoSome more performance measuring for database stuff
Michael [Fri, 2 Mar 2018 13:37:49 +0000 (13:37 +0000)]
Some more performance measuring for database stuff

6 years agoMerge pull request #4529 from tobiasd/20180302-msg
Michael Vogel [Fri, 2 Mar 2018 12:10:11 +0000 (13:10 +0100)]
Merge pull request #4529 from tobiasd/20180302-msg

regenerated master messages.po file

6 years agoMerge pull request #4528 from tobiasd/20180302-transl
Michael Vogel [Fri, 2 Mar 2018 12:09:54 +0000 (13:09 +0100)]
Merge pull request #4528 from tobiasd/20180302-transl

translation updates for DE and ZH CN

6 years agoregenerated master messages.po file
Tobias Diekershoff [Fri, 2 Mar 2018 11:02:54 +0000 (12:02 +0100)]
regenerated master messages.po file

6 years agoupdate for DE translation THX hoergen oostende
Tobias Diekershoff [Fri, 2 Mar 2018 10:51:39 +0000 (11:51 +0100)]
update for DE translation THX hoergen oostende

6 years agoupdate to the zh-cn THX 朱陈锬
Tobias Diekershoff [Fri, 2 Mar 2018 10:50:22 +0000 (11:50 +0100)]
update to the zh-cn THX 朱陈锬

6 years agoMerge pull request #4527 from annando/fix-no-constant-update
Tobias Diekershoff [Fri, 2 Mar 2018 09:58:17 +0000 (10:58 +0100)]
Merge pull request #4527 from annando/fix-no-constant-update

Bugfix: No constant update in "getIdForUrl"

6 years agoMerge pull request #4526 from MrPetovan/task/4522-postpone-contact-update
Michael Vogel [Fri, 2 Mar 2018 04:43:04 +0000 (05:43 +0100)]
Merge pull request #4526 from MrPetovan/task/4522-postpone-contact-update

Postpone contact update in Contact::getIdForURL

6 years agoBugfix: No constant update in "getIdForUrl"
Michael [Fri, 2 Mar 2018 03:55:24 +0000 (03:55 +0000)]
Bugfix: No constant update in "getIdForUrl"

6 years agoAdd no_update flag to speed up Contact::getIdForURL instances
Hypolite Petovan [Fri, 2 Mar 2018 00:54:45 +0000 (19:54 -0500)]
Add no_update flag to speed up Contact::getIdForURL instances

6 years agoUse default value for uid parameter in Contact::getIdForURL
Hypolite Petovan [Fri, 2 Mar 2018 00:53:47 +0000 (19:53 -0500)]
Use default value for uid parameter in Contact::getIdForURL

6 years agoMerge pull request #4525 from annando/fix-dfrn-delee
Hypolite Petovan [Thu, 1 Mar 2018 21:58:35 +0000 (16:58 -0500)]
Merge pull request #4525 from annando/fix-dfrn-delee

Bugfix: Deleting comments via DFRN had only partly worked

6 years agoBugfix: Deleting comments via DFRN had only partly worked
Michael [Thu, 1 Mar 2018 21:52:36 +0000 (21:52 +0000)]
Bugfix: Deleting comments via DFRN had only partly worked

6 years agoMerge pull request #4523 from annando/invitation-code
Hypolite Petovan [Thu, 1 Mar 2018 20:53:10 +0000 (15:53 -0500)]
Merge pull request #4523 from annando/invitation-code

"Invitation ID" is now "invitation code" to unify the description

6 years agoMerge pull request #4524 from annando/delete-dfrn
Hypolite Petovan [Thu, 1 Mar 2018 20:52:51 +0000 (15:52 -0500)]
Merge pull request #4524 from annando/delete-dfrn

When deleting, don't send the parent via DFRN

6 years agoWhen deleting, don't send the parent via DFRN
Michael [Thu, 1 Mar 2018 20:44:44 +0000 (20:44 +0000)]
When deleting, don't send the parent via DFRN