20289 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	11cdc36bcc	Merge remote-tracking branch 'mike/master' into dev	2017-11-01 12:08:59 +01:00
zotlabs	22d45a8d1e	support for netselect query	2017-11-01 02:53:12 -07:00
zotlabs	7d9d1e0cdb	Maria's profile photo issue, please push to master.	2017-11-01 02:15:40 -07:00
zotlabs	98b53801e0	provide personal config for channel_menu; the site can set an initial site-wide value but this but there isn't a corresponding admin setting currently and can only be set by manual config	2017-10-31 19:56:14 -07:00
zotlabs	bff1e215cc	pdledit - show original/system layout text for comparison	2017-10-31 18:04:01 -07:00
zotlabs	6efef3922b	add another delivery control parameter (force queue threshold)	2017-10-31 15:41:44 -07:00
zotlabs	caec565de5	bring back sitesearch widget in mod_search because some screen modes don't have search in the navbar and there is no other way to enter text - hubzilla issue #898	2017-10-31 12:18:16 -07:00
zotlabs	16a2bfa95b	move tile styles to theme instead of template file	2017-10-30 21:00:17 -07:00
zotlabs	60da235efb	use 1) personal setting, 2) site setting, 3) default false - for system.channel_menu	2017-10-30 20:43:24 -07:00
zotlabs	71e0e55b0b	provide a 'tile' view (view only) mode to mod_cloud	2017-10-30 18:49:18 -07:00
Mario Vavti	b28ff509b1	Merge remote-tracking branch 'mike/master' into dev	2017-10-30 10:42:51 +01:00
git-marijus	1f47f4ff96	Merge pull request #897 from HaakonME/dev ... Added mode to Portfolio widget	2017-10-30 10:38:17 +01:00
zotlabs	4fef29e61c	memory overflow trying to delete a connection with a very high noise to signal ratio	2017-10-29 22:21:52 -07:00
zotlabs	56c3d5dbcb	add some documentation about shareable widgets	2017-10-29 22:00:03 -07:00
zotlabs	ceed0f7a1b	allow plugin class widgets, fix sql error in page module	2017-10-29 19:52:00 -07:00
zotlabs	906d91d4d1	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-10-29 16:35:31 -07:00
Haakon Meland Eriksen	1dc3253d4a	Added mode to Portfolio widget	2017-10-29 16:41:49 +01:00
Haakon Meland Eriksen	feebe7d4c6	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-29 13:24:41 +01:00
git-marijus	9ce817bb6e	Merge pull request #894 from mjfriaza/dev ... Spanish translation revised again.	2017-10-29 11:50:20 +01:00
zotlabs	fe2a937cf2	fix "unstar"	2017-10-28 15:24:37 -07:00
Manuel Jiménez Friaza	1cf90dd14d	Spanish translation revised again.	2017-10-28 12:54:57 +02:00
zotlabs	6823f0aa52	1/2 of hubzilla issue #893	2017-10-26 22:45:54 -07:00
Haakon Meland Eriksen	f2efa8c753	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-27 05:58:10 +02:00
zotlabs	e5cfb8a0cd	encrypt the owa token	2017-10-26 15:23:04 -07:00
zotlabs	4a3149d1ba	hubzilla issue #890, separate the pdl preview feature from the mod_page webpage query so that the webpage will always win if a webpage and pdl have the same name.	2017-10-25 22:33:03 -07:00
zotlabs	dafe0a5547	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-10-25 16:55:18 -07:00
git-marijus	859195d07a	Merge pull request #888 from anaqreon/card-context ... Context help for cards	2017-10-25 13:33:58 +02:00
Andrew Manning	a782c9944c	Context help for cards	2017-10-24 21:41:49 -04:00
Haakon Meland Eriksen	39055c919c	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-24 20:44:25 +02:00
Mario Vavti	325cbfcdb3	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-24 18:30:00 +02:00
git-marijus	69e7a7594a	Merge pull request #884 from dawnbreak/dev ... Update composer autoload cache.	2017-10-24 18:28:42 +02:00
git-marijus	c489f734db	Merge pull request #882 from HaakonME/dev ... Portfolio widget - CSS update	2017-10-24 18:22:35 +02:00
Mario Vavti	60a54e9aac	comment out statistics link in mod pubsites until we have something functional again	2017-10-24 18:21:19 +02:00
Haakon Meland Eriksen	280baf7c82	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-24 17:56:20 +02:00
zotlabs	59a9f6bf02	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-10-23 22:29:29 -07:00
zotlabs	2aff3a1a05	not sure when but the hcard went missing in webfinger	2017-10-23 21:19:40 -07:00
zotlabs	25988ddefa	not sure when but the hcard went missing in webfinger	2017-10-23 21:03:18 -07:00
Haakon Meland Eriksen	c99962106d	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-24 06:03:09 +02:00
zotlabs	52c1f79f2e	acl encoding issues	2017-10-23 17:52:17 -07:00
zotlabs	e67ff5c122	hubzilla issue #885	2017-10-23 12:35:46 -07:00
zotlabs	37b7b2f1a8	mod_display: provide alternate serialisations (starting with atom)	2017-10-22 21:44:39 -07:00
zotlabs	fd5764e166	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-10-22 19:32:31 -07:00
zotlabs	c49eec71f0	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-10-22 19:32:08 -07:00
zotlabs	812d904c98	bring back the markdown post feature (after investing some effort to make it work)	2017-10-22 18:23:37 -07:00
Klaus Weidenbach	a4fdf3fbbb	We call Theme:url() statically, make it also static.	2017-10-23 01:34:37 +02:00
Klaus Weidenbach	9090bfd1c3	Update composer autoload cache.	2017-10-23 01:10:53 +02:00
Mario Vavti	b58bf75f21	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-10-22 21:44:37 +02:00
Mario Vavti	189a15fe37	Merge remote-tracking branch 'mike/master' into dev	2017-10-22 21:44:20 +02:00
zotlabs	c7d9a5ac91	wrong key	2017-10-22 12:35:17 -07:00
git-marijus	8aa4af372d	Merge pull request #880 from mjfriaza/dev ... Updated the Spanish translation	2017-10-22 21:14:03 +02:00