516 commits

Author	SHA1	Message	Date
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
Andrew Manning	6a82ff871f	Parse bbcode when page loads	2016-08-04 19:45:35 -04: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
Andrew Manning	05a9f0aa14	Convert select bbcode tags including [observer], [baseurl], [sitename]	2016-08-03 20:53:51 -04: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	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
redmatrix	0febfce268	missing comma in atoken update sql	2016-08-02 19:31:31 -07:00
redmatrix	69354e808f	this should sort out likes showing up as wall-to-wall posts on diaspora	2016-08-01 22:12:44 -07:00
redmatrix	3a7d3e3a54	This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.	2016-08-01 20:12:52 -07:00
redmatrix	4c76b31684	/storeurl/cloudurl/	2016-08-01 17:44:21 -07:00
redmatrix	3d0c90cbc5	allow individual permissions on atokens	2016-07-31 23:17:07 -07:00
redmatrix	9b9621e10d	add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)	2016-07-31 20:14:25 -07:00
Andrew Manning	42b718b3e0	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-31 07:38:44 -04:00
Andrew Manning	7c47557554	Improved UI. Removed logger statements.	2016-07-31 07:30:25 -04:00
Andrew Manning	32366284a8	Import element selection page added to allow selective importing.	2016-07-30 09:56:47 -04:00
Andrew Manning	f17f51a9c1	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-30 06:30:46 -04:00
redmatrix	4ce8f965aa	issue #466, sql typo	2016-07-28 13:10:19 -07:00
redmatrix	02fc082e45	github didn't accept the last push. Touching the files to force a git revision	2016-07-27 22:40:33 -07:00
redmatrix	be1ffca6f4	fix italian strings (messed up by rtl variable); and finish removing openid from core	2016-07-27 22:28:30 -07:00
redmatrix	5f3a8cbe93	add the hidden flag also	2016-07-27 16:14:46 -07:00
Mario Vavti	f808f1601b	rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism	2016-07-27 16:49:55 +02:00
redmatrix	672c3d7c6d	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-07-26 22:51:07 -07:00
redmatrix	72479041ae	don't include deleted or orphaned xchans in ratings search	2016-07-26 22:50:31 -07:00
hubzilla	e286b510f1	Merge pull request #463 from git-marijus/dev ... allow multiple-file cloud upload	2016-07-27 14:54:51 +10:00
redmatrix	315dafbe12	restrict url cache to 254 maxlen	2016-07-26 20:05:40 -07:00
redmatrix	80e4338314	missing s	2016-07-26 19:28:28 -07:00
redmatrix	db176eec40	set App::$error on 404 so we don't get two 'Page not found.' page bodies.	2016-07-26 17:24:17 -07:00
Mario Vavti	560af7a5b8	allow multiple-file cloud upload	2016-07-26 13:17:46 +02:00
Mario Vavti	6900dd34a4	URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav clients	2016-07-26 09:04:52 +02:00
redmatrix	5d4245ff01	move openid to addon	2016-07-25 17:16:41 -07:00
redmatrix	01338a7610	make drag/drop work with acl, which bypassed the form	2016-07-24 22:58:26 -07:00
redmatrix	063b4286e7	trace log pconfig cache if for some reason it isn't an array	2016-07-24 22:36:37 -07:00
redmatrix	271f85be3b	add acl selection to files upload via /cloud (still missing from directory creation)	2016-07-24 20:27:59 -07:00
redmatrix	b5f2b4af35	string update and some minor comment edits	2016-07-24 16:11:34 -07:00
Andrew Manning	6998bb1f23	Multiple file upload by drag and drop with progress indicators and auto page reload	2016-07-24 07:41:53 -04:00
redmatrix	7d897a3f03	more work on #453	2016-07-21 23:06:55 -07:00
redmatrix	0c3d5e99a2	PConfig : Check for is_null($uid) as well as false. We actually allow $uid = 0 though it shouldn't normally happen.	2016-07-21 20:50:39 -07:00
Andrew Manning	5a63ddd645	Merge remote-tracking branch 'upstream/dev' into website-import	2016-07-21 21:14:54 -04:00
Mario Vavti	b63aff77df	merge 1.10RC into dev	2016-07-22 01:13:56 +02:00
Mario Vavti	5a1eb65ed6	missing $	2016-07-22 01:07:53 +02:00