28988 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	cf38fd917a	missed some parts	2017-09-20 18:14:32 +02:00
Tobias Diekershoff	599252faea	path to 3.5.3 something for the CHANGELOG	2017-09-20 18:09:08 +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
Michael	cd16155c96	Only warn when there are arguments at all	2017-09-15 03:10:04 +00:00
Michael	f29e21eb5c	We now avoid prepared statements without an argument	2017-09-15 03:00:38 +00:00
Michael	d10eaefaa9	Improved regular expression for the Diaspora link detection	2017-09-14 22:04:37 +00:00
Michael	87fffde80e	Documented some unknown verbs	2017-09-14 20:40:05 +00:00
Michael	9dfb9c1c45	Only fetch items that don't exist in the system	2017-09-14 19:23:14 +00:00
Michael	9468b7427d	Allow replies as well	2017-09-14 10:00:45 +00:00
Tobias Diekershoff	641e41067e	Merge pull request #3701 from annando/issue-3700 ... Issue 3700: Security and Privacy related Headers	2017-09-14 10:28:03 +02:00
Tobias Diekershoff	6057dc51f5	Merge pull request #3703 from annando/api-twidere ... API: Improvements for clients with bad HTML support	2017-09-14 10:25:17 +02:00
Michael	c3589dc043	Added documentation	2017-09-14 06:10:33 +00:00
Michael	4b99d122dd	Added explanation	2017-09-14 05:48:43 +00:00
Michael	7a3bb02f11	Issue 3700: Security and Privacy related Headers	2017-09-14 05:40:23 +00:00
Michael	c6ceae5225	The old database function is now replaced with a wrapper	2017-09-14 05:19:05 +00:00
Michael	e18a037fb2	API: Improvements for clients with bad HTML support	2017-09-14 05:16:23 +00:00