volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	missing function	redmatrix	2016-02-24	1	-0/+2
\|
*	more work on item table optimisation	redmatrix	2015-06-10	1	-2/+2
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-06	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	use the right webpage layout for an installed webpage if it exists	Mario Vavti	2015-06-04	1	-1/+2
\| \|
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	1	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
\| *	restrict webpage list to undeleted items	redmatrix	2015-05-13	1	-2/+3
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-2/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	disable voting in blocks, layouts and webpages	Mario Vavti	2015-04-29	1	-1/+2
\| \|
\| *	there is no key named term in this array	Mario Vavti	2015-04-24	1	-1/+0
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-25/+43
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
\| *	do not show acl button if not owner	Mario Vavti	2015-04-22	1	-3/+4
\| \|
\| *	fix webpages profile_tabs	Mario Vavti	2015-04-22	1	-5/+2
\| \|
\| *	fix webpage perms	Mario Vavti	2015-04-22	1	-1/+3
\| \|
\| *	bring lockstate to webpages	Mario Vavti	2015-04-21	1	-1/+5
\| \|
\| *	allow jot to be displayed expanded, remove deprected datetimepicker js and ↵	Mario Vavti	2015-04-17	1	-0/+1
\| \| \| \| \| \| \| \|	some random fixes
\| *	whitespace	Mario Vavti	2015-04-16	1	-15/+15
\| \|
\| *	move share webpage element from editwebpage to webpages and make it ↵	Mario Vavti	2015-04-16	1	-3/+16
\| \| \| \| \| \| \| \|	shareable with rpost
\| *	css fixes and remove expert mode for block page content type	Mario Vavti	2015-04-14	1	-3/+0
\| \|
\| *	some more on webpages	Mario Vavti	2015-04-14	1	-4/+4
\| \|
\| *	webpages appearence	Mario Vavti	2015-04-13	1	-2/+5
\| \|
\| *	make sure we redirect to a sane place after deleting a webpage element	friendica	2015-04-09	1	-0/+2
\| \|
\| *	system channel always has allow_code privileges	friendica	2015-04-08	1	-1/+1
\| \|
\| *	Fix Design Tool navigation for sys channel.	Klaus Weidenbach	2015-04-06	1	-5/+3
\| \| \| \| \| \| \| \|	Fix creating menu for sys channel.
* \|	Merge branch 'master' into tres	friendica	2015-01-29	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
\| *	local_user => local_channel	friendica	2015-01-28	1	-1/+1
\| \|
* \|	more message restrict conversions	friendica	2015-01-29	1	-1/+1
\|/
*	uid not set in webpages.php, start on editwebpage.php	friendica	2014-11-11	1	-1/+1
\|
*	cleanup	friendica	2014-11-11	1	-37/+45
\|
*	slow progress on sys publishing, making sure all the data we need is in the ↵	friendica	2014-11-11	1	-6/+21
\| \| \| \|	places we need it but validate it anyway
*	some more work on sys publishing	friendica	2014-11-11	1	-22/+30
\|
*	FFS, another oops	Thomas Willingham	2014-10-11	1	-2/+0
\|
*	Fix webpages. Sycning between too many codebases...	Thomas Willingham	2014-10-11	1	-1/+3
\|
*	Unbreak webpages	Thomas Willingham	2014-10-11	1	-3/+1
\|
*	This is a fix to not interfere the ongoing adding of ↵	marijus	2014-10-10	1	-1/+1
\| \| \| \| \| \| \|	.generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one .tpl and close it in another or (even worse) open a div in a .tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
*	Added and changed on some places div class generic-content-wrapper. And ↵	Jeroen	2014-10-09	1	-2/+4
\| \| \| \|	added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it.
*	expert_mode > expert	Jeroen	2014-09-12	1	-1/+1
\|
*	for webpages, hide the mimetype selector unless in advanced mode. For pages ↵	friendica	2014-09-07	1	-4/+9
\| \| \| \|	that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility.
*	make blocks, webpages, and layouts postable (pre-filled forms if supplied ↵	friendica	2014-08-28	1	-2/+9
\| \| \| \|	from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save.
*	sort out the unobscure mess	friendica	2014-06-15	1	-0/+1
\|
*	only show jotnets when posting conversation items	friendica	2014-06-14	1	-1/+1
\|
*	clean up the webpage list a bit	friendica	2014-04-29	1	-60/+65
\|
*	change the way jot tools are displayed/hidden	marijus	2014-04-08	1	-1/+1
\|
*	issue #395, item 2	friendica	2014-04-06	1	-2/+3
\|
*	more comanche migration	friendica	2013-12-19	1	-3/+3
\|
*	improve editing ability of webpages - acls, photos, location, page link ↵	friendica	2013-12-07	1	-1/+18
\| \| \| \|	title, etc.
*	acl in webpages and a couple of other little bits related to webpages - sort ↵	friendica	2013-11-14	1	-11/+14
\| \| \| \|	the list of pages by last edited and use prepare_body() so we get private stuff (and attachments, categories, etc.) formatted correctly
*	replace text links with icons on design pages	friendica	2013-10-23	1	-1/+1
\|
*	add design tool menu to appropriate pages	friendica	2013-09-03	1	-0/+5
\|
*	add a layout selector	friendica	2013-09-02	1	-0/+6
\|
*	allow a channel owner to define a default mimetype on webpages (otherwise ↵	friendica	2013-09-02	1	-2/+5
\| \| \| \|	default to "choose") - also fix the selector w/r/t php code. There is no ui for setting either at the moment, but for instance with wiki pages we probably don't want to have multiple choice of the mimetype. Keep it simple.