25092 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	7e7cac19f6	Avoid a guid whith spaces.	2016-03-24 21:32:55 +01:00
Michael Vogel	ec90a9e6ad	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-24 16:19:52 +01:00
Michael Vogel	7bf079d858	Some more documentation - again.	2016-03-24 15:59:53 +01:00
Michael Vogel	24afcdd5dd	Scrape: Always take the first alias	2016-03-24 08:35:06 +01:00
Michael Vogel	7aae852fe0	Some more code cleaning	2016-03-23 22:12:08 +01:00
Tobias Diekershoff	dcb8d51a4c	Merge pull request #2423 from annando/1603-api-conversation ... API: Support for the conversation api call from GNU Social	2016-03-23 14:53:27 +01:00
Michael Vogel	799ff77797	API: Support for the conversation api call from GNU Social	2016-03-23 10:24:01 +01:00
Michael Vogel	ac35f8c756	If the message already exists then the message id should be returned	2016-03-23 09:22:59 +01:00
Michael Vogel	28dfaa694c	Add OEmbed data to the body of reshares	2016-03-23 07:36:17 +01:00
Michael Vogel	e8c07aaac6	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-23 06:59:20 +01:00
Tobias Diekershoff	430be22bb9	Merge pull request #2422 from annando/1603-oembed-object ... Bugfix: Avoid warning with non object OEmbed data	2016-03-23 06:51:14 +01:00
Michael Vogel	791ce24cd5	Bugfix: Avoid warning with non object OEmbed data	2016-03-22 23:24:07 +01:00
Michael Vogel	62103fe5f4	Reshare of reshares now work.	2016-03-22 23:00:42 +01:00
Michael Vogel	90d4b93424	Avoid an empty handle	2016-03-22 07:13:56 +01:00
Michael Vogel	c284ab5eff	Some more documentation - to make @rabuzarus happy	2016-03-21 19:58:45 +01:00
Michael Vogel	206c26ae30	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-21 06:47:47 +01:00
Tobias Diekershoff	0bcd6886f0	Merge pull request #2419 from annando/1603-fbrowser ... Take the second largest picture as preview - not the smallest one	2016-03-21 06:41:48 +01:00
Tobias Diekershoff	53546e92d3	Merge pull request #2420 from annando/1603-guid ... Add the guid to items that we create locally	2016-03-21 06:40:55 +01:00
Tobias Diekershoff	ce48fb7e85	Merge pull request #2421 from annando/1603-dfrn-tagging ... DFRN: Remote tagging works now	2016-03-21 06:39:59 +01:00
Michael Vogel	5a04ba8416	Added documentation	2016-03-20 16:16:15 +01:00
Michael Vogel	77ed71e2e0	DFRN: Remote tagging works now	2016-03-20 15:53:37 +01:00
Michael Vogel	8f00836ffb	Add the guid to items that we create locally	2016-03-20 15:01:50 +01:00
Michael Vogel	186eaf1264	Take the second largest picture as preview - not the smallest one	2016-03-20 10:30:06 +01:00
Michael Vogel	d676ae0f32	The signature creation now moved into the Diaspora class. That's much cleaner.	2016-03-19 15:49:47 +01:00
Michael Vogel	5c44a787bf	The documentation should now be complete	2016-03-18 22:28:20 +01:00
Michael Vogel	be5267edda	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-18 21:28:34 +01:00
fabrixxm	bfde20f5fe	Merge pull request #2417 from annando/1603-sess_data ... There is no table "sess_data" - this database call is useless	2016-03-18 18:46:28 +01:00
Michael Vogel	a2507804f2	There is no table "sess_data" - this database call is useless	2016-03-18 16:42:10 +01:00
fabrixxm	7ef4d8a404	Merge pull request #2416 from tobiasd/20160317-issue2330 ... added title element to emoji images in main repository	2016-03-18 08:29:30 +01:00
Michael Vogel	e74587b375	Just some more documentation	2016-03-18 08:07:23 +01:00
Michael Vogel	fab48926d0	Added some documentation, script to generate a basic doxygen header	2016-03-17 23:44:18 +01:00
Tobias Diekershoff	bc579ff799	added title element to emoji images in main repository	2016-03-17 17:41:06 +01:00
Michael Vogel	16b92af71f	Retraction do work as well	2016-03-17 12:24:23 +01:00
Michael Vogel	88fea17cab	Everything tested, one open to-do	2016-03-17 00:37:44 +01:00
Michael Vogel	e058feed28	Better reshare detection	2016-03-16 21:27:07 +01:00
Michael Vogel	468734a26e	Added checklist	2016-03-16 19:30:46 +01:00
Michael Vogel	f6c950823f	Merge remote-tracking branch 'upstream/develop' into 1602-diaspora	2016-03-16 19:30:26 +01:00
Michael Vogel	84a475e589	Missing include	2016-03-16 16:49:54 +01:00
Tobias Diekershoff	8eb05fd1bd	Merge pull request #2415 from annando/1603-dfrn-hash ... DFRN: Mentions were imported as hash tags	2016-03-16 16:08:32 +01:00
Michael Vogel	071ffd43bf	DFRN: Mentions were imported as hash tags	2016-03-16 11:44:45 +01:00
Michael Vogel	be001d171b	Values are sanitized, messages are not relayed when there is no signature	2016-03-15 20:14:08 +01:00
Silke Meyer	a4dd0b835c	Merge branch 'develop' of https://github.com/friendica/friendica into develop	2016-03-15 11:18:15 +01:00
Michael Vogel	8027854886	Removed moved function	2016-03-15 07:18:11 +01:00
Michael Vogel	3f2a23d48c	Unused files are removed	2016-03-15 07:05:10 +01:00
Michael Vogel	eed55664fc	Reshares now store the original XML as well.	2016-03-15 00:26:28 +01:00
Michael Vogel	4b5e7007a7	Bugfix: XML copy had problems with "&"	2016-03-14 23:54:01 +01:00
Michael Vogel	dc2e7a66b3	The Diaspora class is now productive	2016-03-14 23:11:43 +01:00
Michael Vogel	6f43d3a4c4	Profile update is now working with the new function as well	2016-03-14 22:10:26 +01:00
Michael Vogel	56cb6cc897	Removed just more old diaspora function calls.	2016-03-14 20:53:44 +01:00
Michael Vogel	3734555715	Conversations are working now too	2016-03-14 20:04:17 +01:00