Michael Vogel
|
b54b0f0728
|
Merge pull request #4613 from MrPetovan/task/4518-add-cache-delete
Add missing Cache::delete method
|
2018-03-17 07:30:31 +01:00 |
|
Michael Vogel
|
7207a945ce
|
Merge pull request #4615 from tobiasd/20180317-credits
regen credits
|
2018-03-17 07:27:43 +01:00 |
|
|
|
4593ad5c92
|
regen credits
|
2018-03-17 07:22:22 +01:00 |
|
|
|
d616bb7564
|
Fix: In the contact search you had been able to delete your own contact
|
2018-03-17 06:17:32 +00:00 |
|
Hypolite Petovan
|
30d8c73660
|
Add missing Cache::delete method
|
2018-03-16 21:57:58 -04:00 |
|
Hypolite Petovan
|
e2f5350e61
|
Merge pull request #4612 from annando/dfrn-batch-notify
Fix: Private transmission via Diaspora to Friendica servers
|
2018-03-16 16:52:38 -04:00 |
|
|
|
e1a72b8f5a
|
Visible URL are shortened when transmitting to OStatus
|
2018-03-16 20:50:53 +00:00 |
|
|
|
ec9b7af25b
|
Fix: Private transmission via Diaspora to Friendica servers
|
2018-03-16 20:34:28 +00:00 |
|
Hypolite Petovan
|
7057018ec7
|
Merge pull request #4608 from rabuzarus/20180316_-_hashtag_autocomplete
hashtag autocomplete
|
2018-03-16 09:45:43 -04:00 |
|
rabuzarus
|
c209853e1d
|
add dependencies (require_once) to hashtag module
|
2018-03-16 14:44:51 +01:00 |
|
rabuzarus
|
86d84e5f31
|
fix code standards
|
2018-03-16 14:27:04 +01:00 |
|
rabuzarus
|
96c086ea13
|
hashtag autocomplete
|
2018-03-16 13:55:26 +01:00 |
|
Hypolite Petovan
|
3ca2dc70b3
|
Merge pull request #4607 from annando/dfrn-relationship
DFRN: The relationship between contacts can now be changed afterwards
|
2018-03-16 03:55:34 -04:00 |
|
|
|
a62ccf0ec1
|
Added to-do
|
2018-03-16 07:27:18 +00:00 |
|
|
|
67fa6aa809
|
We now change relationships not only for OStatus contacts
|
2018-03-16 06:58:54 +00:00 |
|
|
|
59dd353464
|
DFRN: The relationship between contacts can now be changed afterwards
|
2018-03-16 06:43:10 +00:00 |
|
Hypolite Petovan
|
ba03991294
|
Merge pull request #4603 from annando/pleroma-like
OStatus: Likes from Pleroma will now work
|
2018-03-15 17:42:53 -04:00 |
|
|
|
972c2c86ef
|
OStatus: Likes from Pleroma will now work
|
2018-03-15 21:33:28 +00:00 |
|
Hypolite Petovan
|
535ae04613
|
Merge pull request #4602 from tobiasd/20180316-installdoc
php-zip module is needed for composer
|
2018-03-15 16:27:04 -04:00 |
|
|
|
658812ff46
|
php-zip module is needed for composer
|
2018-03-15 20:40:22 +01:00 |
|
Michael Vogel
|
fc6576fd83
|
Merge pull request #4598 from MrPetovan/spoiler-cache
Fix for CW: Items weren't cached (alt)
|
2018-03-15 10:29:35 +01:00 |
|
Hypolite Petovan
|
c53c00ba4e
|
Add rendred-hash to put_item_in_cache todo
|
2018-03-15 03:23:11 -04:00 |
|
Hypolite Petovan
|
644767519e
|
Ensure the item body stays the same in put_item_in_cache()
- Add documentation
|
2018-03-15 02:13:00 -04:00 |
|
Hypolite Petovan
|
e28020c68a
|
Fix for CW: Items weren't cached
|
2018-03-15 01:32:04 -04:00 |
|
Hypolite Petovan
|
d376ed6f61
|
Merge pull request #4596 from annando/attachment-encode
Attachment encode
|
2018-03-14 18:59:25 -04:00 |
|
|
|
4ba3ba391a
|
The attachment text had already been in HTML and mustn't be converted again
|
2018-03-14 22:51:14 +00:00 |
|
Hypolite Petovan
|
65b0159282
|
Merge pull request #4593 from annando/fix-ostatus
OStatus: Fixed communication issues with deleted contacts
|
2018-03-14 18:46:21 -04:00 |
|
|
|
2bedead6f4
|
Remove commented code
|
2018-03-14 22:31:52 +00:00 |
|
|
|
c4a023dfd4
|
Remove unused description
|
2018-03-14 22:30:05 +00:00 |
|
|
|
5bd519efff
|
There is now a "content-warning" field
|
2018-03-14 22:28:35 +00:00 |
|
|
|
8c42e2e62e
|
Avoid double encoding of the attachment content
|
2018-03-14 21:47:24 +00:00 |
|
Hypolite Petovan
|
f351391f17
|
Merge pull request #4595 from annando/empty-contact
Avoid an error in OnePoll when the contact was "null".
|
2018-03-14 17:00:43 -04:00 |
|
|
|
d98c6819e7
|
$contact isn't called by reference anymore
|
2018-03-14 20:53:03 +00:00 |
|
|
|
7db0b850cb
|
Avoid an error in OnePoll when the contact was "null".
|
2018-03-14 19:47:14 +00:00 |
|
|
|
6352aa112b
|
Add the nsfw removal behind a config switch
|
2018-03-14 07:13:17 +00:00 |
|
|
|
858fd127a1
|
Fix: subscribing to the old followers hadn't worked
|
2018-03-14 00:27:15 +00:00 |
|
|
|
f17f61df38
|
Fix indentation
|
2018-03-13 23:32:38 +00:00 |
|
|
|
f49391a21c
|
"nsfw" at "content warning" content doesn't fit together
|
2018-03-13 22:39:08 +00:00 |
|
|
|
3f6fefaa9a
|
Pleroma with the Mastodon UI handles content warning different
|
2018-03-13 21:58:05 +00:00 |
|
|
|
aff99b32fd
|
Improved logging
|
2018-03-13 21:33:45 +00:00 |
|
|
|
bc84852682
|
Added logging
|
2018-03-13 21:10:19 +00:00 |
|
|
|
c20a42c889
|
Completely reformatted and restructured code, using dba functions now.
|
2018-03-13 21:03:56 +00:00 |
|
|
|
4d3b1ae918
|
We don't need the contact-id anymore
|
2018-03-13 07:16:31 +00:00 |
|
|
|
32ee4ca4b1
|
OStatus: Fixed communication issues with deleted contacts
|
2018-03-13 06:21:44 +00:00 |
|
Hypolite Petovan
|
83c4c86251
|
Fix: The acl lookup now works in multi threaded posts as well
|
2018-03-12 08:15:59 -04:00 |
|
Hypolite Petovan
|
335b18769e
|
Merge pull request #4589 from annando/issue-4369
OStatus: Only posts from followers will be imported (Issue 4369)
|
2018-03-12 08:09:08 -04:00 |
|
|
|
23718aeae3
|
OStatus: Only posts from followers will be imported (Issue 4369)
|
2018-03-12 10:45:40 +00:00 |
|
|
|
306dd382f3
|
Merge pull request #4587 from annando/acl-thread
Fix: The acl lookup now works in multi threaded posts as well
|
2018-03-12 07:55:23 +01:00 |
|
|
|
03079acf79
|
Merge pull request #4588 from annando/delegate-zero
Fix: We have to be able to remove delegations as well
|
2018-03-12 07:53:46 +01:00 |
|
|
|
4bb9263e43
|
Fix: The acl lookup now works in multi threaded posts as well
|
2018-03-12 04:51:27 +00:00 |
|
