10724 Commity (e5edd7b7db2b2953d2f1a31b5bd2d4623fb6a4c8)

Wszystkie gałęzie

Szukaj

Autor	SHA1	Wiadomość	Data
Michael Vogel	0f563525bd	Optical adjustments for contacts/set "last_failure" when inaccessible	2015-11-06 09:15:20 +01:00
Tobias Diekershoff	721e7e410c	Merge pull request #2013 from annando/1511-addr2 ... The address field is now displayed instead of the url - if available	2015-11-06 06:57:06 +01:00
Michael Vogel	f42a3c9bc6	Update the contact table as well.	2015-11-06 01:19:37 +01:00
Michael Vogel	0f41f35041	The contact template now displays the address if available	2015-11-06 00:47:54 +01:00
Michael Vogel	2e81d0a2b3	Fetch the "addr" value whenever it is empty	2015-11-05 10:55:00 +01:00
Tobias Diekershoff	be067bcf96	Merge pull request #2011 from annando/1511-gcontact-addr ... The "addr" field is now in the global contacts as well.	2015-11-05 09:10:25 +01:00
Michael Vogel	d6080f4c76	The "addr" field is now in the global contacts as well.	2015-11-05 08:37:00 +01:00
Tobias Diekershoff	ff15521e38	Merge pull request #2010 from annando/probeurl-diaspora ... Bugfix: Friendica contacts where detected as OStatus contacts	2015-11-05 06:50:23 +01:00
Michael Vogel	a193a482cd	Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts	2015-11-05 00:42:38 +01:00
Tobias Diekershoff	1075fa2c38	Merge pull request #2009 from annando/1511-vier-mobile2 ... Vier: Mobile mode should be better now	2015-11-04 06:22:41 +01:00
Michael Vogel	5b2e1188c0	Vier: Network name, "ago" and the quote description are now smaller when mobile.	2015-11-04 00:07:05 +01:00
Michael Vogel	546fd6cbbe	Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2	2015-11-03 23:56:57 +01:00
Michael Vogel	3b11436b02	Merge pull request #1989 from rabuzarus/allfriends ... template-rework: let common friends and allfriends use viewcontact_te…	2015-11-03 23:27:24 +01:00
Michael Vogel	451b07cfe7	Mobile should be better now	2015-11-03 23:11:36 +01:00
Michael Vogel	eff6f3a57d	On small computers the stylesheet changed to mobile by accident.	2015-11-03 19:14:28 +01:00
rabuzarus	a0ae6eb905	template-rework:little cleanup	2015-11-03 14:33:17 +01:00
rabuzarus	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +01:00
Tobias Diekershoff	162931be91	Merge pull request #2006 from annando/1511-vier-mobile ... Vier is now a little bit more mobile ready.	2015-11-03 07:30:36 +01:00
fabrixxm	b10f9fdb04	Merge pull request #2007 from annando/1511-network-timeout ... Bugfix: The timeout value of z_fetch_url couldn't be set manually	2015-11-03 07:17:13 +01:00
Michael Vogel	e3fdb33df0	Vier: Added the credits to the pages without left sidebar	2015-11-03 01:19:22 +01:00
Michael Vogel	6a15dded0e	Bugfix: The timeout value of z_fetch_url couldn't be set manually	2015-11-03 00:48:49 +01:00
Michael Vogel	1831066259	Vier is now a little bit more mobile ready.	2015-11-02 23:12:09 +01:00
rabuzarus	f196389580	Merge develop into allfriends	2015-11-02 14:31:20 +01:00
fabrixxm	4525db2c4a	Small fix: one "mistpark" left in doc/Settings.md	2015-11-02 09:35:07 +01:00
Tobias Diekershoff	939de1ec7d	Merge pull request #2004 from annando/1511-ostatus-diaspora ... Check if Diaspora and OStatus can be enabled at all	2015-11-01 14:31:55 +01:00
Tobias Diekershoff	1a42e31718	mark the development version	2015-11-01 14:26:06 +01:00
Michael Vogel	709aac0652	Only offer the choice to activate Diaspora and OStatus if the system is ready for it	2015-11-01 13:55:49 +01:00
Tobias Diekershoff	288d4e0d7b	Merge pull request #2003 from annando/1511-vier-styles ... Vier: The different styles are now working with the right menubar	2015-11-01 10:08:22 +01:00
Michael Vogel	6a53e3959f	Vier: The different styles are now working with the right menubar	2015-11-01 09:45:02 +01:00
Tobias Diekershoff	3317d7a288	Merge pull request #2002 from annando/1511-cid ... Return the contact id at "all_friends" and "common_contacts"	2015-11-01 09:02:09 +01:00
Michael Vogel	b87d7ef1af	Return the contact id at "all_friends" and "common_contacts"	2015-11-01 08:54:44 +01:00
Michael Vogel	2f47d63a29	Merge pull request #2000 from tobiasd/20151027-credits ... a credits page	2015-10-31 22:34:30 +01:00
Tobias Diekershoff	cfc9d2b88f	Merge pull request #1998 from annando/1510-network-profile2 ... New function for fetching contact data	2015-10-31 19:02:01 +01:00
Tobias Diekershoff	7d0ea70cc1	Merge pull request #2001 from annando/1510-empty-poco ... Bugfix: /poco was always empty	2015-10-31 12:48:30 +01:00
Michael Vogel	0a90f689ac	Merge pull request #1999 from rabuzarus/3010_prv_network ... prvgroup mentioning in status_editor	2015-10-31 10:49:01 +01:00
Michael Vogel	7cf4468353	Bugfix: /poco was always empty	2015-10-31 10:32:01 +01:00
Michael Vogel	09ff2f0dd5	Renamed the function	2015-10-31 00:01:33 +01:00
Tobias Diekershoff	c00847a79d	use section_title.tpl for page title	2015-10-30 18:05:45 +01:00
rabuzarus	fc37f49f23	network.php: add a descriptive comment	2015-10-30 12:47:48 +01:00
rabuzarus	56c9f23e99	prvgroup mentioning in status_editor	2015-10-30 01:59:17 +01:00
Michael Vogel	f3ce812a9e	New function for fetching contact data	2015-10-30 01:30:42 +01:00
Tobias Diekershoff	44c3c9f569	intro note	2015-10-29 22:10:24 +01:00
Tobias Diekershoff	3be34f82ee	get special contributors into the credits	2015-10-29 22:05:48 +01:00
fabrixxm	f283ae143a	Merge pull request #1997 from rabuzarus/2910_vier_fix_forums ... vier: include private forums in forum widget	2015-10-29 16:02:17 +01:00
rabuzarus	f0f3360c4b	vier: include private forums in forum widget	2015-10-29 15:34:55 +01:00
Tobias Diekershoff	6799c90012	link the credits page from the help pages	2015-10-29 08:48:41 +01:00
Tobias Diekershoff	a48156aab6	display names listed in credits.txt from /credits	2015-10-29 08:48:41 +01:00
Tobias Diekershoff	bc8c6eb455	python script to generate the credits.txt from git log and translator names	2015-10-29 08:48:41 +01:00
Tobias Diekershoff	dff1a73bd3	basic styling of the credits list	2015-10-29 08:48:41 +01:00
fabrixxm	fb4adc83dc	Merge pull request #1995 from rabuzarus/2810_fbrowser ... fbrowser: exclude Contact Photos	2015-10-29 08:41:21 +01:00