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-19	3	-2/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php
\| *	add the project name to site info packet	redmatrix	2015-10-19	3	-2/+16
\| \|
* \|	change setup defaults to 127.0.0.1 instead of localhost for DB server, add ↵	redmatrix	2015-10-16	1	-1/+6
\| \| \| \| \| \| \| \|	documentation to the INSTALL.txt explaining the choice.
* \|	mail sync/migrate continued; also abstract delivery loop to make it ↵	redmatrix	2015-10-15	3	-1/+22
\| \| \| \| \| \| \| \|	re-usable, change refresh_all to use delivery loop.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-10-15	1	-1/+6
\|\\| \| \| \| \| \| \| \| \|	Conflicts: install/update.php
\| *	dummy update	redmatrix	2015-10-15	1	-1/+5
\| \|
* \|	resolve conflicts	redmatrix	2015-09-28	1	-3/+0
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-28	1	-0/+4
\|\\|
\| *	process_delivery: ignore self	redmatrix	2015-09-28	1	-1/+5
\| \|
* \|	schema support for additional site types	redmatrix	2015-09-28	3	-2/+15
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-23	1	-1/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: install/update.php
\| *	dummy update	redmatrix	2015-09-23	1	-1/+5
\| \|
* \|	add vdata field for caldav	redmatrix	2015-09-23	3	-1/+12
\| \|
* \|	remove dummy update from merge	redmatrix	2015-09-22	1	-4/+0
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-22	1	-0/+4
\|\\|
\| *	dummy update	redmatrix	2015-09-22	1	-1/+5
\| \|
* \|	heavy lifting for delivery reports	redmatrix	2015-09-22	3	-1/+16
\| \|
* \|	DB table for delivery reports	redmatrix	2015-09-18	3	-1/+86
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-18	1	-1/+5
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	dummy update	redmatrix	2015-09-18	1	-1/+5
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	1	-3/+2
\|\\|
\| *	in this case no results is not an error	redmatrix	2015-09-03	1	-3/+2
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	1	-11/+18
\|\\|
\| *	fix update 1148	zottel	2015-09-03	1	-11/+18
\| \|
* \|	add timestamps for syncing apps	redmatrix	2015-09-02	3	-3/+25
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	1	-2/+10
\|\\|
\| *	dummy update	redmatrix	2015-09-02	1	-2/+10
\| \|
\| *	dummy update placeholder	redmatrix	2015-09-01	1	-1/+8
\| \|
* \|	separate objs/things from taxonomy	redmatrix	2015-09-01	3	-1/+49
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	3	-1/+25
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-1/+24
\| \|
\| *	issues with abook sync between hubzilla and red	redmatrix	2015-08-23	1	-1/+2
\| \|
* \|	documentation re-org	redmatrix	2015-08-31	2	-0/+232
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-20	3	-2/+14
\|\\|
\| *	missed this one - it's required	redmatrix	2015-08-20	3	-2/+14
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-18	3	-3/+17
\|\\|
\| *	add event_sequence for vtodo's	redmatrix	2015-08-18	3	-3/+17
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	3	-2/+35
\|\\|
\| *	add DB support for tasks, todo items and repeating events	redmatrix	2015-08-16	3	-2/+35
\| \|
* \|	update some of the old attach.flag values to the new schema	redmatrix	2015-07-30	1	-1/+16
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-30	1	-1/+6
\|\\|
\| *	dummy update	redmatrix	2015-07-30	1	-1/+6
\| \|
* \|	very crude but working doc search	redmatrix	2015-07-05	1	-0/+8
\| \|
* \|	fix the postgres schema with all the changes to date	redmatrix	2015-06-29	1	-3/+115
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	3	-1/+15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	no this isn't it. well ok, it's part of it, but not the important part. it's ↵	redmatrix	2015-06-28	3	-1/+15
\| \| \| \| \| \| \| \|	still pretty cool.
* \|	DB changes for some channel flags	redmatrix	2015-06-15	1	-0/+4
\| \|
* \|	start on the DAV/photos merger	redmatrix	2015-06-11	1	-0/+2
\| \|
* \|	more work on item table optimisation	redmatrix	2015-06-10	1	-0/+8
\| \|