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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'upstream/master'	Michael Vogel	2012-04-07	493	-1342/+3345
\|\
\| *	changelog 1.014 :	tommy tomson	2012-04-07	37	-79/+1373
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed
\| *	Merge pull request #210 from tomtom84/master	tomtom84	2012-04-06	173	-51/+126
\| \|\ \| \| \| \| \| \|	fixes in diabook-derivates
\| \| *	new-contacts-introductions in contacts-drop-down and new-messages in ↵	tommy tomson	2012-04-06	173	-51/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
\| * \|	small fixes for the German strings	Tobias Diekershoff	2012-04-06	2	-19/+19
\| \|/
\| *	update to the German strings	Tobias Diekershoff	2012-04-06	2	-1216/+1850
\| \|
\| *	Merge branch 'master' of https://github.com/friendica/friendica	Alexander Kampmann	2012-04-05	890	-5398/+45119
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/config.php update.php
* \| \|	"vier": Bookmarks now look better.	Michael Vogel	2012-04-07	2	-0/+10
\| \| \|
* \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-06	84	-4038/+567
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	finish styling category tags and category input	Simon L'nu	2012-04-05	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	style categorytags	Simon L'nu	2012-04-04	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	update the dispy* templates	Simon L'nu	2012-04-04	19	-131/+188
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	move alert box away from nav links	friendica	2012-04-04	1	-1/+4
\| \| \|
\| * \|	latest changes are the popup menu for notifs, fixes	Simon L'nu	2012-04-04	2	-20/+38
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'pull'	friendica	2012-04-03	24	-120/+313
\| \|\ \
\| \| * \|	smal fix	tommy tomson	2012-04-03	1	-1/+1
\| \| \| \|
\| \| * \|	german translation for right_aside	tommy tomson	2012-04-03	1	-0/+8
\| \| \| \|
\| \| * \|	make right_aside translatable and provide german translation...	tommy tomson	2012-04-03	23	-119/+304
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and some css-fixes
\| * \| \|	remove loozah themes which fell too far behind to recover	friendica	2012-04-03	39	-3762/+0
\| \|/ /
* \| \|	API: template for test function added	Michael Vogel	2012-04-02	1	-0/+1
\| \| \|
* \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-02	65	-470/+1540
\|\\| \|
\| * \|	diabook-themes: css-fixes	tommy tomson	2012-04-02	24	-20/+125
\| \| \|
\| * \|	diabook-themes: fixes in js	tommy tomson	2012-04-02	4	-112/+115
\| \| \|
\| * \|	diabook-themes: fixed pageheader	tommy tomson	2012-04-02	17	-68/+98
\| \| \|
\| * \|	diabook-themes: bugfixes / css-fixes	tommy tomson	2012-04-02	17	-17/+30
\| \| \|
\| * \|	allow users to set categories on their posts	Michael Johnston	2012-04-01	4	-11/+33
\| \| \|
\| * \|	diabook-themes: add link to global dir in "find friends" at right_aside	tommy tomson	2012-04-02	12	-12/+20
\| \| \|
\| * \|	css-fixes	tommy tomson	2012-04-02	7	-12/+13
\| \| \|
\| * \|	add new messages-layout in diabook	tommy tomson	2012-04-01	25	-8/+683
\| \| \|
\| * \|	fix the display of community-plugin in diabook-themes	tommy tomson	2012-04-01	16	-222/+435
\| \| \|
* \| \|	The "vier"-theme is now working again. But there is still work needed	Michael Vogel	2012-04-02	5	-10/+66
\|/ /
* \|	various bugfixes and css-fixes	tommy tomson	2012-04-01	11	-46/+69
\| \|
* \|	qcomment overflow	friendica	2012-04-01	1	-0/+8
\| \|
* \|	Merge branch 'pull'	friendica	2012-04-01	5	-11/+31
\|\ \
\| * \|	latest fixes for dispys. tweaking/repairing	Simon L'nu	2012-04-01	5	-11/+31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \| \|	send unverified private mail using zrl	friendica	2012-04-01	5	-0/+131
\|/ /
* \|	diabook-themes: move "common tabs" to left side on settings page	tommy tomson	2012-03-31	12	-47/+31
\| \|
* \|	move the common tabs to right_aside in diabook-derivates	tommy tomson	2012-03-31	12	-0/+10514
\| \|
* \|	Merge branch 'pull'	friendica	2012-03-31	25	-116/+355
\|\ \
\| * \|	bug fix in diabook-aerith and -red	tommy tomson	2012-03-31	6	-22/+22
\| \| \|
\| * \|	bug-fixes in diabook-derivates	tommy tomson	2012-03-31	17	-40/+249
\| \| \|
\| * \|	forgot the css changes for last push	Simon L'nu	2012-03-31	2	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	theme fixes; fix qcomment (finally)	Simon L'nu	2012-03-31	4	-44/+86
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \| \|	settings for unknown private mail acceptance	friendica	2012-03-31	1	-0/+4
\|/ /
* \|	quattro: move quattro-green inside quattro folder.	Fabio Comuni	2012-03-30	16	-72/+87
\| \| \| \| \| \| \| \|	Add config option to select quattro color scheme.
* \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-30	6	-14/+36
\|\ \
\| * \|	css-fixes in diabook-derivates	tommy tomson	2012-03-30	6	-14/+36
\| \| \|
* \| \|	quattro-green: remove settings code	Fabio Comuni	2012-03-30	1	-29/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Use config.php from quattro
* \| \|	quattro: add config.php	Fabio Comuni	2012-03-30	3	-35/+35
\| \| \|
* \| \|	settings: add "display settings" tab, with UI-related settings.	Fabio Comuni	2012-03-30	2	-4/+24
\|/ / \| \| \| \| \| \| \| \|	Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.