20004 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	cb3fb0049f	do not show edit pencil if not allowed to edit	2017-09-16 09:55:29 +02:00
Mario	eef1fcbb07	set update_title to false	2017-09-15 22:28:27 +02:00
Mario	186dd9dee0	version	2017-09-15 22:21:40 +02:00
Mario	373651c3db	implement wiki editing	2017-09-15 22:17:18 +02:00
git-marijus	663802e699	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-09-15 16:30:14 +02:00
git-marijus	4c5722c766	some work on wiki acl	2017-09-15 16:27:30 +02:00
zotlabs	6734854776	typocheck	2017-09-14 18:50:43 -07:00
zotlabs	1c0ece8411	provide a hook for importing a channel photo at channel creation time	2017-09-14 18:48:55 -07:00
zotlabs	cf120b2351	wiki: lock mimetype	2017-09-14 17:14:50 -07:00
zotlabs	6481722fd9	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-14 15:02:36 -07:00
zotlabs	d7ec6865b4	bring back wiki download	2017-09-14 04:06:09 -07:00
Mario Vavti	46b6415f5f	wiki: do not suggest bbcode if mimetype is text/plain	2017-09-14 10:44:16 +02:00
Mario Vavti	5aa0fe2bf0	use the hubzilla icons	2017-09-14 10:33:16 +02:00
Sergey Lukin	f43f38c054	hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channel Manager panels are opened	2017-09-14 10:01:39 +02:00
zotlabs	55aaabc2f1	add text/plain type to wiki	2017-09-13 22:37:18 -07:00
zotlabs	5be132f877	make wiki page mimetype default to wiki mimetype (this was the original intent but the wrong variable was used)	2017-09-13 21:36:59 -07:00
zotlabs	b5966041be	more zot6	2017-09-13 20:40:01 -07:00
zotlabs	62d6bada4c	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-09-13 19:26:33 -07:00
zotlabs	13788af908	Zot6: some things that need to be done ahead of time so we can turbocharge the delivery engine and split off site records from channel records.	2017-09-13 19:20:16 -07:00
Mario Vavti	29b0ed87d6	Merge remote-tracking branch 'mike/master' into dev	2017-09-13 10:30:08 +02:00
zotlabs	0e6d84e207	add option to mimetype selector so you can change the element name in case you end up with two of these suckers on the same page	2017-09-12 23:25:19 -07:00
zotlabs	796228b7ad	wiki mimetype selection. We can add text/plain as soon as we add code to purify and render it specifically.	2017-09-12 23:15:30 -07:00
zotlabs	7489a4442e	wiki mimetype	2017-09-12 22:35:30 -07:00
zotlabs	5e99295bf6	wiki mimetype selection	2017-09-12 22:32:31 -07:00
zotlabs	4ff89a5862	drop salmon until we improve performance	2017-09-12 20:24:57 -07:00
Mario Vavti	87ca60b0b1	rename activity notifications links - one more	2017-09-12 21:38:36 +02:00
Mario Vavti	525d554a35	rename activity notifications links	2017-09-12 21:34:14 +02:00
Sergey Lukin	4c121aff30	hubzilla issue #855: fix for some problems with displaying selected theme after panel Settings->Display loading	2017-09-12 21:28:40 +02:00
zotlabs	d4e53bb86f	typo in ldsigs	2017-09-11 18:56:17 -07:00
zotlabs	471449f539	regex was still broken	2017-09-10 22:59:26 -07:00
zotlabs	187fc9a51b	fix regex	2017-09-10 17:40:40 -07:00
zotlabs	abbf245d14	remove item_thread_top from simple_update query - we're already fetching distinct(parent) and this prevented comments from displaying after submission when remote-authed.	2017-09-10 16:10:56 -07:00
Mario Vavti	67024c023a	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-09-10 09:50:52 +02:00
Mario Vavti	2f76d63835	Merge remote-tracking branch 'mike/master' into dev	2017-09-10 09:30:59 +02:00
Andrew Manning	754329097f	More content tab help removed in context help	2017-09-09 19:47:39 -04:00
Andrew Manning	c5950c0370	Update help.html	2017-09-09 19:45:42 -04:00
zotlabs	e2e7bee3cc	owa cleanup	2017-09-09 13:34:57 -07:00
Mario Vavti	edada2b786	Merge remote-tracking branch 'mike/master' into dev	2017-09-09 20:22:45 +02:00
Andrew Manning	ccc9cc8202	Added context help for apps and appman in English	2017-09-09 08:23:30 -04:00
zotlabs	84c86f01c8	owa: missed the set-observer stuff	2017-09-08 16:00:27 -07:00
Mario Vavti	9b542c5bcf	fix radius	2017-09-08 09:43:25 +02:00
Mario Vavti	108bb7649b	Merge remote-tracking branch 'mike/master' into dev	2017-09-08 09:22:36 +02:00
zotlabs	1104e2652f	improve the code block styling a wee bit	2017-09-07 21:29:32 -07:00
zotlabs	f2dc55244c	provide root discovery for owa	2017-09-07 20:42:03 -07:00
zotlabs	048a8c5f44	provide owa discovery	2017-09-07 19:04:35 -07:00
zotlabs	1fbb1e6c2a	initial testing success with owa	2017-09-07 18:52:18 -07:00
zotlabs	7e9162ef06	there's the problem	2017-09-07 18:19:49 -07:00
zotlabs	f09fe8da78	add logging	2017-09-07 18:14:04 -07:00
zotlabs	4d794103be	testing owa	2017-09-07 18:09:31 -07:00
zotlabs	61f339a874	owa - first commit	2017-09-07 17:56:02 -07:00