20106 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	fa93114804	some basic work on mod common	2017-10-03 11:37:45 +02:00
Mario Vavti	66511d8f07	move common connections widget to left aside	2017-10-03 10:53:08 +02:00
Mario Vavti	f52e5d90b0	Merge remote-tracking branch 'mike/master' into dev	2017-10-03 09:40:51 +02:00
zotlabs	f571b753b6	import: special handling required for channel photo in the xchan record when not seizing 'primary'	2017-10-02 20:27:04 -07:00
zotlabs	40e747ecde	remove server role selection details from install documentation, no longer needed	2017-10-02 18:46:24 -07:00
zotlabs	9e24b28376	Hubzilla issue #866 allow navbar to be used when cover photo is displayed - also scroll cover photo on keyup event.	2017-10-02 17:57:46 -07:00
zotlabs	5abdee73ee	Clone sync deletions to comments (which belong to you) on wall posts (which do not).	2017-10-02 16:26:33 -07:00
Mario Vavti	c200808fbb	fix community tags not preserved on post edit. issue #865	2017-10-02 12:54:25 +02:00
Mario Vavti	1f8b705a6a	whitespace	2017-10-02 12:16:53 +02:00
Mario Vavti	a3c2ef4084	wiki: show save button and commit input field in all tabs if there is unsaved content. fix #853	2017-10-02 12:11:52 +02:00
zotlabs	9dcbef4cb1	profile photo propagation issue if the local xchan_photo_[l|m|s] fields were changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation.	2017-10-01 18:22:55 -07:00
zotlabs	8bd4e004ff	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-10-01 17:05:20 -07:00
git-marijus	f70d27b793	Merge pull request #863 from mjfriaza/dev ... Fixed some errors in the Spanish translation	2017-10-01 22:49:41 +02:00
Mario Vavti	7c845aafa2	card_edit: fix lockstate and current permissions not handed over to editor	2017-10-01 22:46:35 +02:00
Manuel Jiménez Friaza	16b57a2b28	Fixed the Spanish translation	2017-10-01 13:12:09 +02:00
Mario Vavti	89457c8390	fix profile edit dropdown for multiple profiles	2017-10-01 10:24:33 +02:00
zotlabs	ea4d1b5101	use imagick converter for large photos	2017-09-30 15:17:47 -07:00
Andrew Manning	dd38fad9ee	Update administrator_guide.md	2017-09-30 09:44:40 -04:00
Mario Vavti	bdecb61bfa	remove double remote login button and slightly change appearence	2017-09-28 11:31:36 +02:00
git-marijus	c9231785ab	Merge pull request #860 from waitman/patch-2 ... add remote login to login form	2017-09-28 11:02:23 +02:00
git-marijus	f79d5ec18e	Merge pull request #861 from waitman/patch-3 ... add remote login to login.tpl	2017-09-28 11:01:46 +02:00
git-marijus	98e0534984	Merge pull request #862 from waitman/patch-4 ... prevent 'my_address' being set with bogus info	2017-09-28 11:01:01 +02:00
zotlabs	617f2863c4	process activity deletes from OStatus which for whatever reason do not use the industry standard tombstone mechanism	2017-09-27 21:13:53 -07:00
Mario Vavti	1fd2b6f5b6	re-arrange some html	2017-09-27 16:06:15 +02:00
Mario Vavti	7d386c2777	make justifiedGallery even more happy	2017-09-27 16:04:21 +02:00
Mario Vavti	fb60eeaa9a	make justifiedGallery happy again	2017-09-27 15:48:13 +02:00
Mario Vavti	9625d940a5	do not use our spinner css on the justifiedGallery spinner which has the same classname hardcoded	2017-09-27 13:21:27 +02:00
Mario Vavti	b8a0bc0b0b	fix some missing spinners	2017-09-27 12:06:06 +02:00
Mario Vavti	cee41bb1e5	Merge remote-tracking branch 'mike/master' into dev	2017-09-26 19:55:18 +02:00
Mario Vavti	4a270d10d1	bump version	2017-09-26 13:50:29 +02:00
Mario Vavti	ea5262a0df	get rid of spinner.js in use a lightweight css spinner instead	2017-09-26 13:02:11 +02:00
zotlabs	86e888e5eb	whitespace	2017-09-25 23:39:48 -07:00
zotlabs	9d7a88b40d	move the Link header initialisation from Router (where it does not really belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch()	2017-09-25 23:14:02 -07:00
zotlabs	be8061b64b	typo	2017-09-25 20:12:43 -07:00
zotlabs	d91a82430a	more zot6 basic stuff	2017-09-25 20:11:21 -07:00
zotlabs	66334374af	zot_site_info - always sign the site block with the site private key	2017-09-25 17:30:33 -07:00
zotlabs	741af8c164	extend activity_match to work with arrays	2017-09-24 22:41:14 -07:00
zotlabs	137f5b3dbc	doc page for the new channel_links hook	2017-09-24 21:26:12 -07:00
zotlabs	e1cd51d8d9	update the trusted CA cert database	2017-09-24 21:24:52 -07:00
zotlabs	237aca32e3	missing Zlib file	2017-09-24 21:21:49 -07:00
zotlabs	906a810735	server/hub config storage for zot6	2017-09-24 21:20:50 -07:00
zotlabs	808605cd65	ostatus - support likes of comments	2017-09-24 21:09:21 -07:00
zotlabs	06a674775e	handle jsonld parse errors and send them to the app log instead of the php log.	2017-09-24 20:18:36 -07:00
zotlabs	b195407028	Merge branch 'tagging'	2017-09-24 19:50:55 -07:00
zotlabs	1650d79862	tagging changes - provides ability to mention a forum by using !forumname as well as the traditional red style (@forumname+). This should probably not be advertised on a wide scale until after a critical mass of sites have updated to a version containing these changes. This adds yet another option type to the ACL module which probably needs refactoring soon since it is turning into option type spaghetti.	2017-09-24 19:45:19 -07:00
zotlabs	e8a888caab	typo	2017-09-24 17:09:25 -07:00
zotlabs	3648f9952c	typo	2017-09-24 17:08:38 -07:00
zotlabs	8b7ab90836	Merge branch 'master' into tagging	2017-09-24 16:59:56 -07:00
zotlabs	866dc9a9b3	For zot6, allow HTTP Signatures to be encrypted, as they may contain sensitive (envelope, metadata) information.	2017-09-24 16:46:52 -07:00
Mario Vavti	2988e33b57	fix missing content on channel page	2017-09-23 23:16:11 +02:00