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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix fullscreen and bbco_autocomplete popup rendering	Mario Vavti	2017-03-20	4	-17/+13
\|
*	minor fixes	Mario Vavti	2017-03-20	1	-2/+2
\|
*	move profile tabs to app-tray	Mario Vavti	2017-03-20	12	-12/+22
\|
*	since we have the app bin we do not actually need the profile tabs for ourself	Mario Vavti	2017-03-20	1	-0/+3
\|
*	update to latest bs4 from git and change hidden-* classes to d-*	Mario Vavti	2017-03-20	23	-341/+295
\|
*	Merge branch 'dev' into bs4	Mario Vavti	2017-03-20	130	-39/+15887
\|\
\| *	Merge pull request #703 from dawnbreak/oauth2	zotlabs	2017-03-20	128	-6/+15850
\| \|\ \| \| \| \| \| \|	:arrow_up: Update bshaffer/oauth2-server-php library.
\| \| *	:arrow_up: Update bshaffer/oauth2-server-php library.	Klaus Weidenbach	2017-03-20	128	-6/+15850
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manage oauth2-server-php library with composer. Folder ./library/oauth2/ can be removed and includes removed with autoloading.
\| * \|	Merge pull request #702 from dawnbreak/dev	zotlabs	2017-03-20	2	-33/+37
\| \|\ \ \| \| \|/ \| \|/\|	:white_check_mark: Add unit test for purify_html().
\| \| *	:white_check_mark: Add unit test for purify_html().	Klaus Weidenbach	2017-03-19	2	-33/+37
\| \|/ \| \| \| \| \| \| \| \| \| \|	In preparation to update HTMLPurifier library add a unit test. Please add more HTML that you need to have working and we can check against regressions.
* \|	change the btn-outline-secondary:hover color to soething sane	Mario Vavti	2017-03-19	1	-0/+4
\| \|
* \|	Revert "update to bs-git"	Mario Vavti	2017-03-19	4	-163/+231
\| \| \| \| \| \| \| \|	This reverts commit 7b0f3d9e26b8c666440de09c5eb33dc6360472c6.
* \|	update to bs-git	Mario Vavti	2017-03-19	4	-231/+163
\| \|
* \|	do not show the scrollbar before the animation has finished	Mario Vavti	2017-03-19	1	-1/+1
\| \|
* \|	fix some wrapping issues	Mario Vavti	2017-03-19	3	-6/+15
\| \|
* \|	reflect count in modal	Mario Vavti	2017-03-19	2	-2/+2
\| \|
* \|	open like-modal directly if more than 10 likes	Mario Vavti	2017-03-19	3	-22/+12
\| \|
* \|	typo	Mario Vavti	2017-03-19	1	-1/+1
\| \|
* \|	css fixes	Mario Vavti	2017-03-19	3	-4/+6
\| \|
* \|	a % example for font size	Mario Vavti	2017-03-19	1	-1/+1
\| \|
* \|	fix jgrowl position and remove some redundant css	Mario Vavti	2017-03-19	1	-8/+1
\| \|
* \|	fix narrow navbar setting and contextual-help position	Mario Vavti	2017-03-19	2	-49/+15
\| \|
* \|	Merge branch 'dev' into bs4	Mario Vavti	2017-03-19	52	-5493/+3826
\|\\|
\| *	fix php warning and remove logging	Mario Vavti	2017-03-19	1	-4/+2
\| \|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-18	1	-2/+1
\| \|\
\| * \|	issue #699	zotlabs	2017-03-18	49	-1651/+0
\| \| \|
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-15	15	-234/+758
\| \|\ \
\| * \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-15	2	-18/+6
\| \|\ \ \
\| * \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-13	2	-2/+2
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-11	2	-2/+26
\| \|\ \ \ \ \
\| * \| \| \| \| \|	strings	zotlabs	2017-03-10	1	-3838/+3824
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Monday is a proper name and should be capitalised (except in private ↵	zotlabs	2017-03-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	conversation amongst unix geeks).
* \| \| \| \| \| \|	remove redundant css	Mario Vavti	2017-03-19	1	-20/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	css fixes	Mario Vavti	2017-03-19	1	-1/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix custom fontsize for app	Mario Vavti	2017-03-19	4	-19/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	bs4 fixes	Mario Vavti	2017-03-19	7	-144/+93
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	bs4 fixes	Mario Vavti	2017-03-18	8	-13/+23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	more abook_edit and some css	Mario Vavti	2017-03-18	3	-6/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	more abook_edit	Mario Vavti	2017-03-18	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix abook_edit and private mail	Mario Vavti	2017-03-18	4	-46/+31
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dev' into bs4	Mario Vavti	2017-03-18	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #698 from dawnbreak/dev	Klaus	2017-03-18	1	-2/+1
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Missed one old Markdown()
\| \| * \| \| \| \|	Missed one old Markdown()	Klaus	2017-03-18	1	-2/+1
\| \|/ / / / /
* \| \| \| \| \|	bs4 fixes	Mario Vavti	2017-03-18	9	-290/+85
\| \| \| \| \| \|
* \| \| \| \| \|	fix usermenu radius	Mario Vavti	2017-03-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	css fixes	Mario Vavti	2017-03-17	2	-6/+10
\| \| \| \| \| \|
* \| \| \| \| \|	fix item_list and item_search templates. make item filer use a bootdtrap ↵	Mario Vavti	2017-03-17	19	-284/+276
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modal and some css and class fixes
* \| \| \| \| \|	Merge branch 'dev' into bs4	Mario Vavti	2017-03-16	15	-234/+758
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #569 from dawnbreak/QA_testing	zotlabs	2017-03-16	15	-234/+758
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|	[FEATURE] Extend Travis CI integration.
\| \| * \| \| \|	:construction_worker: Add Travis' GitHub deployment steps.	Klaus Weidenbach	2017-03-14	2	-50/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed API documentation deployment to gh_pages to Travis's GitHub Pages deployment. Also add Travis GitHub Release Deployment step to offer API documentation. Both steps are optional and need to be activated in Travis by setting GH_TOKEN.