keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25521 commits 4 branches 0 tags 179 MiB
Commit graph

25521 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Hypolite Petovan
97dddf91b7
Merge pull request #7856 from casperrutten/develop 
Update to version 1.9.1
 2019-11-22 11:54:36 -05:00
Hypolite Petovan
cde467eca1
Merge pull request #7854 from annando/notice-ap-mail 
Fix mail delivery via AP when the contact is hidden
 2019-11-22 11:49:40 -05:00
Casper
8b610bb192
Update to version 1.9.1 
The old version 1.7.2 seems to have an issue with openssl 1.1.1
 2019-11-22 11:39:01 -05:00
Michael
d8da580869 Fix mail delivery via AP when the contact is hidden 2019-11-22 08:01:23 +00:00
Hypolite Petovan
27827d42ca
Merge pull request #7853 from annando/warnings 
Fix some notices/warnings again
 2019-11-21 18:11:10 -05:00
Michael
d3e12c58e2 Fix some notices/warnings again 2019-11-21 22:40:54 +00:00
Hypolite Petovan
11e71780b9
Merge pull request #7851 from annando/mail-header 
Storing the mail header in the item
 2019-11-21 11:10:43 -05:00
Michael
ade926afc6 Storing the mail header in the item 2019-11-21 15:28:18 +00:00
Hypolite Petovan
d48d3d1db2
Merge pull request #7848 from annando/mail-hooks 
Added hooks for the email fetch process
 2019-11-20 16:20:57 -05:00
Michael
a6ae6a83b8 Added hooks for the email fetch process 2019-11-20 20:57:34 +00:00
Hypolite Petovan
ae862c7b55
Merge pull request #7847 from annando/append-title 
Make the automatic title appending optional
 2019-11-19 11:34:18 -05:00
Michael
7c1f8a0597 Renamed config name 2019-11-19 16:31:22 +00:00
Michael
1e9214bfea Use the correct field 2019-11-19 13:10:38 +00:00
Michael
fa876d770e Make the automatic title appending optional 2019-11-19 12:59:21 +00:00
Hypolite Petovan
91491dd798
Merge pull request #7846 from annando/notes-warnings 
Fix further notes and warnings
 2019-11-19 07:03:34 -05:00
Michael Vogel
100dfea524 Fix further notes and warnings 2019-11-19 11:02:35 +01:00
Hypolite Petovan
d62cd5defc
Merge pull request #7845 from annando/diaspora-title 
Show title for posts with attached pages
 2019-11-18 13:54:58 -05:00
Michael Vogel
287c55722e Show title for posts with attached pages 2019-11-18 19:52:00 +01:00
Hypolite Petovan
1964ca6a4a
Merge pull request #7844 from annando/warnings 
Fix warnings
 2019-11-18 13:47:52 -05:00
Michael Vogel
80917018e9 Fix warnings 2019-11-18 19:09:21 +01:00
Hypolite Petovan
6d53036a9f
Merge pull request #7843 from annando/ap-attachments 
Improve the look of fetched feeds and the BBCode processing of attachments
 2019-11-18 08:16:13 -05:00
Michael Vogel
0733ae6aae Improve the look of fetched feeds and the BBCode processing of attachments 2019-11-18 13:29:27 +01:00
Philipp
db65601828
Merge pull request #7842 from annando/fix-fatal 
Fix fatal errors, caused by an empty "verb"
 2019-11-18 08:38:32 +01:00
Michael Vogel
bd6774bd9b Fix fatal errors, caused by an empty "verb" 2019-11-18 07:39:56 +01:00
Hypolite Petovan
3ba9aa0e8e
Merge pull request #7841 from annando/ap-link 
AP: Remove the link description from the "rich html" and adds it to the attachment
 2019-11-17 14:55:51 -05:00
Michael
8644d300d0 Readded empty line 2019-11-17 18:12:20 +00:00
Michael
28ca0d6fab AP: Remove the link description from the "rich html" and adds it to the attachment 2019-11-17 18:10:12 +00:00
Hypolite Petovan
19bbae21de
Merge pull request #7839 from annando/siteinfo 
Don't guess the site info / restrict the description length
 2019-11-15 09:52:41 -05:00
Michael Vogel
a3b7f08f78 Don't guess the site info / restrict the description length 2019-11-15 14:28:42 +01:00
Tobias Diekershoff
94cd5b8b07
Merge pull request #7837 from casperrutten/develop 
Update vagrant_provision.sh
 2019-11-15 08:20:39 +01:00
Casper
91ba4bb2ab
Merge pull request #1 from friendica/develop 
Update from friendica/friendica
 2019-11-14 22:36:36 +00:00
Casper
c1a1f1ce26
Update vagrant_provision.sh 
Line 20-27 -> add slash at the end of every entry and removed empty entries.
Caused error in creating .csr file
PS. the virtualbox-guest-x11 is not in the given debian repository. Better take an Ubuntu repository
Also inserted:
sudo apt-get install -y ubuntu-desktop
sudo systemctl set-default graphical.target
to install a desktop environment
 2019-11-14 21:36:29 +00:00
Hypolite Petovan
a8fa7e5187
Merge pull request #7833 from annando/read-source 
AP: Read different content types for the source and the content
 2019-11-13 11:29:22 -05:00
Michael
fa57fead2e AP: Read different content types for the source and the content 2019-11-13 16:22:20 +00:00
Philipp
ff1e70a7ec
Merge pull request #7832 from annando/ap-rich-mention 
Fix: Mentions in the HTML part of the "contentMap" now are links
 2019-11-13 08:09:07 +01:00
Michael
85b3c880ef Fix: Mentions in the HTML part of the "contentMap" now are links 2019-11-13 06:43:36 +00:00
Hypolite Petovan
a8ace6522c
Merge pull request #7831 from annando/contentmap 
ActivityPub: Use the contentMap to transmit additional content encodings
 2019-11-12 16:30:36 -05:00
Michael
1fb485af1c Use the contentMap to transmit additional content encodings 2019-11-12 20:22:35 +00:00
Hypolite Petovan
35ece9924d
Merge pull request #7829 from annando/picture-links 
Fix image links with descriptions in API and AP transmission
 2019-11-12 07:14:27 -05:00
Michael
8997361609 Better function name 2019-11-11 23:13:36 +00:00
Michael
1b5fa55bdc Fix image links with descriptions in API and AP transmission 2019-11-11 22:37:50 +00:00
Hypolite Petovan
f2c31ef1c0
Merge pull request #7828 from nupplaphil/task/move_enotify 
Remove unnecessary code in "include/enotify"
 2019-11-09 16:48:26 -05:00
Philipp Holzer
dbbe3ec031
Remove deprecated method to find duplicates (issue from 2013) 2019-11-09 22:00:04 +01:00
Philipp Holzer
f9e3ff4b55
Remove unnecessary hash function. 
- Was introduced for getting the last inserted ID before "lastInstertID()" was possible
- See b821399f00 (diff-a8e86a3c07531e66a3b0b4c8b4b07879R148)
 2019-11-09 21:50:52 +01:00
Philipp
ce4c269980
Merge pull request #7827 from MrPetovan/bug/7821-page-flags-255 
User account page flags is stored as 255
 2019-11-09 21:48:58 +01:00
Hypolite Petovan
31f0fe0992 Use correct variable to store user.hidewall in mod/settings 2019-11-09 09:12:20 -05:00