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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	1	-1/+9
\|\
\| *	issue with deleting imported design elements and re-installing them	redmatrix	2015-05-19	1	-1/+9
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	6	-57/+80
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-19	6	-108/+127
\| \|\
\| \| *	Merge pull request #327 from solstag/help	redmatrix	2015-05-20	3	-3/+21
\| \| \|\ \| \| \| \| \| \| \| \|	Document php-xml requirement for webdav and widget creation.
\| \| \| *	Document widget creation.	Alexandre Hannud Abdo	2015-05-19	2	-1/+17
\| \| \| \|
\| \| \| *	Document php-xml requirement for webdav.	Alexandre Hannud Abdo	2015-05-19	1	-2/+4
\| \| \| \|
\| \| * \|	remove dbg code	Mario Vavti	2015-05-19	1	-1/+1
\| \| \| \|
\| \| * \|	be verbose about what type of element (block, layout, webpage) is beeing ↵	Mario Vavti	2015-05-19	1	-1/+2
\| \| \|/ \| \| \| \| \| \| \| \| \|	installed
\| \| *	New update Dutch	jeroenpraat	2015-05-19	2	-104/+104
\| \| \|
\| * \|	version update	redmatrix	2015-05-19	1	-1/+1
\| \|/
* \|	mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵	redmatrix	2015-05-19	5	-35/+29
\| \| \| \| \| \| \| \|	cipher would be adequate for our requirements.
* \|	vsprintf error	redmatrix	2015-05-18	1	-1/+1
\| \|
* \|	consensus items not working correctly and make the collections widget abide ↵	redmatrix	2015-05-18	2	-4/+8
\| \| \| \| \| \| \| \|	by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
* \|	get rid of photo_flags in the code	redmatrix	2015-05-18	1	-7/+7
\| \|
* \|	bring the new photo schema into play	redmatrix	2015-05-18	5	-53/+37
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	2	-4/+6
\|\\|
\| *	this should fix undeletable blocks and layouts	redmatrix	2015-05-18	2	-4/+6
\| \|
* \|	fix some merge errors	redmatrix	2015-05-18	3	-1012/+1270
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	2	-8/+16
\|\\|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-18	4	-385/+446
\| \|\
\| * \|	fix po2php to handle projectname variables correctly	redmatrix	2015-05-18	2	-8/+16
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	7	-134/+188
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-05-18	1	-0/+47
\| \|\ \
\| \| * \	Merge pull request #326 from sierracircle/patch-1	redmatrix	2015-05-19	1	-0/+47
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Create Primary-Directory
\| \| \| * \|	Create Primary-Directory	Adam Robertson	2015-05-18	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Description and Instruction on using a Primary Directory for a series of Private Hubs
\| * \| \| \|	if block title contains $content but $content title is empty do not show an ↵	Mario Vavti	2015-05-18	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	empty <h3> tag
\| * \| \|	remove dbg code	Mario Vavti	2015-05-18	1	-2/+0
\| \| \| \|
\| * \| \|	allow block title to contain $content title	Mario Vavti	2015-05-18	1	-2/+11
\| \|/ /
\| * /	Update Dutch (Projectname variable not translated yet, because of undefined ↵	jeroenpraat	2015-05-18	2	-383/+390
\| \|/ \| \| \| \| \| \|	variable)
\| *	spelling	redmatrix	2015-05-17	2	-4/+4
\| \|
* \|	Merge branch 'tres'	redmatrix	2015-05-18	69	-843/+657
\|\ \
\| * \	Merge branch 'master' into tres	redmatrix	2015-05-17	31	-421/+612
\| \|\ \
\| * \ \	Merge branch 'master' into tres	redmatrix	2015-05-14	19	-18/+537
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into tres	redmatrix	2015-05-14	187	-9453/+9692
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \	Merge branch 'master' into tres	friendica	2015-05-01	5	-3/+37
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-04-29	26	-1122/+1210
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| * \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-04-23	1727	-201129/+48987
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-08	97	-6382/+7723
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/events.php view/css/mod_events.css
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-05	45	-5364/+6398
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-01	12	-10/+108
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-01-31	108	-4218/+5439
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php
\| * \| \| \| \| \| \| \| \| \| \| \|	cleanup event form and various required indicators on inputs	friendica	2015-01-29	5	-9/+28
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres	friendica	2015-01-29	167	-954/+1001
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \|	more message restrict conversions	friendica	2015-01-29	18	-75/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres	friendica	2015-01-27	20	-166/+302
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/socgraph.php
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	sql typo	friendica	2015-01-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres and add some work on the item_deleted flag ↵	friendica	2015-01-26	99	-1998/+1864
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	onedirsync merge	friendica	2015-01-26	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	start on item_restrict conversion	friendica	2015-01-22	9	-54/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|