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	3	-1/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Added docblox default configuration file. fixed apps css * master:
\| *	Merge pull request #69 from abinoam/docblox	Abinoam P. Marques Jr.	2012-03-03	1	-0/+13
\| \|\ \| \| \| \| \| \|	Added docblox default configuration file.
\| \| *	Added docblox default configuration file.	Abinoam P. Marques Jr	2012-03-03	1	-0/+13
\| \|/ \| \| \| \| \| \| \| \|	Now docblox can be run without arguments on friendica root dir. The documentation will be generated on ./data/output
\| *	Merge pull request #68 from tomtom84/master	tomtom84	2012-03-03	2	-1/+8
\| \|\ \| \| \| \| \| \|	fixes in diabook theme
\| \| *	fixed apps css	tommy tomson	2012-03-03	2	-1/+8
\| \| \|
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-03	17	-12/+19
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:
\| * \|	Merge pull request #67 from tomtom84/master	tomtom84	2012-03-03	7	-10/+17
\| \|\\| \| \| \| \| \| \|	fixes in diabook theme
\| \| *	fixed star/unstar	tommy tomson	2012-03-03	7	-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	20	-186/+404
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
\| \| \|
\| * \|	add diabook to default themes	friendica	2012-03-02	2	-2/+2
\| \| \|
* \| \|	minor formatting issues	Simon L'nu	2012-03-02	1	-12/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	0	-0/+0
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix @mention autocomplete in comments template proc: fix variables regexp * master:
* \|	Merge pull request #61 from fabrixxm/master	Simon	2012-03-02	2	-2/+11
\|\ \ \| \| \| \| \| \|	fix to variable rexexp and mentions autocomplete in comments
\| * \|	fix @mention autocomplete in comments	Fabio Comuni	2012-03-03	1	-1/+1
\| \| \|
\| * \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-03	33	-127/+2470
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #60 from simonlnu/master	Simon	2012-03-02	6	-123/+135
\|\ \ \ \| \| \| \| \| \| \| \|	apply changes to templates to testbubble
\| * \| \|	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 branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	0	-0/+0
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: deleted readme.txt from folder diabook github finally working adjust3 adjust2 adjust * master:
* \| \|	Merge pull request #58 from simonlnu/master	Simon	2012-03-02	5	-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	5	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	13	-69/+50
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: template proc: allow isolation of var name between [ and ] group: fix create new group form templates: fix tags template proc: remove unused function and commented out code template proc: first optimization * master:
\| * \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	1	-0/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: expand multiple heart smilies e.g. <3333 * master:
\| * \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-02	36	-640/+952
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: item table update for file feature probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type diabook commit conversation: remove templating items in code and move it to template. Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them template proc: avoid a notice and allow template name to include to be passed with a variable value show relation in contact_template admin: fix small string fix visualization in groupeditor less html in mod/group.php, template for group members editor, quattro theme for group edit. * master:
\| * \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-29	8	-35/+115
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: yet more work on notifications notification enhancements better handling of multiple notifications for same item, and old notifications * master:
\| * \ \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-29	8	-10/+24
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Update LICENSE Update README cleaned up mess created when both people request friendship and one approves as duplex call time pass by reference deprecated From Tobias H - catch some irregularities caused by cut/paste code * master:
\| * \ \ \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-28	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix url and network display * master:
\| * \ \ \ \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-28	6	-55/+14
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: update globaldir when page-type changes, add spam date field clicking contact on contacts page broken link * master:
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	2	-9/+18
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: cleanup notify subject lines * master:
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	3	-7/+9
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master:
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-02-27	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master:
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #59 from tomtom84/master	Simon	2012-03-02	23	-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
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'tomtom84_friendica/master' into master-2	tommy tomson	2012-03-02	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \