17521 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	b587bdf863	new version	2016-08-10 16:57:14 -07:00
Mario Vavti	82e867a9a8	implement acl for folder creation	2016-08-10 16:17:09 +02:00
zottel	8706cbe1c4	Merge remote-tracking branch 'upstream/dev' into dev	2016-08-10 13:49:48 +02:00
redmatrix	7a557d31e0	open editor or comment window when linkdropping to a closed window. We probably also need this for filedropping.	2016-08-10 01:35:58 -07:00
redmatrix	de12503fad	allow dropping links on comments as well as posts	2016-08-09 22:52:14 -07:00
redmatrix	5238a27ab3	function order reversed	2016-08-09 20:50:33 -07:00
redmatrix	12162f53b4	You can drag links to the editor (which will be parsed and inserted); as well as files (which will be uploaded)	2016-08-09 18:13:54 -07:00
redmatrix	ec3ca11d0d	bad code format	2016-08-09 16:59:35 -07:00
redmatrix	07dca90352	updates to hcard parsing	2016-08-07 21:00:23 -07:00
redmatrix	3338f3c5b2	diaspora vcard updates	2016-08-07 20:16:14 -07:00
redmatrix	de455e4cd0	server roles	2016-08-07 17:40:56 -07:00
redmatrix	5243dd153b	use config system.server_role and deprecate 'UNO'	2016-08-07 17:29:35 -07:00
redmatrix	e1659b0725	fix cloud path	2016-08-07 16:21:51 -07:00
Mario Vavti	89c026924b	fix /cloud upload for images	2016-08-06 14:40:23 +02:00
Mario Vavti	4f0b138692	bring back acl for cloud file uploads	2016-08-06 12:46:10 +02:00
redmatrix	b6db0f72f5	strings update	2016-08-05 15:40:20 -07:00
redmatrix	9068ae68ad	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-08-05 15:40:10 -07:00
hubzilla	1bff63bd2e	Merge pull request #477 from git-marijus/dev ... Some work to make multiple acl forms per page work	2016-08-06 07:50:21 +10:00
Mario Vavti	531baa8fc4	Revert "Revert "remove some logging"" ... This reverts commit e67f5bc6bb.	2016-08-05 16:05:21 +02:00
Mario Vavti	e67f5bc6bb	Revert "remove some logging" ... This reverts commit 316b090433.	2016-08-05 15:19:17 +02:00
Mario Vavti	316b090433	remove some logging	2016-08-05 14:53:46 +02:00
Mario Vavti	b2298d44a4	multi acl: port /settings	2016-08-05 14:45:06 +02:00
Mario Vavti	c029839971	multi acl: port /display	2016-08-05 14:25:37 +02:00
Mario Vavti	e7e73e6fd1	multi acl: port /thing	2016-08-05 13:37:47 +02:00
Mario Vavti	bed0a5773f	multi acl: port /rpost	2016-08-05 13:20:03 +02:00
Mario Vavti	53a2262fef	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-08-05 12:13:50 +02:00
hubzilla	709206accd	Merge pull request #476 from anaqreon/wiki ... Wiki bbcode parsing	2016-08-05 18:03:31 +10:00
zottel	6ba142fd33	Merge remote-tracking branch 'upstream/dev' into dev	2016-08-05 09:17:00 +02:00
redmatrix	eeabf514ea	minor cleanup on ratings - no real functional changes at this time	2016-08-04 18:56:05 -07:00
Andrew Manning	faf1045ef5	Merge remote-tracking branch 'upstream/dev' into wiki	2016-08-04 19:48:59 -04:00
Andrew Manning	6a82ff871f	Parse bbcode when page loads	2016-08-04 19:45:35 -04:00
Mario Vavti	7e5428c697	multi acl: provide a acl-form-trigger class which comes handy in certain situations	2016-08-04 21:26:30 +02:00
Mario Vavti	036b72757c	multi acl: port /wiki	2016-08-04 12:09:06 +02:00
Mario Vavti	120e9a1e4c	multi acl: port /webpages and /mitem	2016-08-04 11:23:43 +02:00
Mario Vavti	b49cfb2efd	multi acl: port /chat	2016-08-04 10:46:50 +02:00
Mario Vavti	0340160ba7	multi acl: port /cloud and /filestorage	2016-08-04 10:36:45 +02:00
Mario Vavti	4ede3fd771	multi acl: port photos	2016-08-04 09:10:21 +02:00
Mario Vavti	3783c1af3e	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-08-04 08:10:13 +02:00
redmatrix	92862f93f3	issue #474	2016-08-03 21:42:41 -07:00
Andrew Manning	05a9f0aa14	Convert select bbcode tags including [observer], [baseurl], [sitename]	2016-08-03 20:53:51 -04:00
redmatrix	64810405ef	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-08-03 16:12:17 -07:00
redmatrix	178c983871	issue #473 - unable to delete privacy groups	2016-08-03 16:10:28 -07:00
Mario Vavti	908e15bc90	multi acl: port events	2016-08-03 23:57:41 +02:00
Mario Vavti	df27a48e72	multiple acl: store new data in update_view()	2016-08-03 22:50:37 +02:00
Mario Vavti	b959641ca8	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-08-03 21:17:08 +02:00
Mario Vavti	c50bfa07ca	multiple acl work	2016-08-03 21:16:57 +02:00
jeroenpraat	416adeb169	belongs to previous commit	2016-08-03 16:41:36 +02:00
jeroenpraat	61f591cc88	Improved a few schemas - context help fix - dark schemas now have dark text areas (et al.)	2016-08-03 16:33:12 +02:00
redmatrix	0febfce268	missing comma in atoken update sql	2016-08-02 19:31:31 -07:00
redmatrix	c4fd0af16d	comment policy permissions typo	2016-08-02 18:21:43 -07:00