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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into trinidad	friendica	2015-01-04	2	-2/+6
\|\
\| *	Merge pull request #819 from pafcu/acl	pafcu	2015-01-05	2	-2/+6
\| \|\
\| \| *	Fix initEditor on non-wall pages	Stefan Parviainen	2015-01-05	2	-2/+6
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-04	1	-1/+1
\|\\| \|
\| * \|	the last checkin removed hostname from the address for autocomplete searches....	friendica	2015-01-04	1	-1/+1
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-04	2	-2/+2
\|\\| \|
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-04	1	-1/+1
\| \|\ \
\| \| * \|	Merge pull request #817 from pafcu/acl	pafcu	2015-01-04	1	-1/+1
\| \| \|\\|
\| \| \| *	Fix height calculation in acl.js	Stefan Parviainen	2015-01-04	1	-1/+1
\| * \| \|	only check the LHS of xchan_addr for autocomplete, don't match on the hostname.	friendica	2015-01-04	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-04	6	-81/+89
\|\\| \|
\| * \|	Merge pull request #816 from pafcu/acl	RedMatrix	2015-01-05	5	-80/+88
\| \|\\|
\| \| *	Typo	Stefan Parviainen	2015-01-04	1	-3/+3
\| \| *	Sorting of autocomplete	Stefan Parviainen	2015-01-04	83	-7141/+7366
\| \| \|\
\| \| * \|	Autocmplete suggestions for non-local users, also suggest from visited channe...	Stefan Parviainen	2015-01-04	5	-80/+68
\| * \| \|	Fix wrong require	Stefan Parviainen	2015-01-04	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-04	12	-4625/+4679
\|\\| \|
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-04	10	-4623/+4677
\| \|\ \
\| \| * \|	update NL and text-background-fix in chat for alternatives schemas	Jeroen	2015-01-03	8	-4620/+4672
\| \| * \|	provide some info for buttons	marijus	2015-01-03	2	-3/+5
\| * \| \|	remove hard-coded url to caterva.eu from events code.	friendica	2015-01-04	2	-2/+2
\| \|/ /
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-02	0	-0/+0
\|\\| \|
\| * \|	no newline at end of file	friendica	2015-01-02	1	-1/+1
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-02	4	-26/+46
\|\\| \|
\| * \|	some work on the edit connection workflow explanation and connedit page. This...	friendica	2015-01-02	4	-26/+46
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-02	63	-2458/+2562
\|\\| \|
\| * \|	doc updates	friendica	2015-01-02	63	-2458/+2562
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-02	9	-106/+89
\|\\| \|
\| * \|	Merge pull request #813 from pafcu/checkboxes	RedMatrix	2015-01-03	7	-83/+63
\| \|\\|
\| \| *	Reworked switch to also display text	Stefan Parviainen	2015-01-02	7	-83/+63
\| * \|	Merge pull request #812 from f03el/master	RedMatrix	2015-01-03	1	-21/+21
\| \|\ \
\| \| * \|	Use HTML entities	Erik Lundin	2015-01-02	1	-21/+21
\| \|/ /
\| * \|	Merge pull request #810 from pafcu/aclsort	pafcu	2015-01-02	1	-2/+5
\| \|\ \
\| \| * \|	Sort acl results according to match position (only type='c' for now)	Stefan Parviainen	2015-01-02	1	-2/+5
\| \| \|/
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-01	2	-7/+31
\|\\| \|
\| * \|	syntax issues (with some php versions?), unchecked intval	friendica	2015-01-01	2	-7/+31
\| \|/
* \|	Merge branch 'master' into trinidad	friendica	2015-01-01	318	-11043/+20068
\|\\|
\| *	fix shares that are processed with markdown (regression, this was pulled from...	friendica	2015-01-01	1	-3/+5
\| *	htmlpurifier update - compatibility issue with language library autoloader	friendica	2015-01-01	262	-5949/+13348
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-01	55	-5091/+6715
\| \|\
\| \| *	Merge pull request #808 from f03el/master	RedMatrix	2015-01-02	3	-4948/+5069
\| \| \|\
\| \| \| *	Update Swedish strings from Transifex	Erik Lundin	2015-01-02	2	-4947/+4991
\| \| \| *	Swedish translation	Erik Lundin	2015-01-02	1	-1/+78
\| \| * \|	Merge pull request #807 from pafcu/dblclicknewevent	RedMatrix	2015-01-02	1	-0/+5
\| \| \|\ \
\| \| \| * \|	Double click on day in calendar creats new event starting that day	Stefan Parviainen	2015-01-01	1	-0/+5
\| \| \| \|/
\| \| * \|	Merge pull request #805 from pafcu/moretpl	RedMatrix	2015-01-02	12	-92/+53
\| \| \|\ \
\| \| \| * \|	Use grouped select field for role selection	Stefan Parviainen	2015-01-01	8	-48/+28
\| \| \| * \|	Use grouped select field for timezone selection	Stefan Parviainen	2015-01-01	5	-44/+13
\| \| \| * \|	Add field template for grouped selects	Stefan Parviainen	2015-01-01	1	-0/+12
\| \| \| \|/
\| \| * \|	Merge pull request #804 from pafcu/areyousure	RedMatrix	2015-01-02	15	-0/+1442
\| \| \|\ \