10581 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
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
Tobias Diekershoff	03ff349a94	Merge pull request #1982 from annando/1510-reduced-profile ... Profile data are now reduced to only the most important fields	2015-10-25 16:54:24 +01:00
Tobias Diekershoff	bb4efb01a7	Merge pull request #1980 from annando/1510-coord-ostatus ... OStatus: send the coordinates in an additional field	2015-10-25 16:53:17 +01:00
Tobias Diekershoff	12d9c46ec5	Merge pull request #1979 from annando/1510-gnusocial ... Statusnet is now GNU Social	2015-10-25 16:52:38 +01:00
Tobias Diekershoff	4e78d439e2	Merge pull request #1978 from annando/1510-bad-servers ... Workaround for bad configured servers	2015-10-25 16:52:10 +01:00
Tobias Diekershoff	f84aaaea4d	Merge pull request #1983 from annando/1510-ejabberd-auth ... Bugfix: Authorization at ejabberd only worked for uid=1	2015-10-25 16:51:36 +01:00
rabuzarus	bac61cf596	manage-selector: some cleanup and css work	2015-10-25 16:49:45 +01:00
Michael Vogel	78a8db55c6	Merge pull request #1981 from rabuzarus/poke ... some work on poke template	2015-10-25 14:59:39 +01:00
rabuzarus	5b93bff6da	poke template: make use of global.css	2015-10-25 14:40:56 +01:00
rabuzarus	e0e6762ed8	some inital work to have profile pics on manage page	2015-10-25 14:00:08 +01:00
Michael Vogel	c7205ea705	Bugfix: Authorization at ejabberd only worked for uid=1	2015-10-25 10:17:23 +01:00
Michael Vogel	65403973c1	Merge pull request #1977 from rabuzarus/crepair ... move html from crepair.php to template	2015-10-25 09:44:12 +01:00
Michael Vogel	4dd2a748b9	Merge pull request #1976 from rabuzarus/tabs-id ... tabs have now an ID	2015-10-25 09:42:48 +01:00
Michael Vogel	4631c13d08	Profile data are now reduced to only the most important fields	2015-10-25 09:15:36 +01:00
Michael Vogel	a11833e248	Statusnet is now GNU Social	2015-10-24 20:44:18 +02:00
Michael Vogel	ecf65e52ee	OStatus: send the coordinates in an additional field	2015-10-24 20:42:47 +02:00
Michael Vogel	ddc8f069f2	Workaround for bad configured servers	2015-10-24 20:41:21 +02:00
rabuzarus	8f92b6eea4	some work on poke template	2015-10-24 19:51:58 +02:00
rabuzarus	eb33698556	some minor changes in crepair.tpl	2015-10-24 16:01:55 +02:00
rabuzarus	ea2b3b2f76	move html from crepair.php to template	2015-10-24 15:57:46 +02:00
rabuzarus	87ecd8f658	tabs have now an ID	2015-10-24 15:04:27 +02:00