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

	Commit message (Collapse)	Author	Age	Files	Lines
*	update es+nl	jeroenpraat	2015-12-07	4	-752/+854
\|
*	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-12-07	1	-1/+1
\|\
\| *	fix issue #210	Mario Vavti	2015-12-07	1	-1/+1
\| \|
* \|	mod_mitem.js is obsolete	Mario Vavti	2015-12-07	1	-17/+0
\|/
*	some style.css janitor work	Mario Vavti	2015-12-07	2	-279/+20
\|
*	override bs default margin	Mario Vavti	2015-12-07	1	-0/+1
\|
*	change album_id logic to make it work with ajax calls	Mario Vavti	2015-12-07	2	-3/+4
\|
*	make justify gallery work with more than one albums per page (eg album widget)	Mario Vavti	2015-12-07	6	-9/+12
\|
*	Merge branch 'dev'	redmatrix	2015-12-06	12	-469/+639
\|\
\| *	provide plugin hooks for blacklist checking functions.	redmatrix	2015-12-06	4	-0/+40
\| \|
\| *	remove duplicated code	redmatrix	2015-12-06	2	-475/+4
\| \|
\| *	minor optimisation	redmatrix	2015-12-06	1	-1/+0
\| \|
\| *	whitespace	redmatrix	2015-12-06	1	-2/+0
\| \|
\| *	comment order	redmatrix	2015-12-06	1	-2/+1
\| \|
\| *	start of v4	redmatrix	2015-12-06	8	-1/+606
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-12-07	8	-4/+38
\|\\|
\| *	update error	redmatrix	2015-12-06	1	-1/+1
\| \|
\| *	Merge branch 'dev'	redmatrix	2015-12-06	2	-0/+25
\| \|\
\| \| *	Merge branch 'master' into dev	redmatrix	2015-12-05	7	-7326/+7566
\| \| \|\
\| \| * \|	use the channel blacklist for items and mail, still todo: directory and stuff	redmatrix	2015-12-03	2	-0/+25
\| \| \| \|
\| * \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-06	181	-13477/+15456
\| \|\ \ \
\| * \| \| \|	version	redmatrix	2015-12-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	change text "Red developers" in update failed email	redmatrix	2015-12-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	move the instance stuff to abook where it belongs	redmatrix	2015-12-05	4	-2/+11
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	css fixes for blockquote and code (use same padding)	Mario Vavti	2015-12-07	1	-4/+2
\| \|/ / \|/\| \|
* \| \|	add missing smarty files	Mario Vavti	2015-12-06	67	-0/+5003
\| \| \|
* \| \|	update smarty to 3.1.28-dev which fixes a bug where changes in a template ↵	Mario Vavti	2015-12-06	89	-6944/+5412
\| \| \| \| \| \| \| \| \| \| \| \|	are only visible on the second pageload which is annoying for developing
* \| \|	remove more unneeded smarty files	Mario Vavti	2015-12-06	23	-4430/+0
\| \| \|
* \| \|	remove composer release notes	Mario Vavti	2015-12-06	1	-29/+0
\| \| \|
* \| \|	update smarty library - seems to bring some performance improvement	Mario Vavti	2015-12-06	86	-9403/+12370
\| \| \|
* \| \|	fix css issue in directory	Mario Vavti	2015-12-06	3	-6/+6
\|/ /
* \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-05	5	-7004/+7203
\|\ \
\| * \	Merge pull request #209 from HaakonME/master	redmatrix	2015-12-06	3	-7003/+7198
\| \|\ \ \| \| \| \| \| \| \| \|	Updated Norwegian strings for Hubzilla 1.0
\| \| * \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-05	7	-13/+17
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #208 from anaqreon/mail-text-height	redmatrix	2015-12-05	1	-0/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Enlarge the default mail composition text area.
\| \| * \| \|	Enlarge the default mail composition text area.	Andrew Manning	2015-12-04	1	-0/+4
\| \|/ / /
\| * \| /	fix rendering of unseen forum posts count	Mario Vavti	2015-12-04	1	-1/+1
\| \| \|/ \| \|/\|
\| \| *	Updated Norwegian translation	Haakon Meland Eriksen	2015-12-05	2	-7002/+7197
\| \| \|
\| \| *	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-03	19	-13331/+13365
\| \| \|\
\| \| * \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-01	11	-6759/+6830
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-29	7	-30/+51
\| \| \|\ \ \
\| \| * \| \| \|	Resolving merge conflict	Haakon Meland Eriksen	2015-11-29	9	-302/+49
\| \| \| \| \| \|
\| \| * \| \| \|	My version of jot.tpl	Haakon Meland Eriksen	2015-11-28	1	-49/+58
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-28	27	-4462/+4962
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl
\| \| * \| \| \| \|	Removed my version of jot.tpl	Haakon Meland Eriksen	2015-11-28	31	-2752/+2496
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-24	9	-42/+96
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-23	7	-5/+59
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Documenting the need to change database server address from 127.0.0.1 to ↵	Haakon Meland Eriksen	2015-11-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	localhost when installing Hubzilla on OpenShift with the deploy script
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-22	4	-346/+886
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	4	-2/+11
\| \| \|\ \ \ \ \ \ \ \