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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Adding original jot.tpl from GitHub	Haakon Meland Eriksen	2015-11-13	1	-49/+54
\|
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-13	16	-10/+132
\|\
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-12	3	-4/+4
\| \|\
\| \| *	Add note about base64 and urlencode.	ken restivo	2015-11-12	1	-2/+2
\| \| \|
\| \| *	Fix spelling of documentation.	ken restivo	2015-11-12	2	-2/+2
\| \| \|
\| * \|	really basic photo album widget for content regions	redmatrix	2015-11-12	3	-0/+87
\| \|/
\| *	allow pdl content	redmatrix	2015-11-12	4	-1/+23
\| \|
\| *	issue #154	redmatrix	2015-11-12	1	-0/+11
\| \|
\| *	small fixes, removed old unused database row, and log more prominently a ↵	redmatrix	2015-11-12	3	-2/+3
\| \| \| \| \| \| \| \|	missing directory server URL
\| *	Small update to Bluegrid and generic-content-wrapper-styled to dreport	jeroenpraat	2015-11-12	2	-3/+4
\| \|
* \|	Reorder buttons	Haakon Meland Eriksen	2015-11-13	1	-53/+48
\| \|
* \|	Reverted changes - got white screen	Haakon Meland Eriksen	2015-11-13	1	-47/+52
\| \|
* \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-13	1	-7/+8
\| \|
* \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-13	1	-3/+0
\| \|
* \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-12	1	-21/+12
\| \|
* \|	Regrouped post buttons	Haakon Meland Eriksen	2015-11-12	1	-31/+29
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-12	5	-10/+34
\|\\|
\| *	will also need api doco	redmatrix	2015-11-11	2	-1/+24
\| \|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-11	1	-7/+7
\| \|\
\| \| *	Merge pull request #149 from waitman/master	redmatrix	2015-11-12	1	-7/+7
\| \| \|\ \| \| \| \| \| \| \| \|	updates to Postgres schema
\| \| \| *	updates to Postgres schema	Waitman Gobble	2015-11-11	1	-7/+7
\| \| \| \|
\| * \| \|	run markdown through html purifier for those who insist on mixing html with ↵	redmatrix	2015-11-11	2	-2/+3
\| \|/ / \| \| \| \| \| \| \| \| \|	markdown.
* \| \|	Make upload and encrypt easier on phones by editing jot.tpl	Haakon Meland Eriksen	2015-11-12	1	-13/+11
\| \| \|
* \| \|	Promoted upload of images and encryption	Haakon Meland Eriksen	2015-11-11	1	-0/+10
\| \| \|
* \| \|	Rearranged comment buttons back	Haakon Meland Eriksen	2015-11-11	1	-13/+10
\| \| \|
* \| \|	Rearranged comment buttons	Haakon Meland Eriksen	2015-11-11	1	-10/+13
\|/ /
* \|	Merge pull request #144 from kenrestivo/api-auth-fix	ken restivo	2015-11-11	1	-0/+1
\|\ \ \| \|/ \|/\|	api_auth.php must be included since the function moved.
\| *	api_auth.php must be included since the function moved.	ken restivo	2015-11-11	1	-0/+1
\| \|
* \|	Merge pull request #143 from kenrestivo/allow-importing-by-proxy	redmatrix	2015-11-11	1	-3/+13
\|\ \ \| \| \| \| \| \|	Bust out import_account() into a separate function
\| * \|	Bust out import_account() into a separate function to allow importing ↵	ken restivo	2015-11-10	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \|	accounts by proxy, i.e. for admins to import a channel on behalf of a user.
* \| \|	Merge pull request #141 from HaakonME/master	redmatrix	2015-11-11	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \|	Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing
\| * \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-11	2	-2/+2
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-10	2	-2/+2
\| \|\ \ \ \
\| * \| \| \| \|	Fixed ownMapp repo address	Haakon Meland Eriksen	2015-11-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed ownMapp repo address	Haakon Meland Eriksen	2015-11-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed ownMapp repo address	Haakon Meland Eriksen	2015-11-10	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-10	39	-1956/+2223
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Add ownMap	Haakon Meland Eriksen	2015-11-10	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #140 from kenrestivo/move-export-to-plugin	redmatrix	2015-11-11	1	-89/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Moving this out into a plugin; hopefully one that will work with RM
\| * \| \| \| \| \|	Moving this out into a plugin; hopefully one that will work with Redmatrix ↵	ken restivo	2015-11-10	1	-89/+0
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as well.
* \| \| \| \| \|	Merge pull request #142 from kenrestivo/refactor-out-api-auth	redmatrix	2015-11-11	3	-90/+96
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Move api_auth() out to a file that can be included from plugins/modules
\| * \| \| \| \|	Move api_auth() out to a file that can be included from plugins/modules to ↵	ken restivo	2015-11-10	3	-90/+96
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allow them to expose their own programmatic API.
* \| \| \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge0.11	redmatrix	2015-11-10	2	-2/+2
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #139 from sasiflo/master	redmatrix	2015-11-11	2	-2/+2
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Replaced references to redmatrix logo.
\| \| * \| \|	Replaced references to redmatrix logo.	sasiflo	2015-11-10	2	-2/+2
\| \|/ / /
* / / /	do a better job of preserving linebreaks in posts for channels that use markdown	redmatrix	2015-11-10	2	-2/+2
\|/ / /
* \| \|	more doco	redmatrix	2015-11-09	2	-0/+24
\| \| \|
* \| \|	remove the obsolete avatar_img function (gravatar/libravatar lookup)	redmatrix	2015-11-09	3	-26/+0
\| \| \|
* \| \|	get rid of the pre-comanche widget placement and wgl code	redmatrix	2015-11-09	4	-48/+0
\| \| \|
* \| \|	more doco	redmatrix	2015-11-09	7	-4/+41
\| \| \|