bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
25367 commits 4 branches 62 tags 178 MiB
Commit graph

25367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel 2f2480d88d
Merge pull request #7876 from MrPetovan/task/7308-backport-compose-acl 
Generalize the Compose ACL to the whole site
 2019-11-28 21:24:20 +01:00
Hypolite Petovan 20b725f07b
Merge pull request #7873 from annando/nodeinfo 
nodeinfo version 2 / basic nodeinfo data is always enabled
 2019-11-28 12:57:50 -05:00
Hypolite Petovan 8f4f6899dd Update composer module to use the new ACL selector 
- Remove ACL-specific code from compose-footer
- Move compose-footer template remaining content to compose.js
 2019-11-28 12:54:56 -05:00
Hypolite Petovan 39d0735236 Update linkPreview to allow using a generic selector 
- The individual textareas still need an id attribute to be set
 2019-11-28 12:54:56 -05:00
Hypolite Petovan e8f91d7e54 Ensure the preview parameter is set to 1 when doing a preview 
- The element #jot-preview might not exist
 2019-11-28 12:54:56 -05:00
Hypolite Petovan b64b18e6f7 Remove obsolete view/js/acl.js 
- Remove references to the deleted file
 2019-11-28 12:54:56 -05:00
Hypolite Petovan ae3d4f63a3 Use visibility tags input for the default ACL selector 
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
 2019-11-28 12:54:53 -05:00
Hypolite Petovan 11da7f4095 Add new ACL::getContactListByUserId and ACL::getGroupListByUserId methods 2019-11-28 12:33:00 -05:00
Hypolite Petovan 440d3eb9c4 Simplify Theme::getPathForfile to expand its uses 2019-11-28 12:27:16 -05:00
Michael e1f9dd5bb5 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-28 16:10:18 +00:00
Tobias Diekershoff dba41da7e4
Merge pull request #7874 from annando/mail-post 
Only transfer posts via mail
 2019-11-28 16:30:31 +01:00
Tobias Diekershoff 5dce62e477
Merge pull request #7875 from annando/fix-pixelfed 
Attached photos from pixelfed are now added to the body again
 2019-11-28 16:25:56 +01:00
Michael 0979daddac Modules separated 2019-11-28 07:07:34 +00:00
Michael 7ffd6d0bc7 Attached photos from pixelfed are now added to the body again 2019-11-28 06:34:35 +00:00
Michael 2d3296f697 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-27 22:10:51 +00:00
Michael 22b89df348 Removed test logging 2019-11-27 22:00:43 +00:00
Michael a6a79d9c7e Only transfer posts via mail 2019-11-27 21:59:11 +00:00
Hypolite Petovan f1cab41a5c
Merge pull request #7872 from annando/mail-setting 
Don't allow unencrypted IMAP, allow deleting mails
 2019-11-27 11:52:20 -05:00
Michael 98d10b7253 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-27 08:18:03 +00:00
Michael cb37588375 We can always send via SMTP, receiving mails is via IMAP 2019-11-27 07:44:59 +00:00
Michael ae306ea7de rss is inbound 2019-11-27 07:38:57 +00:00
Michael 054a111f3c Twitter is also inbound 2019-11-27 07:36:24 +00:00
Michael a26689f69c remove unused variable 2019-11-27 07:32:46 +00:00
Michael 890bbfa1a7 We now support nodeinfo version 2 / basic nodeinfo data is always enabled 2019-11-27 07:25:54 +00:00
Michael Vogel 3ed196fd9c Added option for insecure IMAP 2019-11-26 23:27:20 +01:00
Michael Vogel 16d2f11b40 Don't allow unencrypted IMAP, allow deleting mails 2019-11-26 22:27:25 +01:00
Hypolite Petovan faa63632bf
Merge pull request #7871 from annando/notice 
Fix a notice in gcontact.php
 2019-11-26 14:53:03 -05:00
Michael 1531cad596 Fix a notice in gcontact.php 2019-11-26 19:03:21 +00:00
Tobias Diekershoff b89d339a16
Merge pull request #7869 from annando/discourse-logo 
Discourse logo added
 2019-11-26 09:29:03 +01:00
Michael 00fce5fe11 Discourse logo added 2019-11-25 22:49:00 +00:00
Tobias Diekershoff 15d5ac890b
Merge pull request #7867 from annando/fix-notive 
Notice/warning in event fixed
 2019-11-25 13:09:46 +01:00
Michael 06a6774a7b Notice/warning in event fixed 2019-11-25 11:16:55 +00:00
Tobias Diekershoff 4f52a90d05
Merge pull request #7866 from annando/avoid-update 
Avoid contact update for non federated networks
 2019-11-25 10:25:45 +01:00
Michael 67a0e97f7c Avoid contact update for non federated networks 2019-11-25 08:49:14 +00:00
Hypolite Petovan 4d95e9c3ed
Merge pull request #7865 from annando/add-discourse 
Add "discourse" as protocol
 2019-11-24 18:54:14 -05:00
Michael fdaac8a681 Add "discourse" as protocol 2019-11-24 20:06:47 +00:00
Hypolite Petovan 1cf44d92c3
Merge pull request #7862 from annando/mail-again 
Only read undeleted mails / improved structure
 2019-11-23 16:58:20 -05:00
Michael 99945f21cb Only read undeleted mails / improved structure 2019-11-23 20:02:21 +00:00
Hypolite Petovan 5825f35422
Merge pull request #7861 from annando/mail-hook 
E-Mail import: The item is now provided to the hook
 2019-11-23 08:33:45 -05:00
Michael 84244b1450 Now it works 2019-11-23 12:54:39 +00:00
Michael fda30bbb1f Removed test data 2019-11-23 11:44:25 +00:00
Michael e220698ea1 E-Mail import: The item is now provided to the hook 2019-11-23 11:42:03 +00:00
Hypolite Petovan 17c934aa07
Merge pull request #7859 from annando/mail-reply-to 
Use the "reply-to" header of the original post when answering via mail
 2019-11-22 23:33:10 -05:00
Michael 2dcf6d9e2b Now using the correct function call ... 2019-11-23 04:31:40 +00:00
Michael 37bdafcc96 Use the "reply-to" header of the original post when answering via mail 2019-11-22 22:15:04 +00:00
Hypolite Petovan 20dc285f9d
Merge pull request #7858 from annando/diaspora-date 
Don't use the creation date when transmitting to Diaspora
 2019-11-22 15:36:27 -05:00
Michael Vogel f0ffc6df38 Don't use the creation date when transmitting to Diaspora 2019-11-22 21:24:02 +01:00
Hypolite Petovan 7fac116d5e
Merge pull request #7857 from annando/improve-7854 
Improvement for PR 7854: Avoid leaking of BCC header data
 2019-11-22 14:53:23 -05:00
Michael e539c74fa4 Removed the word "test" 2019-11-22 19:47:35 +00:00
Michael 5bf8c895a9 Improvement for PR 7854: Avoid leaking of BCC header data 2019-11-22 18:39:51 +00:00