3739 Commits

Author	SHA1	Message	Date
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
Tobias Diekershoff	f45a8f1a03	Merge pull request #2106 from annando/1511-ostatus-bookmark-design ... Small OStatus changes	2015-11-29 23:19:12 +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
Tobias Diekershoff	ba441789b9	followup for #2110 putting the styling in less file and recompile css	2015-11-29 11:18:32 +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	1a0cb99d56	redesign the network page header when cid selected	2015-11-29 04:57:42 +01:00
rabuzarus	f5597da059	forumlist - mark selected forum as selected	2015-11-28 23:52:12 +01:00
Michael Vogel	58a261a29a	Other themes are now supported as well	2015-11-28 23:18:01 +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
Tobias Diekershoff	1f583c9657	NL update to the strings, thx Ralph	2015-11-19 07:30:27 +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	5a1f763de0	The mobile.css seems to only work for mobiles at the moment.	2015-11-17 20:39:30 +01:00
Michael Vogel	a9444ec774	The mobile.css was commented out ...	2015-11-17 20:11:06 +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
fabrixxm	c81f63a5b3	vier mobile: prefixed transition in css, mobile-related javascript only on mobile	2015-11-12 09:41:04 +01:00
fabrixxm	54460bdf35	fix tab icon padding	2015-11-12 09:41:04 +01:00
fabrixxm	b3e09b817f	fix menu icon, add icon to tab	2015-11-12 09:40:28 +01:00
fabrixxm	e5edd7b7db	mobile friendly tabs	2015-11-12 09:40:28 +01:00
Tobias Diekershoff	c687069709	Merge pull request #2068 from annando/1511-vier-mobile-aside ... Vier-Mobile: The left menu does now appears even when scrolled down	2015-11-12 09:09:28 +01:00
Michael Vogel	31c44bd398	Vier: The left menu does now appear reliably even if the user had scrolled down.	2015-11-12 08:57:57 +01:00
rabuzarus	902735f6d4	forumlist: dbupdate	2015-11-11 23:39:14 +01:00
rabuzarus	988d0327ae	forumlist: forgot some required_once for plugin_enabled()	2015-11-11 21:37:16 +01:00
rabuzarus	215205d376	forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()	2015-11-11 21:31:26 +01:00
Michael Vogel	37c68f6548	Merge pull request #2065 from tobiasd/20151110-shashape ... ShaShape iconset	2015-11-10 21:55:15 +01:00
Michael Vogel	a320805bd9	Merge pull request #2064 from tobiasd/20151110-de ... update to the DE translation by Abrax	2015-11-10 21:53:06 +01:00
Tobias Diekershoff	d6ac6aa615	updated the CSS file for the ShaShape iconset	2015-11-10 20:34:21 +01:00
Tobias Diekershoff	835e6c4955	new version of the ShaShape iconset	2015-11-10 20:12:16 +01:00
Tobias Diekershoff	37e1c916db	update to the DE translation by Abrax	2015-11-10 20:02:19 +01:00
Michael Vogel	cba2a8b64b	Vier: Make it look more beautiful under Linux	2015-11-10 16:25:36 +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	df866253b0	aside bar as menu in mobile	2015-11-08 19:08:00 +01:00
fabrixxm	c700a6fb37	duepuntozero, vier: add unread messages per group	2015-11-08 18:02:04 +01:00
fabrixxm	3c1127e613	remove debug code	2015-11-08 17:04:39 +01:00
fabrixxm	d522d7095d	quattro: add unread message count per groups	2015-11-08 16:55:44 +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	e74916d395	Merge pull request #2042 from tobiasd/develop ... some icons were added to the ShaShape iconset	2015-11-08 12:44:44 +01:00
Tobias Diekershoff	4b9fa3fb7e	some icons were added to the ShaShape iconset	2015-11-08 12:33:48 +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	06676e7c1b	Preview last five conversations in message-sidebar	2015-11-07 18:57:40 +01:00
FlxAlbroscheit	1b2349d011	Preview last five conversations in message-sidebar	2015-11-07 18:56:05 +01:00
FlxAlbroscheit	a8c033a7f6	Preview last five conversations in message-sidebar	2015-11-07 18:55:13 +01:00
FlxAlbroscheit	603dad93f3	Preview last five conversations in message-sidebar	2015-11-07 18:54:20 +01:00
Tobias Diekershoff	b3e3149e50	wrong filename	2015-11-07 16:30:31 +01:00
Tobias Diekershoff	f2013951a9	wrong filename	2015-11-07 16:28:31 +01:00
Tobias Diekershoff	0c6097fbcd	initial commit of the ShaShape iconset by Andi Stadler	2015-11-07 16:24:22 +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
Michael Vogel	0f563525bd	Optical adjustments for contacts/set "last_failure" when inaccessible	2015-11-06 09:15:20 +01:00
Michael Vogel	0f41f35041	The contact template now displays the address if available	2015-11-06 00:47:54 +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	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +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	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
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
Michael Vogel	6a53e3959f	Vier: The different styles are now working with the right menubar	2015-11-01 09:45:02 +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	c00847a79d	use section_title.tpl for page title	2015-10-30 18:05:45 +01:00
rabuzarus	f0f3360c4b	vier: include private forums in forum widget	2015-10-29 15:34:55 +01:00
Tobias Diekershoff	a48156aab6	display names listed in credits.txt from /credits	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
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
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
Michael Vogel	4f9ec8efac	Vier: The usability with a touch device is improved	2015-10-25 21:01:39 +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
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	4631c13d08	Profile data are now reduced to only the most important fields	2015-10-25 09:15:36 +01: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	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	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
rabuzarus	f9c0c1d696	template rework: use viewcontact_template.tpl for contact dealing pages	2015-10-18 17:12: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	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
rabuzarus	6d559bf8a9	viewcontact: use section_title.tpl as headding	2015-10-17 21:40:41 +02:00
rabuzarus	9176e739a4	sugest.php: themeable as whole page	2015-10-17 21:25:21 +02:00
rabuzarus	72896b0f6b	unify directory page	2015-10-17 19:45:57 +02:00
rabuzarus	20bb16859f	dirfind.php: move html to templates	2015-10-17 00:19:01 +02:00
rabuzarus	6ebb21a935	directory.php: move html to templates	2015-10-16 21:44:10 +02:00
Tobias Diekershoff	a961c29d05	Merge pull request #1962 from annando/1510-attend-vier ... Vier: Some small changes in the template for events	2015-10-14 06:42:50 +02:00
Michael Vogel	66ea33623b	Vier: Some small changes in the template for events	2015-10-13 20:15:01 +02:00
Tobias Diekershoff	db14dc13c3	DE: update to the strings	2015-10-13 17:35:08 +02:00
Tobias Diekershoff	1df5a7212b	DE: translation of the attend strings THX to Abrax	2015-10-13 17:06:35 +02:00
Tobias Diekershoff	154c55b36e	Merge pull request #1957 from fabrixxm/duepuntozeroattend ... attend functionality for duepuntozero	2015-10-12 21:16:40 +02:00
fabrixxm	fd8e8d005a	attend functionality for duepuntozero	2015-10-12 20:09:33 +02:00
fabrixxm	735755aa0e	Merge pull request #1956 from tobiasd/20151012-de ... DE Update to the translation, thx Abrax	2015-10-12 19:04:51 +02:00
Tobias Diekershoff	5839242792	DE Update to the translation, thx Abrax	2015-10-12 18:08:11 +02:00
Tobias Diekershoff	da8c81a12e	cleanup forgotten lines	2015-10-12 15:58:34 +02:00
Tobias Diekershoff	3debdf0a91	attend functionality for quattro theme (part of #1953)	2015-10-12 15:34:18 +02:00
Tobias Diekershoff	ce03ccc95c	Merge pull request #1929 from rabuzarus/event-attendance ... port of reds event attendance feature	2015-10-12 15:10:03 +02:00
Michael Vogel	adba75600a	Vier: Support for the new IFTTT addon.	2015-10-11 23:36:23 +02:00
rabuzarus	649578ae33	Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php	2015-10-11 19:39:55 +02:00
Michael Vogel	efbdb57f92	Reworked contact relations between Friendica and Diaspora	2015-10-10 11:06:18 +02:00
Tobias Diekershoff	26983bafff	Merge pull request #1944 from annando/1510-proxy-picture-size ... Picture size and bugfix for contact names with "<" and ">"	2015-10-08 08:03:42 +02:00
Michael Vogel	61c3ce7a21	Bugfix: The contact names had to be escaped	2015-10-08 00:25:55 +02:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Tobias Diekershoff	b4ec07ab27	IT: update to the strings	2015-10-07 06:20:54 +02:00
Michael Vogel	607817d1b3	Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.	2015-10-05 17:38:57 +02:00
Michael Vogel	d3ac3f8490	Added the contact menu to the search as well.	2015-10-05 08:08:59 +02:00
Michael Vogel	72ecb9e67b	Bugfix: Repairing a contact was more like killing the contact ...	2015-10-04 19:39:55 +02:00
Tobias Diekershoff	9f68676db6	Merge pull request #1934 from annando/1510-better-notification ... Let the notification look more like the follow dialog	2015-10-04 17:49:02 +02:00
Michael Vogel	4003b9cc5d	Let the notification look more like the follow dialog	2015-10-04 17:18:58 +02:00
Tobias Diekershoff	e1f3f2bc6c	Merge pull request #1933 from annando/1510-follow-more-data ... Show more information when following a new contact	2015-10-04 17:02:27 +02:00
Tobias Diekershoff	18e8d0de59	Merge pull request #1932 from annando/1510-vier-2 ... Small optical changes in "vier"	2015-10-04 17:01:25 +02:00
Michael Vogel	83ea4f7253	transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.	2015-10-04 15:55:24 +02:00
Michael Vogel	d0ae5ce326	Show more information when following a new contact	2015-10-04 14:41:39 +02:00