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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 1.12RC	redmatrix	2016-08-22	0	-0/+0
\|\
\| *	Revert "Merge branch '1.12RC'"	redmatrix	2016-08-22	121	-23970/+21829
\| \| \| \| \| \| \| \| \| \|	This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.
\| *	Revert "missing release file"	redmatrix	2016-08-22	1	-236/+0
\| \| \| \| \| \| \| \|	This reverts commit 17fa2d88012091ac5c015a1d2703598c1b7f2f48.
\| *	Revert "more missing files from merge"	redmatrix	2016-08-22	3	-367/+0
\| \| \| \| \| \| \| \|	This reverts commit 1bd784cf12d6ca4dc3ed2a6a3e77c7127a9d8590.
\| *	more missing files from merge	redmatrix	2016-08-22	3	-0/+367
\| \|
\| *	missing release file	redmatrix	2016-08-22	1	-0/+236
\| \|
\| *	Merge branch '1.12RC'	redmatrix	2016-08-22	121	-21829/+23970
\| \|\ \| \|/ \|/\|
* \|	Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge	redmatrix	2016-08-22	4	-11185/+11251
\|\ \
\| * \|	Spanish and Dutch strings	jeroenpraat	2016-08-22	4	-11185/+11251
\| \| \|
* \| \|	public forum fallback checking (when custom/expert permissions are applied) ↵	redmatrix	2016-08-22	1	-5/+4
\|/ / \| \| \| \| \| \|	was looking at owner rather than observer perms
* \|	Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge	redmatrix	2016-08-21	6	-19743/+20176
\|\ \
\| * \|	Updating Spanish and Dutch strings	jeroenpraat	2016-08-17	4	-12928/+13136
\| \| \|
\| * \|	Merge pull request #493 from phellmes/de20160817	hubzilla	2016-08-17	2	-6815/+7040
\| \|\ \ \| \| \| \| \| \| \| \|	Update DE translation strings
\| \| * \|	Update DE translation strings	phellmes	2016-08-17	2	-6815/+7040
\| \|/ /
* / /	issue #496	redmatrix	2016-08-21	2	-1/+3
\|/ /
* \|	Use double quotes for strings passed via templates to javascript. Some ↵	redmatrix	2016-08-15	1	-5/+5
\| \| \| \| \| \| \| \|	translated strings have unescaped single quotes.
* \|	Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge	redmatrix	2016-08-15	12	-185/+152
\|\ \
\| * \	Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC	Mario Vavti	2016-08-15	2	-29/+37
\| \|\ \
\| \| * \|	btn/dropdown rendering issue	Mario Vavti	2016-08-14	1	-24/+30
\| \| \| \|
\| \| * \|	Merge pull request #481 from anaqreon/issue-475	hubzilla	2016-08-14	1	-5/+7
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Fixed bug preventing images in root photo album from loading in embed…
\| \| \| * \|	Fix for older photos not being embedded by the embedphotos tool.	Andrew Manning	2016-08-13	1	-2/+4
\| \| \| \| \|
\| \| \| * \|	Fixed bug preventing images in root photo album from loading in embedphotos ↵	Andrew Manning	2016-08-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dialog.
\| * \| \| \|	update bootstrap 3.3.5 > 3.3.7	Mario Vavti	2016-08-15	6	-138/+111
\| \| \| \| \|
\| * \| \| \|	fix javascript error if not logged in	Mario Vavti	2016-08-15	1	-2/+2
\| \|/ / /
\| * \| \|	remove js debugging	Mario Vavti	2016-08-13	1	-1/+0
\| \| \| \|
\| * \| \|	fix #480, enable bbcode autocomplete for photo comments and remove some ↵	Mario Vavti	2016-08-13	4	-16/+3
\| \|/ / \| \| \| \| \| \| \| \| \|	redundant javascript
* / /	Merge dev with last changes of homeinstall script in master	Einer von Vielen	2016-08-15	2	-47/+7
\|/ /
* \|	pending flag not being reset when using autoperms from custom role	redmatrix	2016-08-12	1	-1/+4
\| \|
* \|	fix auto-connect setting	zottel	2016-08-12	1	-3/+0
\| \|
* \|	possible quickfix for multi-acl not honoring jotnets	Mario Vavti	2016-08-12	1	-0/+6
\| \|
* \|	embed filter adjustments	redmatrix	2016-08-11	1	-13/+17
\| \|
* \|	forum detection was off for forums with custom perms	redmatrix	2016-08-10	1	-1/+3
\| \|
* \|	update CHANGELOG for 1.12	redmatrix	2016-08-10	1	-0/+25
\| \|
* \|	update version	redmatrix	2016-08-10	1	-1/+1
\| \|
* \|	implement acl for folder creation	Mario Vavti	2016-08-10	4	-17/+53
\| \|
* \|	open editor or comment window when linkdropping to a closed window. We ↵	redmatrix	2016-08-10	1	-4/+18
\| \| \| \| \| \| \| \|	probably also need this for filedropping.
* \|	allow dropping links on comments as well as posts	redmatrix	2016-08-09	2	-2/+4
\| \|
* \|	function order reversed	redmatrix	2016-08-09	1	-2/+2
\| \|
* \|	You can drag links to the editor (which will be parsed and inserted); as ↵	redmatrix	2016-08-09	2	-2/+2
\| \| \| \| \| \| \| \|	well as files (which will be uploaded)
* \|	bad code format	redmatrix	2016-08-09	2	-2/+27
\| \|
* \|	updates to hcard parsing	redmatrix	2016-08-07	1	-4/+9
\| \|
* \|	diaspora vcard updates	redmatrix	2016-08-07	2	-5/+12
\| \|
* \|	server roles	redmatrix	2016-08-07	1	-6/+8
\| \|
* \|	use config system.server_role and deprecate 'UNO'	redmatrix	2016-08-07	24	-71/+135
\| \|
* \|	fix cloud path	redmatrix	2016-08-07	1	-1/+1
\| \|
* \|	fix /cloud upload for images	Mario Vavti	2016-08-06	1	-1/+1
\| \|
* \|	bring back acl for cloud file uploads	Mario Vavti	2016-08-06	4	-19/+31
\| \|
* \|	strings update	redmatrix	2016-08-05	1	-2270/+2333
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-08-05	38	-121/+242
\|\ \
\| * \	Merge pull request #477 from git-marijus/dev	hubzilla	2016-08-06	37	-119/+200
\| \|\ \ \| \| \| \| \| \| \| \|	Some work to make multiple acl forms per page work