15320 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Haakon Meland Eriksen	6bdde985ce	Merge remote-tracking branch 'upstream/master'	2015-11-14 08:32:37 +01:00
redmatrix	dba38821bc	superblock enhancements	2015-11-13 15:28:34 -08:00
Haakon Meland Eriksen	9d6a4c1d05	Reorder buttons HME	2015-11-13 19:44:42 +01:00
Haakon Meland Eriksen	94bef08f15	Adding original jot.tpl from GitHub	2015-11-13 18:32:25 +01:00
Haakon Meland Eriksen	0178840c19	Merge remote-tracking branch 'upstream/master'	2015-11-13 16:45:31 +01:00
Haakon Meland Eriksen	d04c73ae00	Reorder buttons	2015-11-13 16:31:48 +01:00
Haakon Meland Eriksen	495f21c08c	Reverted changes - got white screen	2015-11-13 07:36:32 +01:00
Haakon Meland Eriksen	d238cbea19	Regrouped post buttons	2015-11-13 07:03:30 +01:00
redmatrix	5d0646c9e1	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-12 20:23:17 -08:00
redmatrix	93e5449c08	really basic photo album widget for content regions	2015-11-12 20:22:36 -08:00
ken restivo	4872a30e2b	Add note about base64 and urlencode.	2015-11-12 18:02:20 -08:00
ken restivo	f5fcdf1de4	Fix spelling of documentation.	2015-11-12 17:53:26 -08:00
redmatrix	888bf76e4b	allow pdl content	2015-11-12 17:47:38 -08:00
redmatrix	22a650ade8	issue #154	2015-11-12 16:57:02 -08:00
redmatrix	391807b46c	small fixes, removed old unused database row, and log more prominently a missing directory server URL	2015-11-12 16:45:38 -08:00
Haakon Meland Eriksen	921a2e0dc4	Regrouped post buttons	2015-11-13 00:07:09 +01:00
jeroenpraat	5afe8e5aa1	Small update to Bluegrid and generic-content-wrapper-styled to dreport	2015-11-12 22:10:20 +01:00
Haakon Meland Eriksen	ba84d6ff7c	Regrouped post buttons	2015-11-12 21:11:47 +01:00
Haakon Meland Eriksen	d786502f19	Regrouped post buttons	2015-11-12 20:44:41 +01:00
Haakon Meland Eriksen	63063450b3	Merge remote-tracking branch 'upstream/master'	2015-11-12 07:46:29 +01:00
Haakon Meland Eriksen	90463ee67d	Make upload and encrypt easier on phones by editing jot.tpl	2015-11-12 07:45:37 +01:00
redmatrix	6e04dd96a1	will also need api doco	2015-11-11 20:51:15 -08:00
redmatrix	f7c837aad0	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-11 15:13:01 -08:00
redmatrix	bd3d323849	run markdown through html purifier for those who insist on mixing html with markdown.	2015-11-11 15:09:22 -08:00
Haakon Meland Eriksen	e26b558e53	Promoted upload of images and encryption	2015-11-11 23:55:05 +01:00
Haakon Meland Eriksen	85e5cd7f98	Rearranged comment buttons back	2015-11-11 23:43:41 +01:00
Haakon Meland Eriksen	1d8cac6e73	Rearranged comment buttons	2015-11-11 23:31:18 +01:00
redmatrix	52f6bd03b7	Merge pull request #149 from waitman/master ... updates to Postgres schema	2015-11-12 09:07:26 +11:00
ken restivo	75c10eaff5	Merge pull request #144 from kenrestivo/api-auth-fix ... api_auth.php must be included since the function moved.	2015-11-11 11:18:41 -08:00
Waitman Gobble	f94a8698dd	updates to Postgres schema	2015-11-11 07:42:41 -08:00
ken restivo	ffb8059c24	api_auth.php must be included since the function moved.	2015-11-11 02:26:12 -08:00
redmatrix	bc7c0ed844	Merge pull request #143 from kenrestivo/allow-importing-by-proxy ... Bust out import_account() into a separate function	2015-11-11 19:42:52 +11:00
redmatrix	ac9250fc4a	Merge pull request #141 from HaakonME/master ... Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing	2015-11-11 18:08:19 +11:00
redmatrix	f1492945ec	Merge pull request #140 from kenrestivo/move-export-to-plugin ... Moving this out into a plugin; hopefully one that will work with RM	2015-11-11 18:08:03 +11:00
ken restivo	10ccdbacba	Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user.	2015-11-10 23:07:28 -08:00
redmatrix	d683573402	Merge pull request #142 from kenrestivo/refactor-out-api-auth ... Move api_auth() out to a file that can be included from plugins/modules	2015-11-11 18:01:48 +11:00
ken restivo	ddce0412ac	Move api_auth() out to a file that can be included from plugins/modules to allow them to expose their own programmatic API.	2015-11-10 22:50:18 -08:00
Haakon Meland Eriksen	609e42cdd8	Merge remote-tracking branch 'upstream/master'	2015-11-11 07:26:15 +01:00
redmatrix	7235c20854	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-10 19:03:03 -08:00
redmatrix	e7bedf4433	do a better job of preserving linebreaks in posts for channels that use markdown	2015-11-10 19:02:28 -08:00
Haakon Meland Eriksen	23d30ab2c5	Merge remote-tracking branch 'upstream/master'	2015-11-10 23:50:54 +01:00
ken restivo	741afeea41	Moving this out into a plugin; hopefully one that will work with Redmatrix as well.	2015-11-10 14:48:50 -08:00
redmatrix	cd989977b8	Merge pull request #139 from sasiflo/master ... Replaced references to redmatrix logo.	2015-11-11 07:53:08 +11:00
sasiflo	1216508dc2	Replaced references to redmatrix logo.	2015-11-10 17:11:12 +01:00
Haakon Meland Eriksen	5c7dfcfe43	Fixed ownMapp repo address	2015-11-10 16:09:11 +01:00
Haakon Meland Eriksen	cff866172a	Fixed ownMapp repo address	2015-11-10 16:06:11 +01:00
Haakon Meland Eriksen	31a612aa89	Fixed ownMapp repo address	2015-11-10 15:58:24 +01:00
Haakon Meland Eriksen	b782c46e51	Merge remote-tracking branch 'upstream/master'	2015-11-10 07:36:51 +01:00
Haakon Meland Eriksen	eaa47760bc	Add ownMap	2015-11-10 07:35:24 +01:00
redmatrix	7ec6879887	more doco	2015-11-09 20:56:37 -08:00