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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev'	Mario	2021-06-04	1	-2/+2
\|\
\| *	fix css issue	Mario	2021-06-04	1	-2/+2
\| \|
* \|	Merge branch 'dev'	Mario	2021-06-04	57	-11986/+12610
\|\\|
\| *	Update Spanish	mjfriaza	2021-06-04	2	-1221/+1687
\| \| \| \| \| \|	(cherry picked from commit 993d64801136aa4bde4f4422ae4f07d224a91a62)
\| *	fix login name label for the case when system.verify_email is disabled	Mario	2021-06-04	1	-6/+9
\| \| \| \| \| \|	(cherry picked from commit e44bf42c646c018e00e8f0a2895a6c29522361a6)
\| *	fix issue where a deleted channel will return 404 before returning zotinfo	Mario	2021-06-02	4	-30/+43
\| \| \| \| \| \|	(cherry picked from commit 33463152e844f98b933401c394cc0e111893a077)
\| *	Merge branch 'dev' into 'dev'	Mario	2021-06-02	2	-1/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make pubstream ordering configurable See merge request hubzilla/core!1964
\| \| *	Make pubstream ordering configurable	Max Kostikov	2021-06-02	2	-1/+2
\| \| \|
\| * \|	fix article summary duplicated when editing - issue #1577	Mario	2021-06-02	1	-2/+1
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 50c14d353b30d0dcd7c761884d797dc0fe90f777)
\| * \|	fix regression where authors from non zot6, activitypub networks got ↵	Mario Vavti	2021-06-02	1	-2/+3
\| \|/ \| \| \| \| \| \| \| \|	dismissed (e.g. relayed diaspora comments) (cherry picked from commit b3df15a3c6e017ce3858ee484c6d2d70a5f18a17)
\| *	Merge branch 'translation-pl' into 'dev'	Max Kostikov	2021-05-31	14	-1562/+1292
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	New traslations: view/pl/invite* files + some fixes See merge request hubzilla/core!1963
\| \| *	Fixes to docs/pl/about/about.bb	Andrzej Budziński	2021-05-31	1	-11/+4
\| \| \|
\| \| *	New traslations: view/pl/invite* files + some fixes	Andrzej Budziński	2021-05-31	13	-1551/+1288
\| \| \|
\| * \|	fix admin button state not displayed correctly	Mario	2021-05-31	1	-2/+2
\| \|/ \| \| \| \|	(cherry picked from commit baabb3a8730708634385abdb366a45c6e234e154)
\| *	fix registration bug - issue #1574	Mario	2021-05-31	1	-1/+1
\| \|
\| *	notifications: if we have to return early, make sure to set offset to -1 to ↵	Mario	2021-05-28	1	-7/+23
\| \| \| \| \| \| \| \| \| \|	prevent looping (cherry picked from commit f72b8ce30fbbcd672f09eaf9de41e8881ec622ad)
\| *	Merge branch 'translation-pl' into 'dev'	Max Kostikov	2021-05-27	5	-826/+730
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Next fixes to Polish translation See merge request hubzilla/core!1962
\| \| *	Next fixes. It already looks very nice, but it's not end work yet for	Andrzej Budziński	2021-05-26	5	-826/+730
\| \|/ \| \| \| \|	this translation.
\| *	Merge branch 'translation-pl' into 'dev'	Max Kostikov	2021-05-25	23	-10589/+11006
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Updating translatons strings + fixes to Polish translation See merge request hubzilla/core!1961
\| \| *	Regenerating hstrings.ph file	Andrzej Budziński	2021-05-24	1	-0/+3664
\| \| \|
\| \| *	Next fixes and generating new hstrings.php file	Andrzej Budziński	2021-05-24	3	-3686/+23
\| \| \|
\| \| *	Updating translation strings (v. 5.7) + fixes to Polish translation	Andrzej Budziński	2021-05-23	22	-10487/+10903
\| \|/
\| *	AccessList::is_private() does not return info about the private state (1 or ↵	Mario Vavti	2021-05-23	1	-4/+4
\| \| \| \| \| \| \| \|	2). Use the info from the parent item until this will be sorted out
\| *	remove todo since the zot6 xchan should be merely imported in this case. ↵	Mario	2021-05-21	1	-2/+4
\| \| \| \| \| \| \| \|	also only return if we already have a result.
\| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario	2021-05-21	3	-7/+9
\| \|\
\| \| *	Merge branch 'Malend-dev-patch-02229' into 'dev'	Mario	2021-05-21	1	-3/+4
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove useless test See merge request hubzilla/core!1957
\| \| \| *	Remove useless test	Malendur	2021-05-20	1	-3/+4
\| \| \| \|
\| \| * \|	Merge branch 'Malend-dev-patch-19605' into 'dev'	Mario	2021-05-21	1	-2/+2
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix phpDoc See merge request hubzilla/core!1958
\| \| \| * \|	Fix phpDoc	Malendur	2021-05-20	1	-2/+2
\| \| \| \|/
\| \| * \|	Merge branch 'dev' into 'dev'	Max Kostikov	2021-05-20	1	-2/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix updated variables in member verificaton template See merge request hubzilla/core!1959
\| \| \| * \|	Fix updated variables	Max Kostikov	2021-05-20	1	-2/+3
\| \| \| \| \|
\| * \| \| \|	introduce the direct flag for direct messages	Mario	2021-05-21	1	-9/+16
\| \|/ / /
\| * \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario	2021-05-20	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2021-05-19	1	-2/+2
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix security headers switching See merge request hubzilla/core!1953
\| \| \| * \|	Fix security headers switching	Max Kostikov	2021-05-17	1	-2/+2
\| \| \| \|/
\| * \| /	make sure to set the correct item_private state	Mario	2021-05-20	1	-1/+2
\| \|/ /
\| * /	bring back the channel_protocols hook	Mario	2021-05-19	1	-1/+13
\| \|/
\| *	there might be errors in cli without this	Mario	2021-05-17	1	-0/+1
\| \|
\| *	Ãmake sure we do not deal with diaspora hublocs here	Mario	2021-05-17	1	-1/+1
\| \|
\| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario	2021-05-15	1	-5/+48
\| \|\
\| \| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2021-05-15	8	-26/+67
\| \| \|\
\| \| * \|	make sure we do not mess up the query string when removing single parameters	Mario Vavti	2021-05-15	1	-5/+48
\| \| \| \|
\| * \| \|	add zid and delegate parameters to the bdest string so that we will be ↵	Mario	2021-05-15	1	-34/+34
\| \| \|/ \| \|/\| \| \| \| \| \| \|	authenticated when being redirected offsite
\| * \|	Merge branch 'dev' into 'dev'	Mario	2021-05-14	6	-14/+21
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Random PHP 8 fixes See merge request hubzilla/core!1951
\| \| * \|	Random PHP 8 fixes	Max Kostikov	2021-05-14	6	-14/+21
\| \| \| \|
\| * \| \|	fix regression in regard to menu wrapping	Mario	2021-05-12	1	-12/+12
\| \| \| \|
* \| \| \|	Merge branch 'cherry-pick-a7a47275' into 'master'	Mario	2021-05-20	1	-2/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev' See merge request hubzilla/core!1960
\| * \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2021-05-20	1	-2/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix updated variables in member verificaton template See merge request hubzilla/core!1959 (cherry picked from commit a7a4727591a884f1dd261d641becc04c11136818) bc2afb21 Fix updated variables
* \| \| \|	fix regression in regard to menu wrapping	Mario	2021-05-12	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ded9f18b8a36cae8dfe1797b7ba87d7742c996df)
* \| \| \|	update include/items.php5.6	Mario	2021-05-11	1	-8/+1
\| \| \| \|