9869 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
fabrixxm	35e9fc3b02	use fields template in photo edit form	2015-06-22 20:07:19 +02:00
Tobias Diekershoff	a58596e00a	Merge pull request #1678 from annando/1506-ostatus-completion ... OStatus: Still some room for improvements	2015-06-22 07:59:40 +02:00
Tobias Diekershoff	bc82b94564	Merge pull request #1677 from annando/1506-vier-threads ... Vier: Improved threading	2015-06-22 07:55:39 +02:00
Michael Vogel	e9542a8d17	OStatus: Support for events and questions	2015-06-21 22:36:24 +02:00
Michael Vogel	da9bbc92d3	OStatus: Support for bookmarks	2015-06-21 22:02:44 +02:00
Michael Vogel	bc42b6440a	Vier: Improved threading	2015-06-21 20:40:39 +02:00
fabrixxm	50af1fc2c3	Merge pull request #1676 from tobiasd/20150620-markdown ... markdownification problems	2015-06-21 11:46:13 +02:00
Michael Vogel	2afc9c31f9	Changed logging behaviour	2015-06-21 08:32:03 +02:00
Michael Vogel	5221f38db7	ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them.	2015-06-21 01:37:09 +02:00
Michael Vogel	8229737d2d	Small restructuring	2015-06-21 01:36:23 +02:00
Michael Vogel	df7b907bc4	Display: Look for the network name when fetching the contact (important because of the statusnet connector)	2015-06-21 01:34:57 +02:00
Michael Vogel	846edd5bbb	Bugfix for repeated items in conversations	2015-06-20 17:26:47 +02:00
Michael Vogel	1bbbf2a5f2	Stuff ...	2015-06-20 14:41:53 +02:00
Michael Vogel	c8430f4c44	Moved all OStatus code in a single file.	2015-06-20 14:40:30 +02:00
Tobias Diekershoff	7c48ed60eb	hide some HTML coded chars from markdownification	2015-06-20 14:27:42 +02:00
Tobias Diekershoff	8fa2030023	<3 causes troubles in D*	2015-06-20 12:31:34 +02:00
Michael Vogel	168906f9c9	Code cleanup	2015-06-20 09:15:19 +02:00
Michael Vogel	6fbb03801c	The OStatus completion is now called before the original item is stored.	2015-06-20 08:44:29 +02:00
Tobias Diekershoff	650e6bc575	Merge pull request #1674 from fraengii/patch-2 ... Update Quick-Start-groupsandpages.md	2015-06-17 10:52:11 +02:00
Frank Dieckmann	3c135c4d78	Update Quick-Start-groupsandpages.md ... Changed the style in line 12. I think it is better now.	2015-06-17 10:48:23 +02:00
Tobias Diekershoff	f1dbbfd291	Merge pull request #1673 from fraengii/patch-1 ... Update Connectors.md	2015-06-17 10:39:41 +02:00
Frank Dieckmann	85bf6e8fb4	Update Connectors.md ... Changed '<domain_des_friendica-servers>/friendica' to '&lt;domain_des_friendica-servers&gt;/friendica'	2015-06-17 10:32:50 +02:00
fabrixxm	1cd5a3184d	Merge pull request #1672 from tobiasd/20150614-frank ... resolving merge issues with DE doc merging	2015-06-15 14:00:18 +02:00
Tobias Diekershoff	78321c2a43	Merge pull request #1670 from annando/setup-rewrite-check ... The installation prozess has a problem with self signed certificates	2015-06-15 13:25:54 +02:00
Tobias Diekershoff	7ef99269e7	Merge pull request #1671 from annando/issue-1642-b ... This is working fix for issue 1642	2015-06-15 13:25:26 +02:00
Tobias Diekershoff	4312da6326	BOSH server for Jappixmini addon	2015-06-15 13:19:02 +02:00
Tobias Diekershoff	c2ca9a3e17	hint in the docs to start from develop	2015-06-15 13:18:32 +02:00
Tobias Diekershoff	e839e3e1ec	Merge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style' into 20150614-frank	2015-06-15 13:07:36 +02:00
Michael Vogel	7feda0120f	This is working fix for issue 1642	2015-06-15 01:20:04 +02:00
Michael Vogel	0e157b1288	Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check	2015-06-15 00:55:05 +02:00
fabrixxm	42f4f3fce9	Merge pull request #1668 from annando/issue-1642 ... Better detection for the mobile client to avoid "{0}" in notifications	2015-06-14 15:58:52 +02:00
fabrixxm	c7566d4917	Merge pull request #1669 from annando/1506-ostatus-v3 ... Yet another OStatus improvement	2015-06-14 15:52:10 +02:00
fabrixxm	4ec7102c9c	Merge pull request #1667 from annando/1506-remote-subscribe ... Remote subscribe from a GNU Social site is now possible	2015-06-14 15:49:03 +02:00
Michael Vogel	9ca04e4e69	Just a to-do added	2015-06-14 11:39:15 +02:00
Michael Vogel	fa288173c3	OStatus: Force parent when storing item.	2015-06-14 10:56:57 +02:00
Michael Vogel	b7f270de28	probe_url: Better detection for non-standard installations of GNU Social	2015-06-14 01:52:26 +02:00
Michael Vogel	b22296d454	Better support for non standard installations of GNU Social in "probe_url"	2015-06-14 01:49:14 +02:00
Michael Vogel	abc84f96ab	The installation prozess has a problem with self signed certificates.	2015-06-13 21:58:40 +02:00
Michael Vogel	c89c0916e2	Better detection for the mobile client to avoid "{0}" in notifications.	2015-06-13 20:23:26 +02:00
Michael Vogel	66058c6cf4	Remote subscribe from a GNU Social site is now possible	2015-06-13 19:51:45 +02:00
Michael Vogel	e0147a24ad	Send poco data in the atom entries.	2015-06-13 09:59:17 +02:00
Michael Vogel	9a6511dc38	Send a salmon notification when its a ostatus thread or you reply to an ostatus message	2015-06-13 09:12:28 +02:00
Michael Vogel	740bc41680	Update contact from poco fields when importing messages/repeated items now het the same uri.	2015-06-13 09:11:17 +02:00
Michael Vogel	e36627c7b7	fetch the full name of a contact from the poco fields (if present)	2015-06-13 09:08:52 +02:00
Michael Vogel	4704933b6e	Use the display name (full name) instead of the nick name when importing.	2015-06-13 09:07:13 +02:00
Frank Dieckmann	a9b08a1281	Capitalization of german addressing and work on linguistic style	2015-06-12 21:10:47 +02:00
Michael Vogel	60ad7af6f3	Some bugfixing.	2015-06-12 01:08:06 +02:00
Michael Vogel	ad45ff7eb1	OStatus: Notifier for Friendica, better thread completion	2015-06-12 00:39:56 +02:00
Tobias Diekershoff	e02546880f	Merge pull request #1662 from annando/issue-1628 ... The values for "sitename" and "register_text" was nedlessly encoded	2015-06-11 06:33:38 +02:00
Tobias Diekershoff	eba4f7dcc1	Merge pull request #1663 from rabuzarus/vier-remote-link ... remote-link button in vier	2015-06-11 06:33:07 +02:00