308 commits

Author	SHA1	Message	Date
Michael Vogel	06a4b0dc5e	Header removed in the contact area	2015-12-01 18:21:05 +01:00
Michael Vogel	fe900ac576	Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework	2015-12-01 17:16:31 +01:00
Michael Vogel	6910604ffb	Merge pull request #2125 from rabuzarus/2911_event_template ... vier event_form: include bb-tags for editing	2015-12-01 17:13:46 +01:00
Michael Vogel	1c93729c46	Tab is added to "all friends" and "common friends"	2015-12-01 08:12:05 +01:00
rabuzarus	39b85c8486	vier event_form: include bb-tags for editing	2015-11-30 16:00:41 +01:00
fabrixxm	2753e62483	Merge pull request #2119 from annando/1511-contact-evolution ... Refurbished contact settings/contact posts	2015-11-30 14:45:23 +01:00
fabrixxm	a60b702df1	Merge pull request #2113 from annando/1511-manage-notifications ... The manage page now shows the notifications	2015-11-30 12:04:53 +01:00
Michael Vogel	4efb6c6f79	Merge pull request #2120 from rabuzarus/2911_network_header ... 2911 network header	2015-11-30 08:30:34 +01:00
rabuzarus	a6aac8f950	networkheader: do css work the other supported themes	2015-11-30 01:24:22 +01:00
Michael Vogel	42d903dd68	Redesign of the contact pages, new tab for contact statuses	2015-11-29 23:22:05 +01:00
Michael Vogel	5649e9e193	The contact page now contains more data	2015-11-29 17:04:48 +01:00
rabuzarus	70860e5836	new_event: default size of textfields	2015-11-29 16:16:18 +01:00
Michael Vogel	583a2f709b	Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design	2015-11-29 10:25:44 +01:00
Tobias Diekershoff	be40fb8186	Merge pull request #2110 from annando/1511-subscribe-feed ... Issue 1779: Atom feed link under the connect link on the profile page	2015-11-29 08:40:39 +01:00
rabuzarus	f5597da059	forumlist - mark selected forum as selected	2015-11-28 23:52:12 +01:00
Michael Vogel	3067663909	The manage page now shows the unread notifications	2015-11-28 22:56:48 +01:00
rabuzarus	a3059d02d4	group_side - unify look with forumlist	2015-11-28 20:09:28 +01:00
Michael Vogel	388847e1f3	Issue 1779: There is now an atom feed link under the connect link on the profile page	2015-11-28 18:11:34 +01:00
Michael Vogel	679ce3243e	Admin settings for table optimisation	2015-11-28 16:35:16 +01:00
Michael Vogel	3b6d3d1ade	Merge pull request #2099 from rabuzarus/2611_new_user_addr ... generate addr for new registered users	2015-11-27 21:35:46 +01:00
rabuzarus	620299dc25	include friendica address in hcard	2015-11-26 17:46:38 +01:00
rabuzarus	ddf3589fc5	count unread forum items for forumlist widget (ping.php)	2015-11-24 22:14:26 +01:00
Michael Vogel	41fe07e128	Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix	2015-11-17 21:34:01 +01:00
Michael Vogel	edb303d44a	Merge pull request #2086 from rabuzarus/0711_forumlist ... 0711 forumlist	2015-11-17 21:33:25 +01:00
rabuzarus	a07a0fd1d7	forumlist: fix id conflict and js show-more	2015-11-17 20:57:12 +01:00
Michael Vogel	4b21512f56	This is a quick fix for the the forumlist.	2015-11-17 19:56:32 +01:00
Michael Vogel	e43c7a4447	Merge pull request #2061 from rabuzarus/0711_forumlist ... move forumlist addon to core	2015-11-17 08:46:15 +01:00
Fabrixxm	0a9e017d34	Installer use static css, fix #2071	2015-11-13 10:56:06 +01:00
rabuzarus	902735f6d4	forumlist: dbupdate	2015-11-11 23:39:14 +01:00
rabuzarus	abf9ebd466	forumlist: small fix	2015-11-10 12:53:56 +01:00
rabuzarus	96b764425e	move forumlist addon to core	2015-11-09 15:56:20 +01:00
fabrixxm	c700a6fb37	duepuntozero, vier: add unread messages per group	2015-11-08 18:02:04 +01:00
Tobias Diekershoff	631afe5810	Merge pull request #2035 from FlxAlbroscheit/develop ... Preview the last 5 conversations in message-sidebar	2015-11-08 16:03:04 +01:00
fabrixxm	ae9c9829fa	Remove language selectors from themes ... This is now a user setting	2015-11-08 14:42:54 +01:00
fabrixxm	fb3ac68cc0	Add user language in settings, use that field as language for UI	2015-11-08 14:23:49 +01:00
fabrixxm	0363bab040	js: add new Dialog object ... The Dialog is used by code to show urls in colorbox. Templates can overwrite `show()` function to change its behaviour	2015-11-08 12:01:19 +01:00
FlxAlbroscheit	603dad93f3	Preview last five conversations in message-sidebar	2015-11-07 18:54:20 +01:00
fabrixxm	5f6ea6357d	Add 'Reload active themes' to admin ... It will call 'uninstall()' and 'install()' on every active themes	2015-11-06 23:53:10 +01:00
rabuzarus	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +01:00
rabuzarus	f196389580	Merge develop into allfriends	2015-11-02 14:31:20 +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	c00847a79d	use section_title.tpl for page title	2015-10-30 18:05:45 +01:00
Tobias Diekershoff	a48156aab6	display names listed in credits.txt from /credits	2015-10-29 08:48:41 +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	4079084492	Merge pull request #1975 from rabuzarus/template_rework ... Template rework for contact related pages	2015-10-27 08:59:03 +01:00
Michael Vogel	99ee45e627	The username is now a link	2015-10-26 23:11:42 +01:00
Michael Vogel	ac744b61f9	Some small optical and structural changes to the manage template	2015-10-26 08:16:37 +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