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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-27	3	-3/+100
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add jot videos inline and with poster if possible	zotlabs	2019-04-27	3	-3/+100
\| * \| \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-27	2	-2/+12
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-26	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-26	2	-6/+48
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	import/export zot6 hublocs+xchans	zotlabs	2019-04-26	2	-6/+48
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-25	98	-3778/+2880
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	update fix_system_urls() to handle zot6 hublocs	zotlabs	2019-04-25	1	-3/+4
\| * \| \| \| \| \| \| \| \| \| \|	compound name warning	zotlabs	2019-04-24	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \|	hubloc confusion during magic auth where hublocs with more than one network m...	zotlabs	2019-04-24	6	-28/+90
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-24	20	-592/+1242
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of ../hm into dev	zotlabs	2019-04-18	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-18	2	-12/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-16	2	-12/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-15	156	-14399/+42049
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	calendar merge: d&d support and some minor cleanup and fixes	Mario Vavti	2019-04-29	3	-39/+91
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sql_fixes' into 'dev'	Max Kostikov	2019-04-28	2	-12/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve channel date query	Mario Vavti	2019-04-27	1	-11/+7
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possible sql performance improvement	Mario Vavti	2019-04-27	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-27	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog	Mario Vavti	2019-04-26	1	-0/+11
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-26	2	-6/+48
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import/export zot6 hublocs+xchans	Zot	2019-04-26	2	-6/+48
\|/ / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-26	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to mas...	Zot	2019-04-26	1	-3/+4
\|/ / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-25	6	-28/+89
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	hubloc confusion in magic auth	Zot	2019-04-25	6	-28/+89
\|/ / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	update blueimp/jquery-file-upload	Mario Vavti	2019-04-25	7	-26/+34
* \| \| \| \| \| \| \| \| \| \| \| \| \|	add missing files	Mario Vavti	2019-04-25	2	-0/+15
* \| \| \| \| \| \| \| \| \| \| \| \| \|	update sabre/vobject	Mario Vavti	2019-04-25	91	-3752/+2831
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "update composer libs"	Mario	2019-04-25	102	-3125/+3985
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "fix test"	Mario	2019-04-25	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9"	Mario	2019-04-25	2	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \|	dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9	Mario Vavti	2019-04-25	2	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \|	fix test	Mario Vavti	2019-04-25	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \|	update composer libs	Mario Vavti	2019-04-25	102	-3985/+3125
\| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-24	1	-14/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \|	calendar merge: bring back event categories	Mario Vavti	2019-04-24	4	-33/+52
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-docs' into 'dev'	Max Kostikov	2019-04-22	1	-105/+164
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Tidy up various bits of documentation	Daniel Lowe	2019-04-22	1	-87/+163
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove section on techlevels	Daniel Lowe	2019-04-22	1	-18/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-infinite-loop' into 'dev'	Max Kostikov	2019-04-22	1	-12/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix infinite loop using postgres as backend	Daniel Lowe	2019-04-21	1	-12/+6
\|/ / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'calendar_merge' into 'dev'	Max Kostikov	2019-04-20	10	-52/+872
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	resolve merge conflict	Mario Vavti	2019-04-20	3	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' into calendar_merge	Mario Vavti	2019-04-19	2	-6/+33
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|