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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed my version of jot.tpl	Haakon Meland Eriksen	2015-11-28	16	-2535/+2213
\|
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-24	2	-10/+41
\|\
\| *	issue #185 - prevent liveUpdate from updating while the built-in html5 media ↵	redmatrix	2015-11-23	1	-1/+20
\| \| \| \| \| \| \| \|	player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time.
\| *	Merge pull request #182 from anaqreon/url-selected	redmatrix	2015-11-24	1	-9/+21
\| \|\ \| \| \| \| \| \|	Place link around selected text
\| \| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected	Andrew Manning	2015-11-20	12	-3280/+3370
\| \| \|\
\| \| * \|	If text is selected in profile-jot-text when the link button is pressed, the ↵	Andrew Manning	2015-11-20	1	-9/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	input URL is applied around the text. Otherwise, the normal link data fetch occurs.
* \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-23	1	-1/+1
\|\\| \| \|
\| * \| \|	delivery report tweaks	redmatrix	2015-11-22	1	-1/+1
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	2	-0/+3
\|\\| \| \|
\| * \| \|	make calendar week start (sun or mon) configurable	Mario Vavti	2015-11-21	2	-0/+3
\| \| \|/ \| \|/\|
* \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| \|
* \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-0/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	5	-3193/+3279
\|\\| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-20	4	-3192/+3278
\| \|\ \
\| \| * \|	update es+nl	jeroenpraat	2015-11-20	4	-3192/+3278
\| \| \| \|
\| * \| \|	make calendar language aware	Mario Vavti	2015-11-20	1	-1/+1
\| \|/ /
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-10/+3
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-3/+5
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+8
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	2	-2/+8
\|\\| \|
\| * \|	Had to switch these 2. Sorry.	jeroenpraat	2015-11-20	1	-0/+2
\| \| \|
\| * \|	Some bits	jeroenpraat	2015-11-20	1	-2/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	4	-1/+17
\|\\| \|
\| * \|	move today button from aside to section title	Mario Vavti	2015-11-19	2	-1/+1
\| \| \|
\| * \|	css fixes	Mario Vavti	2015-11-19	2	-0/+16
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	6	-87/+69
\|\\| \|
\| * \|	move moment.min.js and remove unneeded files	Mario Vavti	2015-11-18	1	-1/+1
\| \| \|
\| * \|	some events refacturing	Mario Vavti	2015-11-18	6	-87/+69
\| \|/
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	1	-2/+2
\|\\|
\| *	fix admin plugin hooks	redmatrix	2015-11-17	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	6	-17/+15
\|\\|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-17	6	-34/+30
\| \|\
\| \| *	more css fixes	Mario Vavti	2015-11-17	5	-15/+13
\| \| \|
\| * \|	photo album widget permissions issue	redmatrix	2015-11-17	1	-2/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-17	4	-33/+49
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	css fixes	Mario Vavti	2015-11-17	2	-7/+9
\| \| \|
\| * \|	show jotnets toggle button only if there are jotnets and whitespace fixes	Mario Vavti	2015-11-17	1	-14/+10
\| \|/
\| *	fix api/direct_messages/new at least for the json case. We seem to have a ↵	redmatrix	2015-11-16	1	-12/+30
\| \| \| \| \| \| \| \|	missing template for XML
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-15	7	-1138/+1160
\|\\|
\| *	nl+es and some other bits	jeroenpraat	2015-11-14	7	-1138/+1160
\| \|
* \|	Reorder buttons HME	Haakon Meland Eriksen	2015-11-13	1	-45/+43
\| \|
* \|	Adding original jot.tpl from GitHub	Haakon Meland Eriksen	2015-11-13	1	-49/+54
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-13	2	-1/+3
\|\\|
\| *	really basic photo album widget for content regions	redmatrix	2015-11-12	1	-0/+2
\| \|
\| *	Small update to Bluegrid and generic-content-wrapper-styled to dreport	jeroenpraat	2015-11-12	1	-1/+1
\| \|
* \|	Reorder buttons	Haakon Meland Eriksen	2015-11-13	1	-53/+48
\| \|
* \|	Reverted changes - got white screen	Haakon Meland Eriksen	2015-11-13	1	-47/+52
\| \|
* \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-13	1	-7/+8
\| \|