546 commits

Author	SHA1	Message	Date
Andrew Manning	420aa4bc44	Merge remote-tracking branch 'upstream/dev' into website-export	2016-08-23 06:57:10 -04:00
Andrew Manning	305e0538d2	Website export to cloud files works. Created new recursive copy function in attach.php.	2016-08-23 06:55:26 -04:00
redmatrix	38ca3bac40	optional server role compatibility checks for plugins	2016-08-22 17:41:41 -07:00
redmatrix	d177cf94da	server role management, part 1	2016-08-22 16:21:07 -07:00
redmatrix	b6a545b4a2	Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev	2016-08-21 16:33:59 -07:00
redmatrix	4d34d9c032	issue #496	2016-08-21 16:26:30 -07:00
Mario Vavti	4f62d7a78f	move jotnets to jot and some cleanup (mostly whitespace)	2016-08-21 15:43:03 +02:00
Andrew Manning	1c61e316b4	Block export and re-import works. Fixed bug where layout content was not being imported properly.	2016-08-20 21:08:15 -04:00
Andrew Manning	2d42d58738	Layouts list and are selectable for export to the zip file	2016-08-20 16:05:27 -04:00
Andrew Manning	80ed05d45d	Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.	2016-08-20 15:22:30 -04:00
Andrew Manning	cf93d9c3b4	Merge remote-tracking branch 'upstream/dev' into website-export	2016-08-19 19:34:04 -04:00
Andrew Manning	40a7d38210	Pages populate the available-to-export list. New checkbox class for smaller boxes.	2016-08-19 19:32:52 -04:00
redmatrix	e4244c0cac	remove insecure repository warning.	2016-08-18 17:22:54 -07:00
Andrew Manning	f2e87a204d	Progress implementing zip file export	2016-08-17 21:25:50 -04:00
redmatrix	537401cf27	don't set session theme unless logged in.	2016-08-16 22:15:51 -07:00
redmatrix	8a89cfb158	move schema settings into the display settings main so we can set theme:schema theme selectors in settings	2016-08-15 22:45:07 -07:00
redmatrix	4facae674d	fix attached photo/file permissions on clones	2016-08-15 13:18:25 -07:00
Andrew Manning	2e7f4c1870	Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button	2016-08-14 06:41:12 -04:00
redmatrix	5365e9b3a5	string update	2016-08-12 14:45:16 -07:00
zottel	dc3cc655db	fix auto-connect setting	2016-08-12 23:27:03 +02:00
redmatrix	6bc5dd75bd	more cleanup of api	2016-08-11 19:42:44 -07:00
redmatrix	3ba4b2c1c1	A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere.	2016-08-11 17:02:52 -07:00
redmatrix	a8a3812890	optimise Onepoll so it doesn't try and fetch posts for a channel that we've not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place.	2016-08-10 20:01:52 -07:00
Mario Vavti	82e867a9a8	implement acl for folder creation	2016-08-10 16:17:09 +02: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	4f0b138692	bring back acl for cloud file uploads	2016-08-06 12:46:10 +02:00
redmatrix	9068ae68ad	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-08-05 15:40:10 -07: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
redmatrix	eeabf514ea	minor cleanup on ratings - no real functional changes at this time	2016-08-04 18:56:05 -07: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