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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'git-marijus-dev' into dev	redmatrix	2016-08-21	10	-103/+125
\|\
\| *	Merge branch 'dev' of https://github.com/git-marijus/hubzilla into ↵	redmatrix	2016-08-21	10	-103/+125
\|/\| \| \| \| \| \| \|	git-marijus-dev
\| *	move jotnets to jot and some cleanup (mostly whitespace)	Mario Vavti	2016-08-21	10	-103/+124
\| \|
* \|	issue #496	redmatrix	2016-08-21	2	-1/+3
\| \|
* \|	Merge branch 'zp' into dev	redmatrix	2016-08-19	1	-4/+31
\|\ \
\| * \|	block backdoor delivery of bulk imported items	redmatrix	2016-08-19	1	-4/+31
\| \|/
* /	string update	redmatrix	2016-08-19	1	-3697/+3724
\|/
*	remove insecure repository warning.	redmatrix	2016-08-18	4	-31/+31
\|
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-08-17	2	-6106/+6089
\|\
\| *	Merge pull request #492 from wave72/dev	hubzilla	2016-08-17	2	-6106/+6089
\| \|\ \| \| \| \| \| \|	Updated Italian strings
\| \| *	Updated Italian strings	Wave72	2016-08-17	2	-6106/+6089
\| \|/
* /	import anomaly	redmatrix	2016-08-17	1	-4/+6
\|/
*	don't set session theme unless logged in.	redmatrix	2016-08-16	3	-1/+11
\|
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-08-16	4	-43/+30
\|\
\| *	Merge pull request #491 from mjfriaza/dev	hubzilla	2016-08-17	1	-0/+12
\| \|\ \| \| \| \| \| \|	Add Spanish context help settings/features page
\| \| *	Add Spanish context help settings/features page	Manuel Jiménez Friaza	2016-08-16	1	-0/+12
\| \|/
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2016-08-16	5	-35/+83
\| \|\
\| * \|	rename limited -> custom	Mario Vavti	2016-08-16	3	-17/+17
\| \| \|
\| * \|	remove unneeded function	Mario Vavti	2016-08-16	1	-26/+1
\| \| \|
* \| \|	get rid of ugly code construct	redmatrix	2016-08-16	1	-8/+1
\| \|/ \|/\|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-08-15	1	-14/+1
\|\\|
\| *	only check settings-form for dirty state and remove redundant javascript	Mario Vavti	2016-08-16	1	-14/+1
\| \|
* \|	move schema settings into the display settings main so we can set ↵	redmatrix	2016-08-15	5	-35/+83
\|/ \| \| \|	theme:schema theme selectors in settings
*	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 pull request #487 from git-marijus/dev	hubzilla	2016-08-16	3	-128/+79
\|\ \| \| \| \|	implement groups in the acl select.
\| *	provide group options serverside and minor cleanup	Mario Vavti	2016-08-15	3	-124/+30
\| \|
\| *	implement groups in the acl select. please notice that selecting *custom ↵	Mario Vavti	2016-08-15	1	-17/+62
\| \| \| \| \| \| \| \|	selection* now sets an empty (public) acl. it was set to self before...
* \|	fix attached photo/file permissions on clones	redmatrix	2016-08-15	3	-134/+140
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-08-15	2	-47/+7
\|\ \
\| * \	Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev	hubzilla	2016-08-16	2	-47/+7
\| \|\ \ \| \| \|/ \| \|/\|	Merge dev with last changes of homeinstall script in master
\| \| *	Merge dev with last changes of homeinstall script in master	Einer von Vielen	2016-08-15	2	-47/+7
\| \|/
* \|	s/$rr/$rv/	redmatrix	2016-08-14	1	-22/+22
\| \|
* \|	event_store_event hook	redmatrix	2016-08-14	3	-0/+21
\|/
*	Merge pull request #484 from anaqreon/settings-context	hubzilla	2016-08-15	2	-1/+13
\|\ \| \| \| \|	Context help for settings/features page
\| *	Context help for settings/features page	Andrew Manning	2016-08-14	2	-1/+13
\|/
*	Merge pull request #482 from anaqreon/nocomment	hubzilla	2016-08-14	5	-0/+35
\|\ \| \| \| \|	Added an optional post editor button to toggle comments
\| *	Change text for submenu on small screens to be static toggle statement	Andrew Manning	2016-08-14	2	-1/+2
\| \|
\| *	Replace hardcoded button title in javascript to translatable text	Andrew Manning	2016-08-14	2	-2/+4
\| \|
\| *	Added a disable comments setting to the "Additional features" settings with ↵	Andrew Manning	2016-08-14	5	-0/+32
\| \| \| \| \| \| \| \|	a corresponding post editor toggle button
* \|	fix javascript error if not logged in	Mario Vavti	2016-08-14	1	-2/+2
\|/
*	update bootstrap 3.3.5 > 3.3.7	Mario Vavti	2016-08-14	6	-138/+111
\|
*	btn/dropdown rendering issue	Mario Vavti	2016-08-14	1	-24/+30
\|
*	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
*	pending flag not being reset when using autoperms from custom role	redmatrix	2016-08-12	1	-1/+4
\|
*	string update	redmatrix	2016-08-12	2	-3626/+3620
\|
*	Merge pull request #479 from git-marijus/dev	hubzilla	2016-08-13	1	-0/+6
\|\ \| \| \| \|	possible quickfix for multi-acl not honoring jotnets
\| *	possible quickfix for multi-acl not honoring jotnets	Mario Vavti	2016-08-12	1	-0/+6
\| \|
* \|	fix auto-connect setting	zottel	2016-08-12	1	-3/+0
\| \|
* \|	Merge remote-tracking branch 'upstream/dev' into dev	zottel	2016-08-12	14	-232/+375
\|\\|