Hypolite Petovan
|
d376ed6f61
|
Merge pull request #4596 from annando/attachment-encode
Attachment encode
|
2018-03-14 18:59:25 -04:00 |
|
Michael
|
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 |
|
Michael
|
2bedead6f4
|
Remove commented code
|
2018-03-14 22:31:52 +00:00 |
|
Michael
|
c4a023dfd4
|
Remove unused description
|
2018-03-14 22:30:05 +00:00 |
|
Michael
|
5bd519efff
|
There is now a "content-warning" field
|
2018-03-14 22:28:35 +00:00 |
|
Michael
|
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 |
|
Michael
|
d98c6819e7
|
$contact isn't called by reference anymore
|
2018-03-14 20:53:03 +00:00 |
|
Michael
|
7db0b850cb
|
Avoid an error in OnePoll when the contact was "null".
|
2018-03-14 19:47:14 +00:00 |
|
Michael
|
6352aa112b
|
Add the nsfw removal behind a config switch
|
2018-03-14 07:13:17 +00:00 |
|
Michael
|
858fd127a1
|
Fix: subscribing to the old followers hadn't worked
|
2018-03-14 00:27:15 +00:00 |
|
Michael
|
f17f61df38
|
Fix indentation
|
2018-03-13 23:32:38 +00:00 |
|
Michael
|
f49391a21c
|
"nsfw" at "content warning" content doesn't fit together
|
2018-03-13 22:39:08 +00:00 |
|
Michael
|
3f6fefaa9a
|
Pleroma with the Mastodon UI handles content warning different
|
2018-03-13 21:58:05 +00:00 |
|
Michael
|
aff99b32fd
|
Improved logging
|
2018-03-13 21:33:45 +00:00 |
|
Michael
|
bc84852682
|
Added logging
|
2018-03-13 21:10:19 +00:00 |
|
Michael
|
c20a42c889
|
Completely reformatted and restructured code, using dba functions now.
|
2018-03-13 21:03:56 +00:00 |
|
Michael
|
4d3b1ae918
|
We don't need the contact-id anymore
|
2018-03-13 07:16:31 +00:00 |
|
Michael
|
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 |
|
Michael
|
23718aeae3
|
OStatus: Only posts from followers will be imported (Issue 4369)
|
2018-03-12 10:45:40 +00:00 |
|
Tobias Diekershoff
|
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 |
|
Tobias Diekershoff
|
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 |
|
Michael
|
4bb9263e43
|
Fix: The acl lookup now works in multi threaded posts as well
|
2018-03-12 04:51:27 +00:00 |
|
Michael
|
ab3f28f4c8
|
Fix: We have to be able to remove delegations as well
|
2018-03-12 04:50:07 +00:00 |
|
Hypolite Petovan
|
324705aa90
|
Merge pull request #4586 from annando/issue-4115
Issue 4115: Events are now formatted better for Diaspora
|
2018-03-11 18:31:28 -04:00 |
|
Michael
|
052ad155a2
|
Issue 4115: Events are now formatted better for Diaspora
|
2018-03-11 21:10:36 +00:00 |
|
Hypolite Petovan
|
ca840f7ed1
|
Merge pull request #4585 from annando/forum-stuff
Fix: The ownership of forum items had been wrong
|
2018-03-11 15:49:04 -04:00 |
|
Michael
|
b7a5e076fc
|
Fix: The ownership of forum items had been wrong
|
2018-03-11 18:12:38 +00:00 |
|
Hypolite Petovan
|
cacc1e1f79
|
Merge pull request #4583 from tobiasd/20180311-doc2
Documentation about the Community Pages
|
2018-03-11 13:09:39 -04:00 |
|
Tobias Diekershoff
|
cc000a9021
|
community pages
|
2018-03-11 17:41:56 +01:00 |
|
Hypolite Petovan
|
e793160795
|
Merge pull request #4582 from tobiasd/20180311-doc
installation docs
|
2018-03-11 12:35:12 -04:00 |
|
Tobias Diekershoff
|
61954be480
|
no poormancron in the installs
|
2018-03-11 16:54:03 +01:00 |
|
Hypolite Petovan
|
9941c73a31
|
Merge pull request #4581 from annando/issue-4497
Issue 4497: Forum feeds had been empty
|
2018-03-11 10:10:06 -04:00 |
|
Michael
|
cc4347d72f
|
Issue 4497: Forum feeds had been empty
|
2018-03-11 14:01:40 +00:00 |
|
Hypolite Petovan
|
903d1e1172
|
Merge pull request #4580 from annando/parent-password
Security: You have to enter the password of the parent for delegations
|
2018-03-11 09:42:56 -04:00 |
|
Hypolite Petovan
|
efedc5c2b2
|
Merge pull request #4579 from annando/fix-diaspora-link
Links to Diaspora had sometimes been cut
|
2018-03-11 09:41:12 -04:00 |
|
Michael
|
eaf4fdefac
|
Security: You have to enter the password of the parent to delegate to this account
|
2018-03-11 13:12:15 +00:00 |
|
Hypolite Petovan
|
0e6ada2462
|
Merge pull request #4578 from annando/bugfix-directory
Bugfix: Old dba function was used
|
2018-03-11 08:23:16 -04:00 |
|
Michael
|
26a6846467
|
Bugfix: Old dba function was used
|
2018-03-11 12:19:41 +00:00 |
|
Michael
|
fbb38837b0
|
Shortener deactivated, due to Diaspora problems
|
2018-03-11 12:16:17 +00:00 |
|
Michael
|
229fb0439e
|
Links to Diaspora had sometimes been cut
|
2018-03-11 10:54:02 +00:00 |
|
Michael Vogel
|
4a0781db19
|
Merge pull request #4577 from MrPetovan/task/add-feedtest-module
Make feedtest module for logged users only
|
2018-03-11 07:10:13 +01:00 |
|
Hypolite Petovan
|
fa620022d5
|
Make feedtest module for logged users only
|
2018-03-10 18:53:20 -05:00 |
|
Michael Vogel
|
28615ae24b
|
Merge pull request #4576 from MrPetovan/bug/fix-attach-display
Formatting changes to Protocol/Feed
|
2018-03-11 00:43:16 +01:00 |
|
Hypolite Petovan
|
9b14165cc8
|
Formatting changes to Protocol/Feed
- Change attribute name condition
- Singularize $attributes variable name
|
2018-03-10 18:35:24 -05:00 |
|
Michael Vogel
|
a9df753cf8
|
Merge pull request #4574 from MrPetovan/task/add-feedtest-module
Add feedtest module
|
2018-03-11 00:35:05 +01:00 |
|
Michael Vogel
|
2009c06195
|
Merge pull request #4573 from MrPetovan/bug/fix-attach-display
Add support for Atom enclosure
|
2018-03-11 00:34:26 +01:00 |
|