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/redmatrix	redmatrix	2015-06-06	16	-797/+704
\|\ \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	missing comma	Mario Vavti	2015-06-06	1	-1/+1
\| \|
\| *	Added translatable strings to the Display Settings page and refreshed ↵	jeroenpraat	2015-06-06	3	-4618/+4478
\| \| \| \| \| \| \| \|	util/messages.po.
\| *	css fixes	Mario Vavti	2015-06-06	1	-17/+9
\| \|
\| *	whitespace	Mario Vavti	2015-06-06	1	-169/+175
\| \|
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-06	2	-175/+176
\| \|\
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-06	12	-415/+498
\| \| \|\
\| \| * \|	string/version update	redmatrix	2015-06-06	2	-175/+176
\| \| \| \|
\| * \| \|	some cleanup after scheme transition	Mario Vavti	2015-06-06	2	-196/+19
\| \| \|/ \| \|/\|
\| * \|	More schemas in new format	jeroenpraat	2015-06-05	4	-119/+114
\| \| \|
\| * \|	use the right webpage layout for an installed webpage if it exists	Mario Vavti	2015-06-04	2	-1/+3
\| \| \|
\| * \|	some doco on webpage blocks	Mario Vavti	2015-06-04	1	-2/+78
\| \| \|
\| * \|	Schemas: should be ok now.	jeroenpraat	2015-06-03	7	-342/+116
\| \| \|
\| * \|	2 more schemas in new format	jeroenpraat	2015-06-03	4	-239/+473
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	jeroenpraat	2015-06-03	2	-4/+14
\| \|\\|
\| * \|	empty php schema back	jeroenpraat	2015-06-03	1	-0/+2
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-02	10	-371/+380
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-02	5	-328/+286
\| \|\\|
\| \| *	First schema completely to the new format. git-marijus: Can you please ↵	jeroenpraat	2015-06-02	2	-123/+237
\| \| \| \| \| \| \| \| \| \| \| \|	quickly check if I'm doing it right?
\| \| *	update help link	Mario Vavti	2015-06-02	1	-1/+1
\| \| \|
\| \| *	update comanche doco	Mario Vavti	2015-06-02	2	-204/+48
\| \| \|
\| * \|	asjld work	redmatrix	2015-06-02	2	-4/+14
\| \|/
\| *	move the photo and attachment permission syncing past the tag replacement so ↵	redmatrix	2015-06-01	2	-35/+37
\| \| \| \| \| \| \| \|	that attachments get the correct permissions when private mentions are used.
\| *	error in directory bbcode image filter	redmatrix	2015-05-31	1	-1/+1
\| \|
\| *	bare bones ASLD	redmatrix	2015-05-31	2	-5/+44
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-31	14	-791/+973
\|\\|
\| *	some basic background work for activitystreams-json-ld-2.0 conversions	redmatrix	2015-05-31	3	-1/+46
\| \|
\| *	fix unable to crop profile pic on postgres	Habeas Codice	2015-05-30	1	-1/+1
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-30	9	-31/+61
\| \|\
\| \| *	should not redefine $var in the function call	Mario Vavti	2015-05-29	1	-1/+1
\| \| \|
\| \| *	fix menu render for menu item edit - menu preview	Mario Vavti	2015-05-29	1	-1/+5
\| \| \|
\| \| *	whitespace	Mario Vavti	2015-05-29	1	-1/+1
\| \| \|
\| \| *	add some yes/no labels and minor template fixes	Mario Vavti	2015-05-29	4	-9/+9
\| \| \|
\| \| *	some fixes to make menu sharing work and expose it in the ui.	Mario Vavti	2015-05-29	5	-23/+30
\| \| \|
\| \| *	show created/edited dates for menus	Mario Vavti	2015-05-29	3	-3/+22
\| \| \|
\| * \|	strip images from directory text entries	redmatrix	2015-05-30	4	-754/+820
\| \|/
\| *	there was a reason we included that file	redmatrix	2015-05-28	1	-3/+3
\| \|
\| *	parse error	redmatrix	2015-05-28	1	-2/+2
\| \|
\| *	another case of committing with unsaved changes in a second window	redmatrix	2015-05-28	1	-2/+4
\| \|
\| *	untested menu element import, be aware that the menu api does not over-write ↵	redmatrix	2015-05-28	1	-7/+46
\| \| \| \| \| \| \| \|	on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-28	10	-2505/+4071
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-28	2	-1021/+1031
\| \|\
\| \| *	Merge pull request #341 from solstag/ptbrupdate	redmatrix	2015-05-29	2	-1021/+1031
\| \| \|\ \| \| \| \| \| \| \| \|	update pt_BR translation
\| \| \| *	update pt_BR translation	Alexandre Hannud Abdo	2015-05-28	2	-1021/+1031
\| \| \|/
\| * /	add menu_created, menu_edited fields to DB	redmatrix	2015-05-28	6	-8/+65
\| \|/
\| *	catch a window that wasn't yet saved when the last checkin occurred	redmatrix	2015-05-27	1	-1/+0
\| \|
\| *	menu encoding for sharing/exchange	redmatrix	2015-05-27	2	-0/+43
\| \|
\| *	missing row in sql query which is used further down	redmatrix	2015-05-27	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-27	15	-76/+356
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/impel.php
\| *	some high-level stuff we may need for shareable menus. Also make the client ↵	redmatrix	2015-05-27	2	-68/+84
\| \| \| \| \| \| \| \|	register function do the right thing even though I refuse to make it work. If you want service federation with things like pumpio and openid connect, it's time for you to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.