12744 Commity (014fc5dccbf24a6473e0e2e9bdca810103d8b202)

Wszystkie gałęzie

Szukaj

Autor	SHA1	Wiadomość	Data
Tobias Diekershoff	e94b133f6d	Merge pull request #2647 from rabuzarus/2806_viewcontacts ... viewcontacts - fix: tabmenu was not returned	2016-06-28 12:41:43 +02:00
rabuzarus	1f50db2b2a	viewcontacts - fix: tabmenu was not returned	2016-06-28 12:32:09 +02:00
Tobias Diekershoff	895f6d03ce	Merge pull request #2644 from rabuzarus/2706_hovercard_tags ... hovercard.php - fix tags for hovercard	2016-06-27 15:12:45 +02:00
rabuzarus	60b767168a	hovercard.php - fix tags for hovercard	2016-06-27 11:57:47 +02:00
Michael Vogel	a5030f0b60	Merge pull request #2643 from rabuzarus/2606_jot_mobile ... frio: restructure jot modal and make jot modal work on mobile	2016-06-27 11:34:02 +02:00
rabuzarus	571a4fed99	frio: restructure jot modal and make jot modal work on mobile	2016-06-27 10:33:20 +02:00
Tobias Diekershoff	f17f0d1b02	Merge pull request #2642 from rabuzarus/2606_frio_network_heading ... frio: move some more headings to the navbar	2016-06-26 16:25:30 +02:00
rabuzarus	75f838c53b	frio: move some more headings to the navbar	2016-06-26 11:02:12 +02:00
Tobias Diekershoff	be5491e12d	Merge pull request #2641 from rabuzarus/2606_frio_jot ... frio: fix - jot default was not removed in every case while inserting…	2016-06-26 06:45:10 +02:00
rabuzarus	aec885b963	frio: fix - jot default was not removed in every case while inserting content	2016-06-26 03:49:21 +02:00
Tobias Diekershoff	773517a734	Merge pull request #2638 from annando/1606-avatar-handling ... Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 19:51:00 +02:00
Tobias Diekershoff	6c22cb917a	Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs ... viewcontacts - make the tabbar available even if hide-friends is active	2016-06-25 19:48:35 +02:00
Tobias Diekershoff	ce06b3ae4a	Merge pull request #2640 from rabuzarus/2506_micropro ... move html from function micropro() to own templates	2016-06-25 19:47:23 +02:00
rabuzarus	fd72f36ffe	move html from function micropro() to own templates	2016-06-25 18:46:47 +02:00
rabuzarus	06959d745e	viewcontacts - make the tabbar available even if hide-friends is active	2016-06-25 16:20:44 +02:00
Michael Vogel	9f99f37975	Merge pull request #2637 from rabuzarus/2506_wallmessage_js ... frio: Wallmessage - distinguish between own and foreign host	2016-06-25 14:09:44 +02:00
Michael Vogel	ad6b3f8815	Merge pull request #2636 from rabuzarus/2506_frio_strings ... add missing strings for frio	2016-06-25 14:03:34 +02:00
rabuzarus	9c2446c53c	Merge pull request #2635 from annando/1606-probe-diaspora ... Support for the case when the guid and public key will vanish from webfinger	2016-06-25 13:58:45 +02:00
Michael Vogel	0b1188b7fe	Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 13:56:55 +02:00
rabuzarus	84263ee8de	frio: Wallmessage - distinguish between own and foreign host	2016-06-25 13:02:53 +02:00
rabuzarus	073f520cee	add missing strings for frio	2016-06-25 12:21:13 +02:00
Michael Vogel	e2023b6667	Store the guid value as well.	2016-06-25 11:52:52 +02:00
Michael Vogel	ec5b3109e4	Support for the case when the guid and public key will vanish from webfinger	2016-06-25 00:38:47 +02:00
Tobias Diekershoff	f8a20a15d3	Merge pull request #2633 from annando/1606-author-id-update ... author-id/owner-id: Post update function/added database documentation	2016-06-24 07:03:46 +02:00
Tobias Diekershoff	782e31c5cf	Merge pull request #2634 from rabuzarus/2306_Update_Network ... network.php - raw && update mode don't need the network tabs	2016-06-24 06:59:35 +02:00
rabuzarus	cf696f6d1f	network.php - raw && update mode don't need the network tabs	2016-06-24 00:33:31 +02:00
Michael Vogel	eabf8734a8	Merge pull request #2631 from rabuzarus/1906-event-test ... cal export && public calendar - fix permissions	2016-06-23 23:24:27 +02:00
Michael Vogel	c7373dcec4	author-id/owner-id: Post update function/added database documentation	2016-06-23 21:15:54 +02:00
rabuzarus	55205e344f	Merge pull request #2632 from annando/1606-parse-title ... Always parse the first title element	2016-06-23 10:18:58 +02:00
rabuzarus	e352458ef0	pub calendar - permission clean up and docu	2016-06-23 10:07:13 +02:00
Michael Vogel	8cabcda5e0	Always parse the first title element	2016-06-22 21:00:58 +02:00
rabuzarus	111f77ac64	pub calendar - add sql perms to the query (I forgot to do this)	2016-06-22 15:06:14 +02:00
rabuzarus	cd92a0dc34	Merge pull request #2624 from annando/1606-contact-id ... Item: New fields for author id and owner id - avatar improvement with relocation	2016-06-22 14:26:39 +02:00
rabuzarus	2cac69ca86	cal export && public calendar - even better permissions testing	2016-06-22 13:50:47 +02:00
rabuzarus	8cc5dd35e8	cal export && public calendar - fix permissions	2016-06-22 00:39:52 +02:00
Michael Vogel	49c19a3c00	Merge pull request #2628 from rabuzarus/1906-event-test ... move the cal addon (exporting calendars) to core	2016-06-21 22:48:31 +02:00
fabrixxm	d8d24baa55	Merge pull request #2630 from dissolve/mf2updates ... update MF2 and vcard data for issue #2629	2016-06-21 20:48:09 +02:00
Ben Roberts	864cf0f70d	update MF2 and vcard data for issue #2629	2016-06-21 10:23:43 -04:00
Michael Vogel	9a7653a4fe	Store the author-id and owner-id in mod/item.php as well	2016-06-21 07:54:45 +02:00
Michael Vogel	266fea3874	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-21 00:10:24 +02:00
rabuzarus	5324023d52	Merge pull request #2627 from annando/1606-diaspora-uri ... Diaspora: Try to fetch the uri if we already received the message	2016-06-20 23:43:40 +02:00
rabuzarus	d076f61a4a	cal export - little fix for json	2016-06-20 23:38:34 +02:00
rabuzarus	71c9f562ae	move the cal addon (exporting calendars) to core	2016-06-20 23:31:49 +02:00
Michael Vogel	a657377616	Diaspora: Try to fetch the uri if we already received the message	2016-06-20 22:48:55 +02:00
Michael Vogel	40a44f1571	Some manual revert ...	2016-06-20 22:48:09 +02:00
Michael Vogel	467176fa65	Diaspora: Ensure that we always store the correct URI	2016-06-20 22:43:14 +02:00
Michael Vogel	939bd965c5	Search query optimized	2016-06-20 22:03:40 +02:00
Michael Vogel	b411380c4c	Merge pull request #2625 from rabuzarus/1906-event-test ... frio: disable the events module link in the profile tab	2016-06-20 14:26:27 +02:00
rabuzarus	80f5065eb0	frio: disable the events module link in the profile tab	2016-06-20 13:44:11 +02:00
Michael Vogel	65b541413f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-20 07:28:47 +02:00