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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-10-26	1	-5/+9
\|\
\| *	Fixed connection page. Page was overcrowded on systems with larger fonts.	jeroenpraat	2015-10-26	1	-5/+9
\| \|
* \|	bring back item transparency	Mario Vavti	2015-10-26	1	-0/+4
\|/
*	another try to avoid dubble photo deletion. allow to set a photo caption and ↵	Mario Vavti	2015-10-24	1	-1/+1
\| \| \| \|	simple status body (if create status post is enabled) on upload
*	move photo object stuff from itemObject to prepare_body() so we can do more ↵	Mario Vavti	2015-10-22	1	-5/+0
\| \| \| \|	stuff with it
*	css cleanup	Mario Vavti	2015-10-20	1	-4/+0
\|
*	create photo object if feature large photos is enabled and display those ↵	Mario Vavti	2015-10-20	1	-2/+6
\| \| \| \|	slightly different
*	bring back chat expiration setting and adjust chat size for our now smaller ↵	redmatrix	2015-10-17	1	-1/+1
\| \| \| \|	content region
*	we now provide images for all suffixes (0-3) -> simplify photo item body ↵	Mario Vavti	2015-10-16	1	-1/+2
\| \| \| \|	creation and provide width x height for any size
*	allow photo-items to appear full width if large photos feature is enabled. ↵	Mario Vavti	2015-10-14	1	-16/+6
\| \| \| \|	in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
*	fix an issue with collapseHeight() and css margins/paddings in directory	Mario Vavti	2015-10-11	1	-0/+3
\|
*	some conv-item restructuring to allow full width elements	Mario Vavti	2015-10-11	1	-14/+0
\|
*	private mail compositor changes	Mario Vavti	2015-10-02	1	-29/+4
\|
*	private mail template and css fixes	Mario Vavti	2015-10-02	1	-12/+13
\|
*	private mail: some work on conversations view	Mario Vavti	2015-09-25	1	-58/+12
\|
*	some heavy private mail restructuring - work in progress	Mario Vavti	2015-09-24	1	-0/+1
\|
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-18	1	-4/+7
\|\ \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	fix calculation of content height with margins	Mario Vavti	2015-09-17	1	-4/+7
\| \|
\| *	quick fix for choklet bannertwo	Mario Vavti	2015-09-14	1	-3/+5
\| \|
* \|	css fixes	Mario Vavti	2015-09-18	8	-1/+8
\| \|
* \|	quick fix for choklet bannertwo	Mario Vavti	2015-09-14	1	-3/+5
\| \|
* \|	fix banner for full flavour	Mario Vavti	2015-09-13	1	-4/+3
\| \|
* \|	hopefully fix banner for choklet flavour	Mario Vavti	2015-09-13	5	-22/+17
\| \|
* \|	an attempt to fix the banner mess	Mario Vavti	2015-09-12	1	-4/+3
\| \|
* \|	center page content by default	Mario Vavti	2015-09-11	1	-1/+0
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	1	-1/+11
\|\\|
\| *	more adjustment to apps containers	redmatrix	2015-09-02	1	-2/+3
\| \|
\| *	sort out some app display weirdness	redmatrix	2015-09-02	1	-1/+10
\| \|
\| *	increase height of app-container so edit controls aren't shadowed	redmatrix	2015-09-02	1	-1/+1
\| \|
* \|	increase width of tasklist input element	redmatrix	2015-08-22	1	-1/+5
\| \|
* \|	limit the height of tasklist	redmatrix	2015-08-20	1	-0/+8
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| *	commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵	redmatrix	2015-08-17	1	-1/+1
\| \| \| \| \| \| \| \|	checkboxes from bulk edit checkboxes in the css
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	1	-1/+6
\|\\|
\| *	issue #386 - account and channel bulk edit checkboxes not visible and ↵	redmatrix	2015-08-16	1	-1/+6
\| \| \| \| \| \| \| \|	therefore not useable. Also change wording to remove the offensive 'user' designation.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-14	1	-178/+8
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/connedit.php
\| *	cleanup connedit	Mario Vavti	2015-07-14	1	-178/+8
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-11	2	-0/+17
\|\\|
\| *	revert moving section and aside padding to style.css - it brings trouble to ↵	Mario Vavti	2015-07-11	1	-0/+14
\| \| \| \| \| \| \| \|	other layouts
\| *	add css file for mod display	Mario Vavti	2015-07-11	1	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	2	-3/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
\| *	move section and aside padding from default.css to style.css	Mario Vavti	2015-07-10	1	-2/+1
\| \|
\| *	move profile image up and refine the aside width	Mario Vavti	2015-07-09	1	-1/+1
\| \|
\| *	increase width of the aside area and make default profile image size 300x300	Mario Vavti	2015-07-09	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-07	1	-4/+0
\|\\|
\| *	various css fixes	Mario Vavti	2015-07-07	1	-4/+0
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-06	1	-0/+4
\|\\|
\| *	fix word wrapping in tagblock and dirtagblock and possibly other places	Mario Vavti	2015-07-06	1	-0/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	css fixes	Mario Vavti	2015-06-27	1	-0/+2
\| \|