10801 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tobias Diekershoff	6f601bf47d	Merge pull request #1996 from annando/1510-profile-network-page ... Show the profile in the network view when viewing single contacts	2015-10-29 08:39:56 +01:00
Michael Vogel	2e316b5cf2	Show the profile in the network view when viewing single contacts	2015-10-29 08:10:39 +01:00
Michael Vogel	d2dfe54fc7	Merge pull request #1994 from tobiasd/20151028-issue1974 ... lower number of postings displayed per page for not logged in users	2015-10-28 23:30:16 +01:00
rabuzarus	e88d9153a1	fbrowser: exclude Contact Photos	2015-10-28 23:22:42 +01:00
Tobias Diekershoff	8eda86d8bf	lower number of postings displayed per page for not logged in users	2015-10-28 19:01:45 +01:00
fabrixxm	2205c372db	Merge pull request #1990 from annando/1510-contact-reworked ... The contact search page now shows the connection status	2015-10-28 12:09:16 +01:00
Michael Vogel	5a58f55a36	Set the maximum avatar size to 80 pixels	2015-10-28 00:18:56 +01:00
Michael Vogel	aee4522ad4	The contact page now shows the connection status.	2015-10-27 23:10:52 +01:00
rabuzarus	299c8b83ac	template-rework: let common friends and allfriends use viewcontact_template.tpl	2015-10-27 15:27:26 +01:00
Tobias Diekershoff	367699f785	Merge pull request #1987 from annando/1510-manage-enhancements ... Some small optical and structural changes to the manage template	2015-10-27 09:01:35 +01:00
Tobias Diekershoff	11a7eb8d8f	Merge pull request #1985 from annando/1510-vier-optimize-touch ... Vier: The usability with a touch device is improved	2015-10-27 08:59:47 +01:00
Tobias Diekershoff	4079084492	Merge pull request #1975 from rabuzarus/template_rework ... Template rework for contact related pages	2015-10-27 08:59:03 +01:00
fabrixxm	9984856207	Merge pull request #1988 from annando/1510-more-networks ... New network types NNTP and iCal	2015-10-27 08:26:34 +01:00
Michael Vogel	57bbe037a7	New network types NNTP and iCal	2015-10-27 07:49:02 +01:00
Michael Vogel	99ee45e627	The username is now a link	2015-10-26 23:11:42 +01:00
rabuzarus	7b1a957474	template-rework: try to fix double entries at match.php	2015-10-26 16:15:08 +01:00
rabuzarus	9d720f69aa	template-rework: don't show the findpeople_widget on contact edit page	2015-10-26 13:36:01 +01:00
Michael Vogel	ac744b61f9	Some small optical and structural changes to the manage template	2015-10-26 08:16:37 +01:00
Michael Vogel	a8ef43e80e	Merge pull request #1984 from rabuzarus/manage ... identity selector use now the profile pics	2015-10-26 07:52:56 +01:00
rabuzarus	fdda4be452	manage-selector: use an easier sql querry	2015-10-26 00:19:55 +01:00
Michael Vogel	4f9ec8efac	Vier: The usability with a touch device is improved	2015-10-25 21:01:39 +01:00
rabuzarus	87c559d605	manage-selector: sql - check for same baseurl	2015-10-25 18:04:20 +01:00
rabuzarus	4c263aa4ac	Merge develop into manage ... Conflicts: view/global.css	2015-10-25 16:57:04 +01:00