18783 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	947478ca76	don't add zid to app links if they're on this system and we're logged in already. This messes up the null arg detection in mod_network.	2017-02-06 14:10:54 -08:00
Mario Vavti	c75357faa3	also take care of the collapsed state apps	2017-02-06 20:36:26 +01:00
Mario Vavti	e9a27393b8	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-02-06 20:30:24 +01:00
Mario Vavti	5d12c56510	only check for mode	2017-02-06 20:30:02 +01:00
zotlabs	00cfc4be44	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-06 11:14:59 -08:00
Mario Vavti	70edcabca1	move icon stuff back to app_render() and send navapps through app_render()	2017-02-06 20:10:10 +01:00
Mario Vavti	dce5e8d0cc	fix wiki and chat .apd	2017-02-06 14:50:23 +01:00
Mario Vavti	59baf34170	make sure we do not remove other categories on app un-feature	2017-02-06 14:37:33 +01:00
Mario Vavti	5aa1146fe9	minor fixes	2017-02-06 13:58:49 +01:00
Mario Vavti	8059260c18	import system apps on initial load	2017-02-06 13:45:46 +01:00
Mario Vavti	91bc8d473f	update templates	2017-02-06 13:30:56 +01:00
Mario Vavti	3d4f2d146e	add profile app	2017-02-06 13:19:14 +01:00
Mario Vavti	ce61a64bd2	remove profile app	2017-02-06 13:17:58 +01:00
Mario Vavti	e2a498c8ca	update apps	2017-02-06 13:17:02 +01:00
Mario Vavti	758e7b92eb	update apps	2017-02-06 13:16:33 +01:00
Mario Vavti	cf4cdffcc1	parse icons in get_system_apps()	2017-02-06 10:49:42 +01:00
Mario Vavti	e70c87ed41	merge dev	2017-02-06 10:08:05 +01:00
zotlabs	d8472cc9f5	import - get rid of 'step system', we should be able to process any import file at any time.	2017-02-05 20:46:11 -08:00
zotlabs	56a08f0d17	make channel move an option (in addition to cloning)	2017-02-05 20:26:06 -08:00
zotlabs	eb3685f537	remove per-page login css (home, login); add support for alternative markdown mention format	2017-02-05 18:47:35 -08:00
zotlabs	201a6b8742	nav_login element width was page dependent. Put this in theme css	2017-02-05 14:55:46 -08:00
zotlabs	e2ee4ae024	better theming of rmagic page	2017-02-05 14:45:28 -08:00
zotlabs	ab698305bf	Merge pull request #666 from einervonvielen/dehydrated_for_dev ... The script letsencrypt.sh was replaced by dehydrated.	2017-02-06 06:50:02 +11:00
Einer von Vielen	143ae2b788	The script letsencrypt.sh was replaced by dehydrated.	2017-02-05 19:36:23 +01:00
zotlabs	73845e01ed	cleanup	2017-02-04 14:58:13 -08:00
Mario Vavti	178e3d5bc8	allow featuring of apps in /apps and update some more apd files	2017-02-04 18:36:50 +01:00
Mario Vavti	a94254a375	merge dev	2017-02-04 16:17:52 +01:00
zotlabs	fc4083346e	more work on nav-modal	2017-02-03 15:31:01 -08:00
zotlabs	f79a11cbf7	trying nav-login as modal	2017-02-03 13:47:29 -08:00
Mario Vavti	edc0a7ef91	update some apps and refine navapps.tpl	2017-02-03 15:24:21 +01:00
Mario Vavti	dce9a70ff5	check for app-icons in app_list() instead of app_render()	2017-02-03 12:12:05 +01:00
Mario Vavti	631a8278d3	do not hide button - just gray it out	2017-02-03 11:21:06 +01:00
zotlabs	bae37c8e6f	string update	2017-02-03 02:12:30 -08:00
Mario Vavti	a5c1685ea0	hide notifications button if there are none	2017-02-03 11:00:35 +01:00
Mario Vavti	d0a0051d85	use openClose() for nav-login	2017-02-03 09:35:35 +01:00
Mario Vavti	8e4960f31d	use openClose() for nav-login	2017-02-03 09:33:09 +01:00
Mario Vavti	dd2a5e6b28	Merge branch 'dev' into wip-app-bin	2017-02-03 09:24:09 +01:00
zotlabs	7e1e9ac94a	rename bb2diaspora.php to markdown.php	2017-02-02 19:12:48 -08:00
zotlabs	29daf1ecee	unused since 2012	2017-02-02 18:16:44 -08:00
zotlabs	c62df39ce3	move firefox social api configuration to plugin	2017-02-02 17:23:58 -08:00
zotlabs	a91e7cbe8d	move rsd service to twitter_api plugin	2017-02-02 15:25:35 -08:00
zotlabs	159f02ba07	build_pagehead hook added	2017-02-02 14:52:14 -08:00
zotlabs	2daafe80a5	move opensearch to plugins	2017-02-02 14:49:51 -08:00
Mario Vavti	028b2a655d	whitespace cleanup	2017-02-02 20:39:06 +01:00
Mario Vavti	fd52cefe09	provide separate collased menus for apps and notifications	2017-02-02 20:10:35 +01:00
Mario Vavti	0e0dee43ab	Merge branch 'dev' into wip-app-bin	2017-02-02 14:27:13 +01:00
Mario Vavti	e2ee565f05	cherry-pick nav-login changes	2017-02-02 14:24:19 +01:00
Mario Vavti	63e06578c4	use bootstrap dropdown for login	2017-02-02 14:19:23 +01:00
Mario Vavti	a1f03015ec	move channel manager up in the menu	2017-02-02 11:35:42 +01:00
Mario Vavti	8220a6584c	remove apps from usermenu	2017-02-02 11:19:06 +01:00