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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-authorcomment-fix' into 'dev'	Mario	2018-09-05	2	-12/+29
\|\ \| \| \| \| \| \| \| \|	Corrected resubmit of fixes to Authors unable to comment on posts they authored… See merge request hubzilla/core!1269
\| *	Corrected resubmit of fixes to Authors unable to comment on posts they ↵	M.Dent	2018-09-04	2	-12/+29
\| \| \| \| \| \| \| \|	authored when owned by others.
* \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2018-09-05	2	-22/+7
\|\\|
\| *	Revert "Fix: Authors unable to comment on posts they authored when under ↵	Mario Vavti	2018-09-03	2	-22/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions.
* \|	instead of not displaying the cover-photo at all after first page load, load ↵	Mario Vavti	2018-09-05	3	-8/+29
\|/ \| \| \|	the page with the cover slided up. change pointer to n-resize if cover is not slid.
*	Merge branch 'add-delivery-status-info' into 'dev'	Mario	2018-09-02	2	-7/+22
\|\ \| \| \| \| \| \| \| \|	Fix: Authors unable to comment on posts they authored when under owned by others… See merge request hubzilla/core!1268
\| *	Fix: Authors unable to comment on posts they authored when under owned by ↵	M.Dent	2018-09-01	2	-7/+22
\| \| \| \| \| \| \| \|	others in certain circumstances.
* \|	fix undefined constant warning	Mario Vavti	2018-09-01	1	-1/+1
\| \|
* \|	do not count sys channel in totals	Mario Vavti	2018-09-01	1	-1/+1
\| \|
* \|	update 1218: missing default value for pg	Mario Vavti	2018-08-31	1	-2/+2
\| \|
* \|	Merge branch 'call-hooks-optimization' into 'dev'	Mario	2018-08-30	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Micro-optimization to call_hooks() See merge request hubzilla/core!1267
\| * \|	Micro-optimization to call_hooks()	M.Dent	2018-08-29	1	-1/+1
\| \| \|
* \| \|	Merge branch 'add-delivery-status-info' into 'dev'	Mario	2018-08-30	1	-0/+1
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Add dreport_process hook See merge request hubzilla/core!1266
\| * \|	Add dreport_process hook	M.Dent	2018-08-29	1	-0/+1
\| \|/
* \|	html-to-markdown adds a backslash infront of a hash after each new line - ↵	Mario Vavti	2018-08-29	1	-1/+4
\| \| \| \| \| \| \| \|	manualy remove those
* \|	db update to get rid of bogus activitypub xchans which got created due to a ↵	Mario Vavti	2018-08-29	2	-1/+27
\|/ \| \| \|	bug in the pubcrawl addon
*	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-08-29	2	-1/+3
\|\
\| *	redirect stdout/stderr on cron command	zotlabs	2018-08-28	2	-1/+3
\| \|
* \|	add paragonie and symfonie since ramsey/uuid appears to require them	Mario Vavti	2018-08-28	14	-0/+512
\| \|
* \|	update composer libs and add ramsey/uuid	Mario Vavti	2018-08-28	96	-1241/+6276
\| \|
* \|	remove distinct from network query again until performance issue is resolved ↵	Mario Vavti	2018-08-27	1	-2/+2
\| \| \| \| \| \| \| \|	or another fix for the underlying problem is found
* \|	Merge branch 'extend-convitems-dropdown' into 'dev'	Mario	2018-08-27	3	-2/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265
\| * \|	Add hook to extend conv_item cog dropdown menu	M.Dent	2018-08-26	2	-0/+9
\| \| \|
\| * \|	Get full page of items	M.Dent	2018-08-23	1	-2/+2
\| \| \|
* \| \|	Merge branch 'dev' into 'dev'	Mario	2018-08-27	5	-11/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add translation to missed strings in Wiki See merge request hubzilla/core!1264
\| * \| \|	Update wiki.tpl	Max Kostikov	2018-08-25	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'revert-c16fda1c' into 'dev'	Max Kostikov	2018-08-25	1	-428/+428
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Update wiki.tpl" See merge request Kostikov/core!2
\| \| * \| \|	Revert "Update wiki.tpl"	Max Kostikov	2018-08-25	1	-428/+428
\| \|/ / / \| \| \| \| \| \| \| \|	This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98
\| * \| \|	Merge branch 'revert-ff1a0d21' into 'dev'	Max Kostikov	2018-08-25	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Update wiki.tpl" See merge request Kostikov/core!1
\| \| * \| \|	Revert "Update wiki.tpl"	Max Kostikov	2018-08-25	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \|	This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5
\| * \| \|	Update wiki.tpl	Max Kostikov	2018-08-25	1	-1/+1
\| \| \| \|
\| * \| \|	Update Wiki_page_history.php	Max Kostikov	2018-08-25	1	-3/+3
\| \| \| \|
\| * \| \|	Update Wiki.php	Max Kostikov	2018-08-25	1	-2/+2
\| \| \| \|
\| * \| \|	Update NativeWikiPage.php	Max Kostikov	2018-08-25	1	-4/+4
\| \| \| \|
\| * \| \|	Update Wiki_page_history.php	Max Kostikov	2018-08-25	1	-1/+4
\| \| \| \|
\| * \| \|	Update Wiki.php	Max Kostikov	2018-08-25	1	-0/+2
\| \| \| \|
\| * \| \|	Update NativeWikiPage.php	Max Kostikov	2018-08-25	1	-2/+5
\| \| \| \|
\| * \| \|	Update nwiki_page_history.tpl	Max Kostikov	2018-08-25	1	-7/+7
\| \| \| \|
\| * \| \|	Update wiki.tpl	Max Kostikov	2018-08-25	1	-428/+428
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-08-27	0	-0/+0
\|\ \ \ \ \| \|/ / / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	Revert "Change main router request variable from 'q' to 'req'. This is ↵	zotlabs	2018-08-26	11	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'." Reverting because this will only work with Apache and break nginx/other installations. This reverts commit 9367e9fe5a0125bf4c2f77909f2789c9dcd41e1e.
\| * \|	Change main router request variable from 'q' to 'req'. This is necessary to ↵	zotlabs	2018-08-26	11	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \|	implement search in the twitter api addon, because twitter requires use of the variable 'q'.
* \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-08-24	5	-46/+88
\|\\| \|
\| * \|	code cleanup	zotlabs	2018-08-23	2	-37/+52
\| \| \|
\| * \|	first_post_date() (used by archive widget) - trigger the query options off ↵	zotlabs	2018-08-23	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \|	of the active module rather than rely on passed parameters
\| * \|	tweak archive widget for articles	zotlabs	2018-08-22	4	-7/+33
\| \| \|
* \| \|	Merge branch 'dm42fixes' into 'dev'	Mario	2018-08-24	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix exclusion of redmatrix theme See merge request hubzilla/core!1263
\| * \| \|	fix exclusion of redmatrix theme	M.Dent	2018-08-23	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'patch-19' into 'dev'	Mario	2018-08-24	2	-259/+227
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Update Russian translation See merge request hubzilla/core!1262
\| * \|	Update hstrings.php	Max Kostikov	2018-08-22	1	-31/+31
\| \| \|