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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-10-29	2	-9/+9
\|\
\| *	Merge pull request #894 from mjfriaza/dev	git-marijus	2017-10-29	2	-9/+9
\| \|\ \| \| \| \| \| \|	Spanish translation revised again.
\| \| *	Spanish translation revised again.	Manuel Jiménez Friaza	2017-10-28	2	-9/+9
\| \| \|
* \| \|	fix "unstar"	zotlabs	2017-10-28	1	-1/+1
\| \| \|
* \| \|	1/2 of hubzilla issue #893	zotlabs	2017-10-26	1	-0/+6
\| \| \|
* \| \|	encrypt the owa token	zotlabs	2017-10-26	2	-4/+13
\| \| \|
* \| \|	hubzilla issue #890, separate the pdl preview feature from the mod_page ↵	zotlabs	2017-10-25	1	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \|	webpage query so that the webpage will always win if a webpage and pdl have the same name.
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-25	10	-27/+128
\|\\| \|
\| * \|	Merge pull request #888 from anaqreon/card-context	git-marijus	2017-10-25	1	-0/+20
\| \|\ \ \| \| \| \| \| \| \| \|	Context help for cards
\| \| * \|	Context help for cards	Andrew Manning	2017-10-24	1	-0/+20
\| \|/ /
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-10-24	6	-22/+103
\| \|\ \
\| \| * \	Merge pull request #884 from dawnbreak/dev	git-marijus	2017-10-24	3	-21/+53
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Update composer autoload cache.
\| \| \| * \|	We call Theme:url() statically, make it also static.	Klaus Weidenbach	2017-10-23	1	-17/+27
\| \| \| \| \|
\| \| \| * \|	Update composer autoload cache.	Klaus Weidenbach	2017-10-23	2	-4/+26
\| \| \| \| \|
\| \| * \| \|	Merge pull request #882 from HaakonME/dev	git-marijus	2017-10-24	3	-1/+50
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Portfolio widget - CSS update
\| \| \| * \| \|	Portfolio widget - CSS update	Haakon Meland Eriksen	2017-10-22	3	-1/+50
\| \| \| \| \| \|
\| * \| \| \| \|	comment out statistics link in mod pubsites until we have something ↵	Mario Vavti	2017-10-24	1	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functional again
\| * \| \| \|	not sure when but the hcard went missing in webfinger	zotlabs	2017-10-23	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	acl encoding issues	zotlabs	2017-10-23	2	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-23	7	-95/+152
\|\\| \| \| \|
\| * \| \| \|	hubzilla issue #885	zotlabs	2017-10-23	1	-0/+8
\| \| \| \| \|
\| * \| \| \|	mod_display: provide alternate serialisations (starting with atom)	zotlabs	2017-10-22	2	-54/+115
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-10-22	9	-2959/+3712
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	bring back the markdown post feature (after investing some effort to make it ↵	zotlabs	2017-10-22	4	-41/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	work)
* \| \| \| \|	not sure when but the hcard went missing in webfinger	zotlabs	2017-10-23	1	-0/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-22	17	-3017/+3883
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-10-22	4	-2922/+3658
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #880 from mjfriaza/dev	git-marijus	2017-10-22	2	-1460/+1828
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|	Updated the Spanish translation
\| \| \| * \| \|	Fixed the Spanish translation	Manuel Jiménez Friaza	2017-10-21	2	-1460/+1828
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #881 from phellmes/dev	git-marijus	2017-10-22	2	-1462/+1830
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update DE translation strings (also for 2.8RC)
\| \| \| * \| \| \|	Update DE translation strings	phellmes	2017-10-21	2	-1462/+1830
\| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| * \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-10-22	1	-4/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	wrong key	zotlabs	2017-10-22	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	do not show seen notifys in notifications - show them in mod notifications ↵	Mario Vavti	2017-10-22	4	-37/+47
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	instead. Update notifications count also on notifications updates
\| * \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-10-20	8	-53/+171
\| \|\\| \|
\| \| * \|	register workflow was getting over-ridden in include/security	zotlabs	2017-10-19	2	-5/+6
\| \| \| \|
\| \| * \|	typo	zotlabs	2017-10-19	1	-1/+1
\| \| \| \|
\| \| * \|	table structure for pseudo or proxy channels (pchan)	zotlabs	2017-10-19	6	-51/+165
\| \| \| \|
\| * \| \|	Merge pull request #879 from redmatrix/anaqreon-patch-1	git-marijus	2017-10-20	1	-1/+5
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Display different info message if using invite code
\| \| * \|	Display different info message if using invite code	Andrew Manning	2017-10-19	1	-1/+5
\| \|/ /
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-19	10	-1465/+1867
\|\\| \|
\| * \|	changelog	Mario Vavti	2017-10-20	1	-0/+111
\| \| \|
\| * \|	strings	Mario Vavti	2017-10-19	1	-1380/+1689
\| \| \|
\| * \|	version	Mario Vavti	2017-10-19	1	-1/+1
\| \| \|
\| * \|	redirect to be moderated items to /moderate and change the conv link to ↵	Mario Vavti	2017-10-19	3	-6/+27
\| \| \| \| \| \| \| \| \| \| \| \|	partent mid in /modrate
\| * \|	fix issue #837 - w2w posts not removed in contact_remove()	Mario Vavti	2017-10-19	1	-1/+2
\| \| \|
\| * \|	remove redundant js	Mario Vavti	2017-10-18	1	-19/+16
\| \| \|
\| * \|	streamline the notifications js and change notification icon to ↵	Mario Vavti	2017-10-18	3	-58/+21
\| \| \| \| \| \| \| \| \| \| \| \|	exclamation-triangle if we have personal notifications
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-17	3	-5/+12
\|\\| \|
\| * \|	update notifications if a notification area remains open	Mario Vavti	2017-10-18	1	-0/+7
\| \| \|