Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 14:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
29437 commits 3 branches 64 tags 242 MiB
Commit graph

29437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
6915ace6ca Merge pull request #3737 from annando/is_modified 
Items aren't edited when it happens within a second
 2017-09-26 09:42:19 +02:00
Michael
e666c1c035 Items aren't modified when it happens within a second 2017-09-26 06:41:27 +00:00
Tobias Diekershoff
4d4072cf2b Merge pull request #3736 from annando/more-tolerant-xml 
Diaspora: XML parsing is more tolerant now
 2017-09-26 06:09:52 +02:00
Michael
8d95106b9d XML parsing is more tolerant now 2017-09-25 21:34:44 +00:00
Tobias Diekershoff
a60d79e36e Merge pull request #3734 from annando/useless-function 
Removed unused setting
 2017-09-25 22:44:15 +02:00
Tobias Diekershoff
c042e68de8 Merge pull request #3735 from annando/poller-limit 
Poller: A limit of 1 seems to be better
 2017-09-25 22:43:37 +02:00
Michael
03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
Michael
289dde39ce Removed unused setting 2017-09-25 19:05:05 +00:00
Tobias Diekershoff
dc6593f418 Merge pull request #3733 from annando/diaspora-relais 
Diaspora: Posts from Diaspora relais are transmitted the old way
 2017-09-25 10:23:58 +02:00
Michael
1aafb80743 Added log information 2017-09-25 06:04:40 +00:00
Michael
66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
Michael Vogel
0e4845b58a Merge pull request #3731 from tobiasd/20170924-doc 
some more stuff for the docs
 2017-09-24 19:17:57 +02:00
Tobias Diekershoff
3e17335418 Merge pull request #3730 from annando/ostatus-complete 
OStatus: Thread completition hadn't worked for (some) Mastodon systems
 2017-09-24 18:53:35 +02:00
Michael
9d7ab9d941 OStatus: Thread completition hadn't worked for (some) Mastodon systems 2017-09-24 15:31:09 +00:00
Michael Vogel
21fecb956c Merge pull request #3723 from shaftoe/develop 
Fix Nginx example config
 2017-09-24 16:35:12 +02:00
Tobias Diekershoff
bcdccac39c Merge pull request #3729 from annando/plaintext-again 
And another plaintext correction :)
 2017-09-24 16:00:39 +02:00
Tobias Diekershoff
25df40e582 Merge pull request #3728 from annando/diaspora-retraction 
Bugfix: Diaspora retractions not always worked
 2017-09-24 16:00:05 +02:00
Michael
2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
Michael
ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
Michael
80d787d990 Bugfix: Diaspora retractions not always worked 2017-09-24 12:02:32 +00:00
Michael Vogel
7430e83679 Merge pull request #3727 from tobiasd/20170924-de 
update DE translation
 2017-09-24 12:59:58 +02:00
Tobias Diekershoff
7b89168f89 missing linebreaks 2017-09-24 12:05:28 +02:00
Tobias Diekershoff
1353417182 minor rephrasing 2017-09-24 11:04:24 +02:00
Tobias Diekershoff
1085487c0e missing linebreak and a typo 2017-09-24 11:00:16 +02:00
Tobias Diekershoff
592884467b added missing linebreak 2017-09-24 10:55:08 +02:00
Tobias Diekershoff
d0dfcc71a8 missing linebreaks and a small typo 2017-09-24 10:52:14 +02:00
Tobias Diekershoff
9006a678c0 added missing link to translation docs 2017-09-24 10:51:43 +02:00
Tobias Diekershoff
fe7dbb2d49 update DE translation 2017-09-24 10:06:41 +02:00
Tobias Diekershoff
e6f80b3bc1 Merge pull request #3726 from annando/plaintext 
Improved type detection
 2017-09-24 09:48:36 +02:00
Michael
17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
Tobias Diekershoff
d6d1ee9112 Merge pull request #3724 from annando/plaintext 
Better content detection for posts to Twitter
 2017-09-24 07:23:47 +02:00
Tobias Diekershoff
c72d85333b Merge pull request #3725 from annando/mail-bugfix 
Bugfix for better mail import
 2017-09-24 07:22:13 +02:00
Michael
fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
Michael
d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00
Michael
aeb6e53d02 Better content detection for posts to Twitter 2017-09-23 20:13:09 +00:00
Alexander Fortin
1939de2b33 Fix Nginx example config 
Check https://stackoverflow.com/questions/15423500/nginx-showing-blank-php-pages#16887296
for the rest of the change (without, I get white page on a testing
vagrant box)
 2017-09-23 20:55:49 +02:00
Tobias Diekershoff
7360945d8a Merge pull request #3722 from annando/diaspora-plink 
The plink in Diaspora posts now links to the correct place
 2017-09-23 17:41:57 +02:00
Tobias Diekershoff
6fdc524eee Merge pull request #3721 from annando/follow-unfollow 
Improvements for following/unfollowing of Diaspora and OStatus
 2017-09-23 17:40:53 +02:00
Michael
8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
Tobias Diekershoff
1a468372c0 some issues closed 2017-09-23 13:39:20 +02:00
Michael
e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
Michael Vogel
b6f1d3bae3 Merge pull request #3720 from tobiasd/20170921-doc 
stuff for the docs
 2017-09-21 22:45:46 +02:00
Tobias Diekershoff
fb7ce8b82e missing line break 2017-09-21 09:54:52 +02:00
Tobias Diekershoff
4715495df1 added missing line breaks 2017-09-21 09:53:46 +02:00
Tobias Diekershoff
65ff646182 a README would be nice 2017-09-21 09:45:17 +02:00
Tobias Diekershoff
5b65bf2c9f added a note about Diaspora account movements 2017-09-21 09:42:02 +02:00
Tobias Diekershoff
0d9e974122 use typo.php to check before PR 2017-09-21 09:38:03 +02:00
Tobias Diekershoff
ec95fb5c8d clarification 2017-09-21 09:37:23 +02:00
Tobias Diekershoff
ac28cb9532 missing line breaks and some updates 2017-09-21 09:36:52 +02:00
Tobias Diekershoff
1dcc9e4d74 added link to the Wikipedia page about access keys 2017-09-21 09:36:18 +02:00