]>
git.mxchange.org Git - friendica.git/log
Hypolite Petovan [Thu, 22 Mar 2018 01:12:04 +0000 (21:12 -0400)]
Merge pull request #4646 from Andi-K/3.6-rc
vier: replace hard coded style paths
Andi [Thu, 22 Mar 2018 00:25:43 +0000 (01:25 +0100)]
Andi [Thu, 22 Mar 2018 00:15:59 +0000 (01:15 +0100)]
vier: replace hard coded style path
Hypolite Petovan [Thu, 22 Mar 2018 00:01:01 +0000 (20:01 -0400)]
Merge pull request #4645 from Andi-K/3.6-rc
frio: removed "Illegal string offset" Warnings
Andi [Wed, 21 Mar 2018 23:34:38 +0000 (00:34 +0100)]
Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
Andi [Wed, 21 Mar 2018 22:53:41 +0000 (23:53 +0100)]
frio: removed "Illegal string offset" Warnings
rabuzarus [Wed, 21 Mar 2018 20:21:26 +0000 (21:21 +0100)]
Merge pull request #4644 from annando/event-date
Event: Prevent SQL errors with events without end
Michael [Wed, 21 Mar 2018 20:16:43 +0000 (20:16 +0000)]
Event: Prevent SQL errors with events without end
Tobias Diekershoff [Wed, 21 Mar 2018 07:07:20 +0000 (08:07 +0100)]
Merge pull request #4642 from annando/updated-faq
Added linebreaks in the FAQ.
Michael [Wed, 21 Mar 2018 07:01:40 +0000 (07:01 +0000)]
Added linebreaks in the FAQ.
Hypolite Petovan [Wed, 21 Mar 2018 06:27:38 +0000 (02:27 -0400)]
Merge pull request #4641 from annando/updated-faq
The FAQ had been updated to reflect the latest changes
Michael [Wed, 21 Mar 2018 06:23:07 +0000 (06:23 +0000)]
The FAQ had been updated to reflect the latest changes
Hypolite Petovan [Wed, 21 Mar 2018 05:24:50 +0000 (01:24 -0400)]
Merge pull request #4638 from annando/incorrect-datetime
Fix for incorrect datetime values
Michael [Wed, 21 Mar 2018 05:20:55 +0000 (05:20 +0000)]
Fix for incorrect datetime values
Tobias Diekershoff [Tue, 20 Mar 2018 07:48:37 +0000 (08:48 +0100)]
Merge pull request #4636 from annando/event-diaspora
Fix: Events on Diaspora now should look fine
Michael [Tue, 20 Mar 2018 06:32:17 +0000 (06:32 +0000)]
Fix: Events on Diaspora now should look fine
Hypolite Petovan [Mon, 19 Mar 2018 20:53:48 +0000 (16:53 -0400)]
Merge pull request #4635 from fabrixxm/3.6-rc-it
Update IT strings
fabrixxm [Mon, 19 Mar 2018 19:39:19 +0000 (20:39 +0100)]
Update IT strings
Hypolite Petovan [Mon, 19 Mar 2018 17:50:37 +0000 (13:50 -0400)]
Merge pull request #4634 from tobiasd/
20180319-de
update for DE translation THX utzer
Tobias Diekershoff [Mon, 19 Mar 2018 17:38:47 +0000 (18:38 +0100)]
update for DE translation THX utzer
Hypolite Petovan [Mon, 19 Mar 2018 12:39:50 +0000 (08:39 -0400)]
Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1
Small fix to translatable string
fabrixxm [Mon, 19 Mar 2018 10:19:09 +0000 (11:19 +0100)]
Fix another closing bracket in translatable string
fabrixxm [Mon, 19 Mar 2018 09:20:01 +0000 (10:20 +0100)]
fix docstring of `get_poke_verbs()`
fabrixxm [Mon, 19 Mar 2018 09:15:09 +0000 (10:15 +0100)]
Small fixes to translatable string
and some small cosmetic fixup to docstring for `notification()`
Hypolite Petovan [Sun, 18 Mar 2018 14:33:53 +0000 (10:33 -0400)]
Merge pull request #4625 from annando/ostatus-groups
OStatus: Forum feeds now look like OStatus group feeds
Michael Vogel [Sun, 18 Mar 2018 14:31:52 +0000 (15:31 +0100)]
Merge pull request #4626 from tobiasd/
20180318-installer
installer checks for POSIX functions
Tobias Diekershoff [Sun, 18 Mar 2018 13:30:51 +0000 (14:30 +0100)]
count from zero...
Michael [Sun, 18 Mar 2018 11:18:25 +0000 (11:18 +0000)]
Improved similarity to ostatus group feeds
Michael [Sun, 18 Mar 2018 10:31:12 +0000 (10:31 +0000)]
OStatus: Forum feeds now look like OStatus group feeds
Tobias Diekershoff [Sun, 18 Mar 2018 09:36:28 +0000 (10:36 +0100)]
added check for POSIX kill to the installation wizard
Hypolite Petovan [Sun, 18 Mar 2018 07:43:55 +0000 (03:43 -0400)]
Merge pull request #4624 from tobiasd/
20180317-credits2
regen credits
Hypolite Petovan [Sun, 18 Mar 2018 07:43:44 +0000 (03:43 -0400)]
Merge pull request #4623 from tobiasd/
20180318-installdocs
added note about POSIX to the installation docs
Tobias Diekershoff [Sun, 18 Mar 2018 06:42:16 +0000 (07:42 +0100)]
regen credits
Tobias Diekershoff [Sun, 18 Mar 2018 06:21:22 +0000 (07:21 +0100)]
added note about POSIX to the installation docs
Hypolite Petovan [Sat, 17 Mar 2018 22:40:31 +0000 (18:40 -0400)]
Merge pull request #4621 from annando/not-null
Avoid storing "null" values
Michael [Sat, 17 Mar 2018 20:56:56 +0000 (20:56 +0000)]
Same same but different
Michael [Sat, 17 Mar 2018 20:54:56 +0000 (20:54 +0000)]
Fewer Defaults
Michael [Sat, 17 Mar 2018 13:09:21 +0000 (13:09 +0000)]
Avoid storing "null" values
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
rabuzarus [Sat, 17 Mar 2018 09:47:03 +0000 (10:47 +0100)]
Merge pull request #4619 from annando/missing-doxygen
Added missing doxygen header
Michael [Sat, 17 Mar 2018 09:42:29 +0000 (09:42 +0000)]
Added missing doxygen header
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
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
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
Tobias Diekershoff [Sat, 17 Mar 2018 09:14:19 +0000 (10:14 +0100)]
activate the frio theme during installation
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
Michael [Sat, 17 Mar 2018 07:50:49 +0000 (07:50 +0000)]
Issue 4610: The query is simplified and shouldn't fail again
Michael [Sat, 17 Mar 2018 07:12:28 +0000 (07:12 +0000)]
Simplified query
Michael [Sat, 17 Mar 2018 06:54:47 +0000 (06:54 +0000)]
Ignore obvious garbage results
Michael Vogel [Sat, 17 Mar 2018 06:27:43 +0000 (07:27 +0100)]
Merge pull request #4615 from tobiasd/
20180317-credits
regen credits
Tobias Diekershoff [Sat, 17 Mar 2018 06:22:22 +0000 (07:22 +0100)]
regen credits
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
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
Michael [Fri, 16 Mar 2018 20:34:28 +0000 (20:34 +0000)]
Fix: Private transmission via Diaspora to Friendica servers
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
Michael [Fri, 16 Mar 2018 07:27:18 +0000 (07:27 +0000)]
Added to-do
Michael [Fri, 16 Mar 2018 06:58:54 +0000 (06:58 +0000)]
We now change relationships not only for OStatus contacts
Michael [Fri, 16 Mar 2018 06:43:10 +0000 (06:43 +0000)]
DFRN: The relationship between contacts can now be changed afterwards
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
Michael [Thu, 15 Mar 2018 21:33:28 +0000 (21:33 +0000)]
OStatus: Likes from Pleroma will now work
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
Tobias Diekershoff [Thu, 15 Mar 2018 19:40:22 +0000 (20:40 +0100)]
php-zip module is needed for composer
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)
Hypolite Petovan [Thu, 15 Mar 2018 07:23:11 +0000 (03:23 -0400)]
Add rendred-hash to put_item_in_cache todo
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
Hypolite Petovan [Thu, 15 Mar 2018 05:32:04 +0000 (01:32 -0400)]
Fix for CW: Items weren't cached
Hypolite Petovan [Wed, 14 Mar 2018 22:59:25 +0000 (18:59 -0400)]
Merge pull request #4596 from annando/attachment-encode
Attachment encode
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
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
Michael [Wed, 14 Mar 2018 22:31:52 +0000 (22:31 +0000)]
Remove commented code
Michael [Wed, 14 Mar 2018 22:30:05 +0000 (22:30 +0000)]
Remove unused description
Michael [Wed, 14 Mar 2018 22:28:35 +0000 (22:28 +0000)]
There is now a "content-warning" field
Michael [Wed, 14 Mar 2018 21:47:24 +0000 (21:47 +0000)]
Avoid double encoding of the attachment content
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".
Michael [Wed, 14 Mar 2018 20:53:03 +0000 (20:53 +0000)]
$contact isn't called by reference anymore
Michael [Wed, 14 Mar 2018 19:47:14 +0000 (19:47 +0000)]
Avoid an error in OnePoll when the contact was "null".
Michael [Wed, 14 Mar 2018 07:13:17 +0000 (07:13 +0000)]
Add the nsfw removal behind a config switch
Michael [Wed, 14 Mar 2018 00:27:15 +0000 (00:27 +0000)]
Fix: subscribing to the old followers hadn't worked
Michael [Tue, 13 Mar 2018 23:32:38 +0000 (23:32 +0000)]
Fix indentation
Michael [Tue, 13 Mar 2018 22:39:08 +0000 (22:39 +0000)]
"nsfw" at "content warning" content doesn't fit together
Michael [Tue, 13 Mar 2018 21:58:05 +0000 (21:58 +0000)]
Pleroma with the Mastodon UI handles content warning different
Michael [Tue, 13 Mar 2018 21:33:45 +0000 (21:33 +0000)]
Improved logging
Michael [Tue, 13 Mar 2018 21:10:19 +0000 (21:10 +0000)]
Added logging
Michael [Tue, 13 Mar 2018 21:03:56 +0000 (21:03 +0000)]
Completely reformatted and restructured code, using dba functions now.
Michael [Tue, 13 Mar 2018 07:16:31 +0000 (07:16 +0000)]
We don't need the contact-id anymore
Michael [Tue, 13 Mar 2018 06:21:44 +0000 (06:21 +0000)]
OStatus: Fixed communication issues with deleted contacts
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)
Michael [Mon, 12 Mar 2018 10:45:40 +0000 (10:45 +0000)]
OStatus: Only posts from followers will be imported (Issue 4369)
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
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
Michael [Mon, 12 Mar 2018 04:51:27 +0000 (04:51 +0000)]
Fix: The acl lookup now works in multi threaded posts 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
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
Michael [Sun, 11 Mar 2018 21:10:36 +0000 (21:10 +0000)]
Issue 4115: Events are now formatted better for Diaspora
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
Michael [Sun, 11 Mar 2018 18:12:38 +0000 (18:12 +0000)]
Fix: The ownership of forum items had been wrong
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
Tobias Diekershoff [Sun, 11 Mar 2018 16:41:56 +0000 (17:41 +0100)]
community pages
Hypolite Petovan [Sun, 11 Mar 2018 16:35:12 +0000 (12:35 -0400)]
Merge pull request #4582 from tobiasd/
20180311-doc
installation docs
Tobias Diekershoff [Sun, 11 Mar 2018 15:54:03 +0000 (16:54 +0100)]
no poormancron in the installs
projects / friendica.git / log