10659 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
rabuzarus	442d59abc4	template rework: multi-row view for the other themes	2015-10-23 21:45:16 +02:00
rabuzarus	86f94570ef	template rework: delete unused templates	2015-10-23 16:49:12 +02:00
rabuzarus	eaf5d05030	template rework: display more infos for match and dirfind	2015-10-23 16:48:32 +02:00
rabuzarus	b6cceda131	template rework: revert commit because plugin community home uses the css classes	2015-10-23 15:41:49 +02:00
rabuzarus	7c9df68964	template rework: revert #b2bb600 for vier (is needed for right sidebar)	2015-10-23 15:23:00 +02:00
rabuzarus	fad8ebc355	template rework: two row contact page for vier	2015-10-23 15:18:05 +02:00
rabuzarus	efb12aed20	template rework: little theme specific changes (frost, quattro)	2015-10-23 01:32:03 +02:00
rabuzarus	b2bb600f3a	template rework: delete unused css	2015-10-23 01:04:47 +02:00
rabuzarus	0c3979720f	template rework: rearrange sidebar widgets for contact related pages	2015-10-23 00:12:00 +02:00
rabuzarus	2aad62190f	template rework: use viewcontact_template.tpl also for directory	2015-10-22 22:48:49 +02:00
Tobias Diekershoff	64a5b33e77	Merge pull request #1973 from annando/1510-ejabberd-auth ... Support for additional passwords for ejabberd	2015-10-20 07:11:47 +02:00
Michael Vogel	891ad5b39d	Support for additional passwords for ejabberd	2015-10-19 19:03:11 +02:00
Michael Vogel	59559e7452	Merge pull request #1971 from tobiasd/20151019-docs ... Updates to the documentations	2015-10-19 10:10:24 +02:00
Tobias Diekershoff	c652aec970	Updates to the documentations	2015-10-19 07:58:13 +02:00
rabuzarus	f9c0c1d696	template rework: use viewcontact_template.tpl for contact dealing pages	2015-10-18 17:12:48 +02:00
Tobias Diekershoff	5317c0b28f	Merge pull request #1968 from annando/1510-directory-configuration ... Set the new configuration for the global directory when updating	2015-10-18 16:08:48 +02:00
rabuzarus	4c1c614fa6	Merge viewcontact into template_rework	2015-10-17 22:28:09 +02:00
rabuzarus	452a3011f7	Merge suggest into template_rework	2015-10-17 22:22:52 +02:00
rabuzarus	dbf1f9efcd	Merge dirfind into template_rework	2015-10-17 22:22:35 +02:00
rabuzarus	e55f9f8f07	Merge dir into template_rework	2015-10-17 22:22:20 +02:00
rabuzarus	4b8ca578d1	dirfind: move pagination into template	2015-10-17 22:09:19 +02:00
rabuzarus	b9d9bf8ecd	directory: move pagination into template	2015-10-17 21:45:55 +02:00