 Michael
|
4ba3ba391a
|
The attachment text had already been in HTML and mustn't be converted again
|
2018-03-14 22:51:14 +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 |
|
|
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
|
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
|
2009c06195
|
Merge pull request #4573 from MrPetovan/bug/fix-attach-display
Add support for Atom enclosure
|
2018-03-11 00:34:26 +01:00 |
|
|
Hypolite Petovan
|
a80d77f328
|
Add support for Atom enclosure
|
2018-03-10 12:40:21 -05:00 |
|
|
Hypolite Petovan
|
95f8423b4b
|
Merge pull request #4570 from annando/issue-4556
Issue 4556: Adding index hints to improve the notifications speed
|
2018-03-09 21:07:37 -05:00 |
|
|
Michael
|
fa496d3e5f
|
Issue 4556: Adding index hints to improve the notifications speed (hopefully)
|
2018-03-09 22:53:19 +00:00 |
|
|
Hypolite Petovan
|
f0c9b4cdf8
|
Merge pull request #4569 from annando/bugfix-diaspora-reshare
Bugfix: Reshare with added content to Diaspora looked ugly
|
2018-03-09 15:23:11 -05:00 |
|
|
Michael
|
7706616640
|
Bugfix: Reshare with added content to Diaspora looked ugly
|
2018-03-09 20:04:31 +00:00 |
|
|
Michael Vogel
|
fc3b1b0aba
|
Merge pull request #4566 from MrPetovan/bug/fix-attach-display
Display attach with missing title
|
2018-03-09 14:17:30 +01:00 |
|
|
Hypolite Petovan
|
73a8654296
|
Merge pull request #4568 from tobiasd/20180309-invites
documentation of invitation based registration
|
2018-03-09 08:01:14 -05:00 |
|
|
Tobias Diekershoff
|
518ee6595c
|
Merge pull request #4567 from annando/diaspora-key
Diaspora: Avoid warning "supplied key param cannot be coerced …"
|
2018-03-09 10:10:39 +01:00 |
|
|
Tobias Diekershoff
|
d3b872d589
|
help not doc
|
2018-03-09 10:06:53 +01:00 |
|
|
Tobias Diekershoff
|
c6abfa27c1
|
documentation of invitation based registration
|
2018-03-09 09:53:08 +01:00 |
|
|
Michael
|
3e51fa73b1
|
Additional checks
|
2018-03-09 05:38:15 +00:00 |
|
|
Michael
|
c9095386c8
|
Diaspora: Avoid warning "supplied key param cannot be coerced into a public key"
|
2018-03-09 05:31:13 +00:00 |
|
|
Hypolite Petovan
|
9f693cc443
|
Display attach with missing title
- Rework preg_match_all call to remove 3 indentation levels
|
2018-03-08 23:52:01 -05:00 |
|
|
Hypolite Petovan
|
3ecc53b448
|
Merge pull request #4564 from annando/avoid-duplicate
Avoid SQL errors due to duplicate entries in the "participation" table
|
2018-03-08 18:22:18 -05:00 |
|
|
Hypolite Petovan
|
54b6b8d24d
|
Merge pull request #4563 from annando/bugfix-xml-class
Bugfix: missing "use"
|
2018-03-08 16:10:27 -05:00 |
|
|
Michael
|
f23596421d
|
Avoid SQL errors due to duplicate entries in the "participation" table
|
2018-03-08 21:04:11 +00:00 |
|
|
Michael
|
480fde7ca8
|
Bugfix: missing "use"
|
2018-03-08 20:48:00 +00:00 |
|
|
Hypolite Petovan
|
63ec8cdbf7
|
Merge pull request #4559 from tobiasd/20160307-lng
translations (DE, EN-GB, EN-US, ZH-CN)
|
2018-03-07 12:15:52 -05:00 |
|
|
Tobias Diekershoff
|
dd9f7544cf
|
update for DE translation
|
2018-03-07 17:32:45 +01:00 |
|