clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,996 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tobias Diekershoff dd45dcbef3 Merge pull request #3719 from annando/bugfix-api 
Bugfix: The API picture upload created an invalid link
 2017-09-21 06:43:36 +02:00
Michael Vogel b3781d0933 Merge pull request #3718 from tobiasd/20170920-doc 
that place is long gone, and a typo
 2017-09-21 00:11:59 +02:00
Michael cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
Tobias Diekershoff 37e6651f9f that place is long gone, and a typo 2017-09-20 19:26:15 +02:00
Tobias Diekershoff 1e8fd425bd Version 3.5.3-rc 2017-09-20 17:42:45 +02:00
Tobias Diekershoff 3e8dc38180 Merge pull request #3716 from annando/bugfix-mail 
Bugfix: Mails weren't created
 2017-09-19 15:10:22 +02:00
Michael fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
Tobias Diekershoff ca5b12063d Merge pull request #3715 from annando/ostatus-atom 
OStatus: Directly serve atom+xml if requested
 2017-09-19 14:44:38 +02:00
Michael b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
Tobias Diekershoff c993865169 Merge pull request #3713 from annando/pleroma-detection 
Bugfix: Pleroma was detected as Mastodon
 2017-09-18 08:34:45 +02:00
Michael 5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
Tobias Diekershoff 9a0bcc402a Merge pull request #3712 from annando/ostatus-again 
Some more OStatus stuff
 2017-09-18 07:44:18 +02:00
Michael 926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
Michael 8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Tobias Diekershoff af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction 
Diaspora: Sending retractions only worked for posts
 2017-09-16 21:24:50 +02:00
Tobias Diekershoff 58adb42009 Merge pull request #3709 from annando/diaspora-link2 
Improvement for PR 3705: The detection has to be changed here as well
 2017-09-16 21:23:55 +02:00
Michael ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
Michael 0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
Tobias Diekershoff 7e193cfb7a Merge pull request #3708 from annando/dba-bugfix 
Bugfix for pictures that weren't stored / reworked database calls
 2017-09-16 07:24:56 +02:00
Michael 0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
Michael 72b42ad688 Last blob is now filled with the new functions 2017-09-15 21:17:58 +00:00
Michael dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael 6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Michael Vogel 40fa941518 Merge pull request #3707 from tobiasd/20170915-message 
regenerated master messages.po file
 2017-09-15 14:14:52 +02:00
Tobias Diekershoff 30bc6ab088 regenerated master messages.po file 2017-09-15 10:08:26 +02:00
Tobias Diekershoff fb0451473f Merge pull request #3706 from annando/network-page 
Reworked network page
 2017-09-15 09:31:43 +02:00
Michael c12075a005 Merge remote-tracking branch 'upstream/develop' into network-page 2017-09-15 06:42:33 +00:00
Tobias Diekershoff 0384e875a2 Merge pull request #3702 from annando/new-dba 
The old database function is now replaced with a wrapper
 2017-09-15 08:31:25 +02:00
Michael f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
Michael 88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
Tobias Diekershoff 3d4ae91569 Merge pull request #3698 from annando/unfollow 
We can now unfollow a contact without deleting it
 2017-09-15 07:36:15 +02:00
Tobias Diekershoff ad3566aeaa Merge pull request #3704 from annando/ostatus-improved 
OStatus: Only fetch items that don't exist in the system
 2017-09-15 07:18:14 +02:00
Tobias Diekershoff ba5cbbe880 Merge pull request #3705 from annando/diaspora-link-2 
Improved regular expression for the Diaspora link detection
 2017-09-15 07:15:54 +02:00
Michael cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00