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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RC	Mario Vavti	2019-05-27	0	-0/+0
\|\
\| *	fix #1374	Mario Vavti	2019-05-24	1	-0/+4
\| \| \| \| \| \|	(cherry picked from commit 528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4)
\| *	get channel from photo uid	Mario Vavti	2019-05-24	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 9ea483d1dc01fa9439e6f261d04f1b97fb1302a3)
* \|	Merge branch 'dev' into 4.2RC	Mario Vavti	2019-05-27	11	-50/+61
\|\ \ \| \|/ \|/\|
\| *	mod cal band-aid fixes	Mario Vavti	2019-05-26	3	-16/+26
\| \|
\| *	adjust birthday handling according to community decision and slightly change ↵	Mario Vavti	2019-05-26	7	-33/+30
\| \| \| \| \| \| \| \|	display of allday event items
\| *	fix #1374	Mario Vavti	2019-05-24	1	-0/+4
\| \|
\| *	get channel from photo uid	Mario Vavti	2019-05-24	1	-1/+1
\| \|
\| *	add new directory fallback server	Mario Vavti	2019-05-23	1	-1/+2
\| \|
* \|	Merge branch 'dev' into 4.2RC	Mario Vavti	2019-05-23	1	-0/+8
\|\\|
\| *	Merge branch 'dev' into 'dev'	Mario	2019-05-22	1	-0/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	translate make-friend activities to zot6 See merge request hubzilla/core!1654
\| \| *	translate make-friend activities to zot6	zotlabs	2019-05-20	1	-0/+8
\| \| \|
* \| \|	add new directory fallback server	Mario Vavti	2019-05-23	1	-2/+3
\| \| \|
* \| \|	Merge branch 'dev' into 4.2RC	Mario Vavti	2019-05-23	8	-119/+172
\|\\| \|
\| * \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2019-05-22	3	-1307/+1485
\| \|\ \
\| \| * \	Merge branch 'es-es' into 'dev'	Mario	2019-05-20	3	-1307/+1485
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update es-es See merge request hubzilla/core!1651
\| * \| \| \|	improve timezone detection for caldav and remove smart birthday feature. ↵	Mario Vavti	2019-05-22	5	-18/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force adjust birthdays until we agree on how to deal with this.
\| * \| \| \|	remove unused code	Mario Vavti	2019-05-21	1	-4/+1
\| \| \| \| \|
\| * \| \| \|	fix all day events for caldav calendars	Mario Vavti	2019-05-21	2	-23/+60
\| \| \| \| \|
\| * \| \| \|	move smart birthday feature to calendar settings and override the adjust ↵	Mario Vavti	2019-05-20	3	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	flag at display time instead of import
\| * \| \| \|	fix event notifications viewall url	Mario Vavti	2019-05-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	be more precise with table selection	Mario Vavti	2019-05-20	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2019-05-20	1	-2/+1
\| \|\\| \| \|
\| \| * \| \|	Fix a really disturbing comment	Xanthor	2019-05-17	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b)
\| * \| \| \|	calendar merge: initial commit for timezone support	Mario Vavti	2019-05-20	5	-82/+89
\| \|/ / /
\| * \| \|	wiki: urlencode the entire share link	Mario Vavti	2019-05-17	1	-2/+2
\| \| \| \|
\| * \| \|	use escape_tags() wiki headers	Mario Vavti	2019-05-17	1	-2/+2
\| \| \|/ \| \|/\|
\| * \|	calendar merge: only export events that will not break the importer. this ↵	Mario Vavti	2019-05-15	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	will probably dismiss some old experimental entries
\| * \|	missing backslash	Mario Vavti	2019-05-15	1	-1/+1
\| \| \|
\| * \|	Merge branch 'dev' into 'dev'	Mario	2019-05-14	1	-6/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bbcode map bypass wasn't catching all map forms. See merge request hubzilla/core!1647
\| \| * \|	bbcode map bypass wasn't catching all map forms.	zotlabs	2019-05-13	1	-6/+9
\| \| \| \|
\| * \| \|	add autocomplete js to calendar and fix issue with extended likes mid	Mario Vavti	2019-05-14	2	-3/+7
\| \| \| \|
\| * \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-05-13	1	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comments scroll button CSS See merge request hubzilla/core!1649
\| \| * \| \|	Fix comments scroll button CSS	Max Kostikov	2019-05-13	1	-3/+3
\| \|/ / /
\| * \| \|	css fixes	Mario Vavti	2019-05-13	3	-4/+4
\| \| \| \|
\| * \| \|	deal with privacy mentions in event descriptions	Mario Vavti	2019-05-13	1	-11/+35
\| \| \| \|
\| * \| \|	fix button size	Mario Vavti	2019-05-13	1	-1/+1
\| \| \| \|
\| * \| \|	bump version	Mario Vavti	2019-05-13	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'es-es' into '4.2RC'	Mario	2019-05-20	3	-1307/+1485
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Update es-es See merge request hubzilla/core!1652
\| * \| \|	Merge branch 'cherry-pick-350e636e' into 'es-es'	Manuel Jiménez Friaza	2019-05-19	3	-1307/+1485
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Spanish translation See merge request mjfriaza/core!7
\| \| * \| \|	Updated Spanish translation	Manuel Jiménez Friaza	2019-05-19	3	-1307/+1485
\| \|/ / / \| \| \| \| \| \| \| \|	(cherry picked from commit 350e636e3d0a44323c69185555e89cc01a213aa2)
* \| \| \|	Fix a really disturbing comment	Xanthor	2019-05-17	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b) (cherry picked from commit af2b263bc74b16601ec7c123a58f0549613aed27)
* \| \| \|	wiki: urlencode the entire share link	Mario Vavti	2019-05-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit aa120e0478b8a7e0eabcbd7b8d7eefd515ff5347)
* \| \| \|	use escape_tags() wiki headers	Mario Vavti	2019-05-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit e7f1f496c5977ae290ea1457ea5c117dd29676f6)
* \| \| \|	calendar merge: only export events that will not break the importer. this ↵	Mario Vavti	2019-05-15	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	will probably dismiss some old experimental entries (cherry picked from commit 8be00316025efc424a7b38ab5a2542dd5d1e9fd0)
* \| \| \|	missing backslash	Mario Vavti	2019-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 3c8867a1e861f75cb7a11e2ea6a15b2d2e457b7b)
* \| \| \|	add autocomplete js to calendar and fix issue with extended likes mid	Mario Vavti	2019-05-14	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 15a000bb4554b0dee168eb595c9390a555c59f74)
* \| \| \|	Fix comments scroll button CSS	Max Kostikov	2019-05-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit d0322f5fbdf7a1ec3ac3ee894a8eabc4b252cf57)
* \| \| \|	css fixes	Mario Vavti	2019-05-14	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit c1f01b7e3515ed823019f133cd73c1752b372f4c)
* \| \| \|	deal with privacy mentions in event descriptions	Mario Vavti	2019-05-14	1	-11/+35
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 71064f481b94da11ca8a819c1cec88f8df4b671c)