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

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge text.php and hmessages.po4.0	Mario Vavti	2019-03-08	2	-23/+1
\|
*	Merge branch '4.0RC'	Mario Vavti	2019-03-08	172	-19665/+24100
\|\
\| *	update changelog	Mario Vavti	2019-03-08	1	-1/+1
\| \|
\| *	bump version	Mario Vavti	2019-03-08	1	-1/+1
\| \|
\| *	$sender is supposed to be string in libzot	Mario	2019-03-08	1	-12/+9
\| \| \| \| \| \|	(cherry picked from commit 507c71f64c68cc0de0f090f1abdd024866e91068)
\| *	fetch private objects using delivery channel credentials	zotlabs	2019-03-08	1	-5/+28
\| \| \| \| \| \|	(cherry picked from commit 1f7622e4c42bf71d1d38dd88c40c903d83a8d6c0)
\| *	update changelog	Mario Vavti	2019-03-07	1	-0/+1
\| \| \| \| \| \|	(cherry picked from commit 04fe7e61deb19b9b05c87bff037b7bbf1d7bc662)
\| *	guest access tokens: xchan record not created on URL login	zotlabs	2019-03-07	1	-0/+1
\| \| \| \| \| \|	(cherry picked from commit 0b2213dd41a7ef275766725c070e16f8ba94d5a5)
\| *	changelog	Mario Vavti	2019-03-06	1	-0/+104
\| \| \| \| \| \|	(cherry picked from commit 08725c44c6874bdbbb46649645a9ac818f0abe36)
\| *	bump version	Mario Vavti	2019-03-06	1	-1/+1
\| \|
\| *	while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵	Mario Vavti	2019-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	expected to be a string (xchan_hash) (cherry picked from commit 117a8cafca6982e7d976fe00f32ecb0df66b2899)
\| *	Add CURLOPT_CONNECTTIMEOUT	M. Dent	2019-03-06	1	-0/+7
\| \| \| \| \| \|	(cherry picked from commit 0c05e6593e020180ca678dff6d60c095e23b34cd)
\| *	channel_type is not integer	zotlabs	2019-03-06	1	-5/+17
\| \| \| \| \| \|	(cherry picked from commit 26e7da0b969c834cc6c2ff7c00713c7be05cb5c4)
\| *	maintain compatibility with recent zot6 changes	zotlabs	2019-03-06	1	-0/+6
\| \| \| \| \| \|	(cherry picked from commit 98b1c7a38c3f3ef8ba7d36b77d9366691c3fbf15)
\| *	api_router - allow parameters as final path argument	zotlabs	2019-03-05	1	-1/+9
\| \| \| \| \| \|	(cherry picked from commit 47001c33039e6915f12b95a3e948caae6cf21d41)
\| *	remove clones from delivery recipients for top-level posts - they will get ↵	zotlabs	2019-03-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \|	the post via clone sync (cherry picked from commit 8e50fecccca5dd72a49869502e541db03632cd86)
\| *	mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵	zotlabs	2019-03-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	and is throwing php warnings when trying to decode (cherry picked from commit 938fcdd1a6e8db47d2e66d68f8face9925bb7963)
\| *	translate name of content filter (addon) app.	zotlabs	2019-03-05	1	-0/+1
\| \| \| \| \| \|	(cherry picked from commit 29cb62af3dba0a6a2891800cfe97578c1a2819ae)
\| *	Addressing new 'support@zotadel.net' support forum instead of old ↵	mike	2019-03-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	'support@gravizot.de' (cherry picked from commit e26de9c1d11dc8175ea520be091f0437d99ea5e0)
\| *	Mention php-zip module dependency in administrator guide	mike	2019-03-02	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 747ce9b1f15d3f656ed8ca816c1790c351decec9)
\| *	Use sender hash	DM42.Net (Matt Dent)	2019-03-02	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 5febc3e07dd1c1aeda68c09b4092d5d4219f39b5)
\| *	iron out some kinks with scrollToItem() in combination with collapsed ↵	Mario Vavti	2019-03-02	1	-5/+11
\| \| \| \| \| \| \| \| \| \|	content and images (cherry picked from commit 2244bf2ba2e8611017de51fbeb3c449efef906f0)
\| *	version	Mario Vavti	2019-02-26	1	-1/+1
\| \|
\| *	Merge branch 'dev' into 4.0RC	Mario Vavti	2019-02-26	1	-1/+1
\| \|\
\| \| *	use $channel_id until the function is adapted to not need it	Mario Vavti	2019-02-26	1	-1/+1
\| \| \|
\| \| *	Merge branch 'fix-sync_an_item' into 'dev'	Mario	2019-02-26	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sync an item See merge request hubzilla/core!1531
\| \| \| *	xchan_query and fetch_post_tags uses full query results not a single row	DM42.Net (Matt Dent)	2019-02-23	1	-3/+3
\| \| \| \|
\| \| \| *	Fixes - sync item based on item's user	DM42.Net (Matt Dent)	2019-02-23	1	-4/+4
\| \| \| \|
\| \| \| *	Fix misspelled variable	DM42.Net (Matt Dent)	2019-02-23	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'dev' into 4.0RC	Mario Vavti	2019-02-26	7	-30/+107
\| \|\\| \|
\| \| * \|	Merge branch 'dev' into 'dev'	Mario	2019-02-25	3	-19/+88
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zot api changes to support combined content (items+files) import addon See merge request hubzilla/core!1533
\| \| \| * \|	issues uncovered testing combined item/file import	zotlabs	2019-02-24	3	-5/+5
\| \| \| \| \|
\| \| \| * \|	zot api changes to support combined content (items+files) import addon	zotlabs	2019-02-24	2	-19/+88
\| \| \| \| \|
\| \| * \| \|	Merge branch 'js_fixes' into 'dev'	M. Dent	2019-02-24	3	-10/+18
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where... See merge request hubzilla/core!1532
\| \| \| * \|	fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where ↵	Mario Vavti	2019-02-23	3	-10/+18
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true
\| \| * \|	Merge branch 'php' into 'dev'	Mario	2019-02-22	1	-31/+30
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update PHP Version check during Setup. See merge request hubzilla/core!1530
\| \| \| * \|	Update PHP Version check during Setup.	Klaus Weidenbach	2019-02-21	1	-31/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1. So check during Setup for PHP >= 7.1.
\| \| * \| \|	Merge branch 'es-es' into 'dev'	Max Kostikov	2019-02-22	0	-0/+0
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Quickfix es-es/hstrings.php See merge request hubzilla/core!1529
\| \| \| * \|	Merge branch 'cherry-pick-f92d2e3f' into 'es-es'	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quickfix es-es/hstrings.php See merge request mjfriaza/core!6
\| \| \| \| * \|	Quickfix es-es/hstrings.php	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit f92d2e3f7c6573bd7bab04223c7e28662605c6d8)
\| \| \| * \|	Merge branch 'cherry-pick-a9b75d05' into 'es-es'	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix es-es/hstrings.php See merge request mjfriaza/core!5
\| \| \| \| * \|	Fix es-es/hstrings.php	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit a9b75d059b2a54f1b87657d95f9ac1124ed4287d)
\| \| * \| \|	Merge branch 'es-es' into 'dev'	Mario	2019-02-21	2	-1644/+1992
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update es-es See merge request hubzilla/core!1526
\| \| \| * \|	Merge branch 'cherry-pick-e6f289de' into 'es-es'	Manuel Jiménez Friaza	2019-02-21	2	-1644/+1992
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Spanish translation See merge request mjfriaza/core!4
\| \| \| \| * \|	Update Spanish translation	Manuel Jiménez Friaza	2019-02-21	2	-1644/+1992
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76)
\| \| * \| \|	Merge branch 'core_fixes' into 'dev'	M. Dent	2019-02-21	2	-2/+7
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix summary and use item_normal_search() for viewsrc so we can also view the... See merge request hubzilla/core!1525
\| \| \| * \| \|	fix summary and use item_normal_search() for viewsrc so we can also view the ↵	Mario Vavti	2019-02-21	2	-2/+7
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	source for articles, cards, etc.
\| \| * \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2019-02-20	2	-14066/+13995
\| \| \|\ \ \
\| \| \| * \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2019-02-20	2	-14066/+13995
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Russian translation See merge request hubzilla/core!1524
\| \| \| \| * \| \|	Update Russian hstrings.php	Max Kostikov	2019-02-20	1	-2769/+2774
\| \| \| \| \| \| \|