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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	15	-12/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:
\| *	Merge pull request #67 from tomtom84/master	tomtom84	2012-03-03	5	-10/+17
\| \|\ \| \| \| \| \| \|	fixes in diabook theme
\| \| *	fixed star/unstar	tommy tomson	2012-03-03	5	-10/+17
\| \| \|
\| * \|	Merge pull request #66 from tomtom84/master	tomtom84	2012-03-03	11	-2/+2
\| \|\\| \| \| \| \| \| \|	fixed editor and admin-sec in theme diabook
\| \| *	fixed admin	tommy tomson	2012-03-03	11	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	fixed editor
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	2	-14/+34
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix editor * master:
\| * \|	Merge pull request #65 from tomtom84/master	tomtom84	2012-03-03	2	-14/+34
\| \|\\| \| \| \| \| \| \|	fix editor in theme diabook
\| \| *	fix editor	tommy tomson	2012-03-03	2	-14/+34
\| \| \|
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	18	-184/+402
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master:
\| * \|	Merge pull request #64 from tomtom84/master	tomtom84	2012-03-03	10	-7/+204
\| \|\\| \| \| \| \| \| \|	fix editor in theme diabook
\| \| *	fix text-editor in theme	tommy tomson	2012-03-03	10	-7/+204
\| \| \|
\| * \|	german strings as of 28th Feb from transilex	Tobias Diekershoff	2012-03-03	2	-142/+142
\| \| \|
\| * \|	Merge pull request #63 from tomtom84/master	tomtom84	2012-03-02	3	-1/+5
\| \|\\| \| \| \| \| \| \|	fixes in diabook theme
\| \| *	small fix in style.css	tommy tomson	2012-03-03	1	-1/+5
\| \| \|
\| \| *	fix star/unstar	tommy tomson	2012-03-03	2	-0/+0
\| \| \|
\| * \|	Merge pull request #62 from tomtom84/master	friendica	2012-03-02	5	-34/+51
\| \|\\| \| \| \| \| \| \|	fixes in diabook theme
\| \| *	fixes in wall_item.tpl and style.css in theme diabook	tommy tomson	2012-03-03	3	-8/+12
\| \| \|
\| \| *	fix in wall_item.tpl	tommy tomson	2012-03-03	3	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \|	new icon link.png
\| \| *	fixed broken tags and notifications in theme	tommy tomson	2012-03-03	3	-16/+26
\| \| \|
* \| \|	minor formatting issues	Simon L'nu	2012-03-02	1	-12/+7
\|/ / \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	apply changes to templates to testbubble	Simon L'nu	2012-03-02	6	-123/+135
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	Merge pull request #58 from simonlnu/master	Simon	2012-03-02	4	-4/+4
\|\ \ \| \| \| \| \| \|	fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
\| * \|	fix for comment-wwedit-wrapper CSS class in tpl had a stray $	Simon L'nu	2012-03-02	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \| \|	Merge pull request #59 from tomtom84/master	Simon	2012-03-02	22	-0/+2331
\|\ \ \ \| \|/ / \|/\| / \| \|/	diabook theme
\| *	deleted readme.txt from folder diabook	tommy tomson	2012-03-02	1	-0/+0
\| \|
\| *	github finally working	tommy tomson	2012-03-02	1	-2/+0
\| \|
\| *	adjust3	tommy tomson	2012-03-02	1	-0/+1
\| \|
\| *	adjust	tommy tomson	2012-03-02	23	-0/+2332
\| \|
* \|	templates: fix tags	Fabio Comuni	2012-03-02	10	-20/+22
\| \|
* \|	Merge pull request #55 from fabrixxm/master	fabrixxm	2012-03-02	21	-495/+575
\|\ \ \| \|/ \|/\|	Some minor and one majior mod in templates
\| *	conversation: remove templating items in code and move it to template.	Fabio Comuni	2012-03-01	14	-457/+481
\| \|
\| *	show relation in contact_template	Fabio Comuni	2012-03-01	1	-0/+1
\| \|
\| *	Merge remote-tracking branch 'friendica/master' into randomerror	Fabio Comuni	2012-02-29	47	-1008/+1831
\| \|\
\| * \|	fix visualization in groupeditor	Fabio Comuni	2012-02-23	1	-2/+2
\| \| \|
\| * \|	less html in mod/group.php, template for group members editor, quattro theme ↵	Fabio Comuni	2012-02-23	6	-38/+93
\| \| \| \| \| \| \| \| \| \| \| \|	for group edit.
* \| \|	diabook commit	tommy tomson	2012-03-02	1	-0/+0
\| \|/ \|/\|
* \|	revert 01a2791e3a to avoid random preg internal errors. fix contact_template	Fabio Comuni	2012-02-27	1	-2/+2
\| \|
* \|	add plugin hooks to enotify	friendica	2012-02-26	3	-3/+3
\| \|
* \|	minor typographical fixes. need to do something about the http on https ↵	Simon L'nu	2012-02-27	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \|	sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \|	fix tag icon size	friendica	2012-02-26	1	-0/+0
\| \|
* \|	typo in css	friendica	2012-02-26	1	-1/+1
\| \|
* \|	tagging missing from wallwall and a couple of themes, star missing from dispy	friendica	2012-02-26	11	-0/+24
\| \|
* \|	Mail: New options for actions after importing mails.	Michael	2012-02-26	2	-6/+9
\| \|
* \|	Merge remote branch 'upstream/master'	Michael	2012-02-26	24	-650/+1174
\|\ \
\| * \|	some revision to the German strings	Tobias Diekershoff	2012-02-26	2	-18/+20
\| \| \|
\| * \|	German strings	Tobias Diekershoff	2012-02-26	2	-630/+895
\| \| \|
\| * \|	show experimental and unsupported theme status on theme admin page	friendica	2012-02-26	9	-0/+2
\| \| \|
\| * \|	jumping divs with no scrolling	friendica	2012-02-26	1	-1/+1
\| \| \|
\| * \|	imrpove contrast on darkzero blockquotes	friendica	2012-02-26	2	-0/+8
\| \| \|
\| * \|	darkzero-NS theme	friendica	2012-02-26	7	-1/+153
\| \| \|