19835 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	0e3b5536e2	create cdav principal also on client access and remove redundant pconfig check in authentication process	2017-08-10 21:58:44 +02:00
zotlabs	6c55e44f4c	when following, allow [network]follow_address syntax to connect with a specific network for multi-protocol services	2017-08-10 12:49:20 -07:00
git-marijus	5b88e9574f	update changelog	2017-08-10 11:59:12 +02:00
git-marijus	9411732c1b	do not show channel manager and nav channel select if we are in a delegate session	2017-08-10 11:41:00 +02:00
git-marijus	d1c7e78990	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-10 09:40:02 +02:00
Mario Vavti	0a96cdd950	merge red/master into dev	2017-08-10 08:09:02 +02:00
zotlabs	5686901869	some doco fixes and other real minor stuff to improve logreading ability	2017-08-09 22:45:52 -07:00
zotlabs	6531cbd1d2	libxml errors	2017-08-09 17:35:03 -07:00
git-marijus	09da109eba	update changelog	2017-08-09 20:45:59 +02:00
git-marijus	8ab3a4ebd7	App::get_channel() does not return the right channel if we are not looking at our own channel. fix issue #841	2017-08-09 20:39:59 +02:00
zotlabs	8eb6dafe31	only show upload button to those with write_storage permission	2017-08-08 23:12:08 -07:00
zotlabs	ca11d7b9a7	support upload of files and attachments into comments. This has some repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing.	2017-08-08 22:55:47 -07:00
zotlabs	a7a73a5150	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-08-08 17:53:53 -07:00
git-marijus	83b5bbfeea	changelog	2017-08-08 23:20:20 +02:00
zotlabs	59108b18ae	remove some no longer used images/icons	2017-08-07 18:19:02 -07:00
zotlabs	c00796d553	ostatus feed was missing comments	2017-08-06 19:33:51 -07:00
git-marijus	88a4889780	Merge pull request #838 from phellmes/dev ... Update DE translation strings (also for 2.6RC)	2017-08-06 23:40:14 +02:00
git-marijus	3c73228d80	Merge pull request #839 from anaqreon/doco ... Fix CSS for help page content list in sidebar.	2017-08-06 23:39:03 +02:00
git-marijus	1c0c01ccfe	make config requirements in apps more universal - provide key and value	2017-08-06 23:20:24 +02:00
git-marijus	b0d1fa09c1	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-06 21:41:01 +02:00
git-marijus	68b32cd8f4	consolidate disable_discover_tab config if it was not yet set to either 1 or 0 in DB	2017-08-06 21:40:39 +02:00
phellmes	d5dcaacf2c	Update DE translation strings	2017-08-05 14:32:44 +02:00
Andrew Manning	03ca0bfa69	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into doco	2017-08-05 11:24:03 +00:00
zotlabs	3aa22c29fd	allow channel address to be changed	2017-08-04 19:02:41 -07:00
zotlabs	06a211704f	auto preview mail on media insertion also	2017-08-03 18:28:08 -07:00
git-marijus	a618f70f56	Merge remote-tracking branch 'mike/master' into dev	2017-08-03 21:59:46 +02:00
git-marijus	9566eab934	missing observer hash	2017-08-03 21:36:26 +02:00
git-marijus	3c1dff3039	fix issue #836 - missing opening form tag	2017-08-03 20:35:42 +02:00
git-marijus	7b177be271	fix attachment upload for private mail	2017-08-03 15:30:40 +02:00
git-marijus	dc7c3f70eb	return preview also if we have no attachment	2017-08-03 14:08:34 +02:00
zotlabs	d06ce6294d	some bb-to-markdown issues	2017-08-03 04:55:56 -07:00
zotlabs	21ee29e46d	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-08-02 22:12:38 -07:00
zotlabs	bee09a6d8b	minor activitypub rendering stuff	2017-08-02 22:11:46 -07:00
www-data	ba62f14482	Fix CSS for help page content list in sidebar.	2017-08-03 01:54:14 +00:00
git-marijus	4ea4a036ef	Merge pull request #834 from mjfriaza/dev ... Updated the Spanish translation	2017-08-02 12:17:07 +02:00
Manuel Jiménez Friaza	2dbf8a5e00	Updated the Spanish translation	2017-08-02 08:57:30 +02:00
zotlabs	9359f9fe4d	plugin hook for update_unseen	2017-08-01 22:25:55 -07:00
zotlabs	01526a9a79	add auto post preview to 'select photo from albums'	2017-08-01 19:02:42 -07:00
zotlabs	01fc590938	auto preview comments also on media/link add	2017-08-01 18:58:06 -07:00
zotlabs	6e9fb9b9fd	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-08-01 18:20:34 -07:00
zotlabs	a97b09210e	auto preview when inserting a media item or embed into a post. Since this unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two.	2017-08-01 18:05:04 -07:00
git-marijus	6614d465d6	css fix	2017-08-02 00:28:05 +02:00
git-marijus	2ba2187c2e	do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_type	2017-08-01 23:45:41 +02:00
git-marijus	599b395e24	finally fix recursive attachments permissions	2017-08-01 23:20:39 +02:00
git-marijus	aa766b53d6	use small line-height only for larger screens	2017-08-01 18:03:53 +02:00
Mario Vavti	cf437c6a33	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-01 14:26:17 +02:00
Mario Vavti	8b6a24c67d	remove blugrid schema until somebody cares to fix it	2017-08-01 14:25:59 +02:00
Mario Vavti	46d8cf3f94	strings	2017-08-01 12:32:50 +02:00
Mario Vavti	a510c91d48	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-01 11:41:25 +02:00
Mario Vavti	2f8c5cf7d0	Merge remote-tracking branch 'mike/master' into dev	2017-08-01 03:59:32 +02:00