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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-10-14	1	-0/+25
\|\
\| *	support for mail sync	redmatrix	2015-10-14	1	-0/+25
\| \|
\| *	export TERM_FILE when mirroring	redmatrix	2015-09-08	1	-0/+1
\| \|
* \|	add plugin hooks to channel sync/import/export	redmatrix	2015-09-23	1	-0/+4
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-08	1	-1/+10
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php
\| *	menu export	redmatrix	2015-09-08	1	-1/+11
\| \|
* \|	menu import and sync	redmatrix	2015-09-08	1	-0/+11
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	1	-0/+19
\|\\|
\| *	export events	redmatrix	2015-09-07	1	-0/+19
\| \|
\| *	export chatrooms	redmatrix	2015-09-03	1	-0/+6
\| \|
* \|	import and sync chatrooms	redmatrix	2015-09-03	1	-1/+6
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	1	-5/+7
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php
\| *	channel export - don't include linked resource items (photos, events). These ↵	redmatrix	2015-09-03	1	-2/+4
\| \| \| \| \| \| \| \|	items will need to be provided with those objects so that they can be re-linked.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-0/+7
\|\\|
\| *	export apps	redmatrix	2015-09-01	1	-0/+7
\| \|
* \|	match the redmatrix output format for objects (which is the hubzilla table ↵	redmatrix	2015-09-01	1	-6/+2
\| \| \| \| \| \| \| \|	format)
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-1/+9
\|\\|
\| *	add the baseurl so we can easily relocate objects	redmatrix	2015-09-01	1	-1/+2
\| \|
\| *	use different obj export output format for hubzilla compatibility	redmatrix	2015-09-01	1	-1/+8
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php
\| *	typo in sql	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	don't log the mundane - especially at normal levels.	redmatrix	2015-08-31	1	-2/+3
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
\| *	change the likes db structure to make it more easily importable/exportable	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	mostly doc tweaks, some import/export work	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	rename 'register_account' hook to 'create_identity'.	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-4/+16
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php
\| *	provide ability to export by month as well as by year	redmatrix	2015-08-17	1	-3/+14
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-0/+12
\|\\|
\| *	add item_id to yearly dump files	redmatrix	2015-08-17	1	-0/+12
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-21	1	-2/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: doc/to_do_code.bb
\| *	Fixes regarding the new default profile photo size. The default profile ↵	Mario Vavti	2015-07-20	1	-2/+2
\| \| \| \| \| \| \| \|	photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-19	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php
\| *	provide a way to export a single year of items (to potentially keep from ↵	redmatrix	2015-07-16	1	-1/+30
\| \| \| \| \| \| \| \|	exhausting resources either on export or import)
* \|	provide any single year of exported items	redmatrix	2015-07-16	1	-2/+35
\| \|
* \|	lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵	redmatrix	2015-06-30	1	-3/+2
\| \| \| \| \| \| \| \|	other way)
* \|	lots of work on merging photo and file albums/folders	redmatrix	2015-06-17	1	-0/+5
\| \|
* \|	DB changes for some channel flags	redmatrix	2015-06-15	1	-24/+17
\| \|
* \|	convert the abook fields	redmatrix	2015-06-14	1	-5/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-11	1	-0/+4
\|\\|
\| *	don't provide a connect button on the sys channel profile sidebar	redmatrix	2015-06-11	1	-0/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-27	1	-2/+3
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/impel.php
\| *	some work on issue #329	redmatrix	2015-05-25	1	-2/+3
\| \|
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	1	-3/+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
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/api.php include/enotify.php
\| \| *	product was a bad string to use because we may require it for e-commerce, ↵	redmatrix	2015-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	and RED_PLATFORM is equally problematic for other reasons.
\| * \|	convert ITEM_WALL from bitfield to standalone	redmatrix	2015-05-06	1	-2/+1
\| \| \|
\| * \|	second pass name change	redmatrix	2015-05-05	1	-2/+2
\| \|/
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-233/+207
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Correcting reported Doxygen syntax warnings.	Klaus Weidenbach	2015-03-29	1	-227/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.