18829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manuel Jiménez Friaza	09e5732f8a	Updated the Spanish contextual help	2017-02-13 15:24:54 +01:00
Manuel Jiménez Friaza	d7fcf31be5	Updated the Spanish translation	2017-02-13 13:56:17 +01:00
zotlabs	f63aaa5429	be consistent with the name	2017-02-12 18:42:43 -08:00
zotlabs	321241da02	add default permcat to channel settings form	2017-02-12 18:40:26 -08:00
zotlabs	7c72886b1b	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-12 17:40:45 -08:00
zotlabs	2a52592292	testing and bug fixes virtual profile groups	2017-02-12 17:40:18 -08:00
zotlabs	ccdfbc721f	Create virtual privacy groups for private profile member lists	2017-02-12 15:56:33 -08:00
Andrew Manning	a3436aea02	Some more work converting api_zot to bbcode. This page needs some serious formatting work.	2017-02-12 14:27:09 -05:00
Mario Vavti	f62b2fc114	css fix	2017-02-12 20:06:09 +01:00
Andrew Manning	baf612bd59	Reformat code of conduct for developers and integrate.	2017-02-12 13:59:17 -05:00
Andrew Manning	f3490440b4	Deleting original help content pages that have been integrated into the new doco	2017-02-12 07:38:43 -05:00
zotlabs	5cc1c30d7f	Merge pull request #671 from anaqreon/webimport ... Fix webpage element import tool	2017-02-12 18:10:09 +11:00
Andrew Manning	0017de46e4	remove logger lines	2017-02-11 20:54:09 -05:00
Andrew Manning	1cd1328b0c	Merge remote-tracking branch 'upstream/dev' into webimport	2017-02-11 20:52:17 -05:00
Andrew Manning	8ff9ad7636	Webpage import tool works again after setting iconfig properly and following the Impel class function example. More testing is needed.	2017-02-11 20:52:06 -05:00
zotlabs	1ba1c5b44e	Merge pull request #670 from anaqreon/doco ... Scroll to doco links with anchor references when there is a ?zid parameter	2017-02-12 07:47:06 +11:00
Andrew Manning	7db55d8db2	Update Zot protocol link	2017-02-11 14:46:24 -05:00
Andrew Manning	e058b19f53	Scroll to doco links with anchor references when there is a ?zid parameter.	2017-02-11 14:40:04 -05:00
Mario Vavti	bc3605a502	whitespace	2017-02-10 10:50:16 +01:00
Mario Vavti	ce4daad431	do not use modal-sm class	2017-02-10 10:02:48 +01:00
Mario Vavti	0360d42d30	add a login button for collapsed state and refine login modal	2017-02-10 10:01:43 +01:00
zotlabs	1fb37f93cc	more permissions optimisations	2017-02-09 19:52:13 -08:00
zotlabs	fce33402e7	use profile_store_lowlevel() when creating additional profiles	2017-02-09 17:40:56 -08:00
zotlabs	abadd0bd34	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-09 17:31:31 -08:00
zotlabs	16f27d0004	more work on permcats and consolidating calls that try to discover connect permissions, also create lowlevel store functions for abook and profile - since these currently may have issues with sql strict mode.	2017-02-09 17:29:24 -08:00
Mario Vavti	242eede258	wrap resizing in document ready function	2017-02-09 12:01:55 +01:00
zotlabs	8dc349caac	minor theming and whitespace	2017-02-08 19:47:34 -08:00
zotlabs	91819bfc2d	bringer - all basic functionality is implemented	2017-02-08 17:21:32 -08:00
zotlabs	6ee691e019	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-08 11:29:45 -08:00
zotlabs	28f0833237	fix immediate issue with multiple login forms until I can figure out an elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked.	2017-02-08 11:24:21 -08:00
Mario Vavti	eb415fd869	better detection of when to show the feature button and document nav mode for app_render()	2017-02-08 11:17:09 +01:00
Mario Vavti	ace0a1cb75	do not show feature button if the app is shared. css fixes	2017-02-08 10:56:03 +01:00
zotlabs	6ceaea8478	open permission tab by default - when you're creating permission categories	2017-02-07 21:03:14 -08:00
zotlabs	30659aef50	initial permcat creation ability, in /settings/permcats; functional permcat creation for testing but still needs a lot of UX work before promoting the ability	2017-02-07 20:29:03 -08:00
zotlabs	46d0e23e7b	atokens - we only need one permission column	2017-02-07 19:49:15 -08:00
zotlabs	2d3e20d96e	move permcat initialisation to zlib	2017-02-07 17:51:56 -08:00
zotlabs	723b51c931	provide a few system defined permcats; will require a permission editor page to define new (personal) ones.	2017-02-07 17:17:38 -08:00
zotlabs	a6160e3026	move permcat library functions to Zlib	2017-02-07 16:43:00 -08:00
zotlabs	ecca69442d	Merge branch 'abroles' into dev	2017-02-07 16:15:15 -08:00
zotlabs	b2bae867d0	more background work for permcat support	2017-02-07 16:08:27 -08:00
zotlabs	cfe843b870	nits	2017-02-07 14:02:13 -08:00
Mario Vavti	1cef3f15d5	sort the apps	2017-02-07 22:32:25 +01:00
Mario Vavti	1bb56309a6	default to manual conversation updates	2017-02-07 20:45:13 +01:00
zotlabs	6468b7a914	update readme; probably not finished with this yet so feel free to make suggestions	2017-02-06 15:28:50 -08:00
zotlabs	6a083e8452	bring back view links for all notification types (esp: network, channel) for easy access	2017-02-06 14:32:50 -08:00
zotlabs	27cac334e1	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-06 14:12:43 -08:00
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