mexon/friendica
1
0
Fork 0
Code Pull requests Activity
25396 commits 5 branches 60 tags 188 MiB
Commit graph

25396 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp 0641212187
Merge pull request #7896 from annando/ago-difference 
Only show the difference between posting and receive date on difference
 2019-12-03 08:40:21 +01:00
Michael 3d701dd459 Only show the difference between posting and receive date when there is a difference 2019-12-03 07:23:01 +00:00
Hypolite Petovan 75d31341c2
Merge pull request #7894 from annando/mutuals-followers 
Group selection: Respect "pubmail" and ignore atchived or blocked contacts
 2019-12-02 23:06:06 -05:00
Michael fd706cf9a7 Group selection: Respect "pubmail" and ignore atchived or blocked contacts 2019-12-02 23:04:11 +00:00
Hypolite Petovan 9c9b4d1967
Merge pull request #7893 from annando/api-attachments 
API: Improve attachment removal functionality for the status text
 2019-12-02 16:29:48 -05:00
Michael 164e6b350d API: Improve attachment removal functionality for the status text 2019-12-02 21:19:47 +00:00
Philipp 6531819971
Merge pull request #7884 from MrPetovan/bug/7834-ignore-reload 
Restore post reload after (un)ignore
 2019-12-02 09:40:31 +01:00
Hypolite Petovan 632095a7ec
Merge pull request #7886 from nupplaphil/task/disable_drone 
Disable drone except "develop" branch
 2019-12-01 08:14:35 -05:00
Hypolite Petovan 01b81f7bba
Merge pull request #7885 from nupplaphil/bug/7881_allowed_themes 
Themes are now saved just once
 2019-12-01 08:12:20 -05:00
Philipp Holzer 453b94f9b7
Disable drone for every branch except develop 2019-12-01 08:54:21 +01:00
Philipp Holzer 309c36f289
Revert "enable trigger & disable travis codecov" 
This reverts commit 98de833d
 2019-12-01 08:54:20 +01:00
Philipp Holzer 7ebd5e6b15
Themese are now saved just once 2019-12-01 08:43:50 +01:00
Hypolite Petovan 249bcee686
Merge pull request #7882 from hoergen/Plusminus 
Made Connectors on new composer popup more visible
 2019-11-30 23:18:26 -05:00
Hypolite Petovan d01d69b9e7 Update doignore() in main.js to match new Item\Ignore return type 
- Remove superfluous jQuery selectors
 2019-11-30 23:16:34 -05:00
Hypolite Petovan c3d88aca39 Update the return value of Item\Ignore to integer 
- Array is unnecessary
 2019-11-30 23:15:58 -05:00
Hypolite Petovan d3c45f9186 Update type hint of System::jsonExit parameter to mixed 
- Output isn't necessarily an array
 2019-11-30 23:15:28 -05:00
Tobias Diekershoff 8e3428764b
Merge pull request #7883 from MrPetovan/bug/acl-fixes 
Various ACL/jot fixes
 2019-11-30 20:50:06 +01:00
Hypolite Petovan 5aebdec0bf [frio] Fix file browser staying displayed even after switching jot tab 
- Addresses https://libranet.de/display/0b6b25a8-445d-e188-54e9-c05224132808
- Include file browser tab in the jot form
- Remove input elements from the file browser to avoid interference with jot form
 2019-11-30 10:49:20 -05:00
Hypolite Petovan 77abf65b62 [frio] Make whole ACL panel heading clickable to change visibility panel 
- Addresses https://libranet.de/display/0b6b25a8-155d-e27f-6cc4-2e4568491578
 2019-11-30 10:47:25 -05:00
Hypolite Petovan 461f7f4bb0 Assume hidewall key may be missing in ACL::getFullSelectorHTML 
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-559974588
 2019-11-30 10:45:47 -05:00
Hypolite Petovan 8892b3daa1 Remove obsolete CSS styles related to the old ACL selector 2019-11-30 10:44:36 -05:00
hoergen 1e2187ec24 Made Connectors on new composer pop more visible 2019-11-30 14:49:03 +01:00
Philipp b61f475c47
Merge pull request #7879 from MrPetovan/bug/warnings 
Fix ACL-related warnings
 2019-11-30 13:17:44 +01:00
Hypolite Petovan 3a7ef7893f Fix typo in ACL::getFullSelectorHTML 2019-11-29 15:55:52 -05:00
Hypolite Petovan 22e7cab6d4
Restore system.show_unsupported_addons default value 
- Wrongly removed in https://github.com/friendica/friendica/pull/7877
 2019-11-29 11:44:01 -05:00
Hypolite Petovan 0ff4381305 Ensure the existence of expected default permission keys in ACL::getFullSelectorHTML 
- Addresses https://sozialwolke.net/display/703b8751-145d-e11f-a923-98e999239905
 2019-11-29 11:39:49 -05:00
Hypolite Petovan 25194b58b8 Initialize class members in App\Page 
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-559680658
 2019-11-29 11:33:48 -05:00
Tobias Diekershoff 0191f5242b
Merge pull request #7877 from annando/show-received 
Show the received date along with the creation date of posts
 2019-11-29 12:42:03 +01:00
Michael 02875df596 Show the received date along with the creation date of posts 2019-11-29 06:24:02 +00:00
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