6059 Commits

Author	SHA1	Message	Date
Andrew Manning	ad5c93d673	Merge remote-tracking branch 'upstream/dev' into website-export	2016-08-30 06:14:22 -04:00
redmatrix	8b6230726f	add authors to post distribution; case insensitive sort apps	2016-08-29 18:06:39 -07:00
Andrew Manning	07e28a9757	Display text around the searched query in documentation search	2016-08-27 21:26:16 -04:00
Andrew Manning	69ca279101	Merge remote-tracking branch 'upstream/dev' into website-export	2016-08-27 14:14:28 -04:00
redmatrix	40b2e24c6d	vsprintf error on sql query	2016-08-27 05:06:12 -07:00
Andrew Manning	ddfc5209d3	Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.	2016-08-27 06:52:01 -04:00
redmatrix	aea2fa1629	issue #186 ...different check for pubforum with expert permissions	2016-08-26 16:02:04 -07:00
redmatrix	8a2b96c2f9	- implemented but untested: duplicate detection for photo 'move to another folder' ... - weekly string update	2016-08-26 01:37:46 -07:00
redmatrix	38ea8bee93	ratings are gone. They can be enabled, but there is no UI for doing so at this time; and will likely only be available in a 'pro' configuration once the new implementation details have been hashed out. This appears to require a mechanism for rebuttal before it can again be opened to the public. There are also some synchronisation issues to contend with; as ratings are currently only distributed to active directory servers. There is no reliable mechanism for a new directory server to fetch existing ratings.	2016-08-25 17:43:07 -07:00
redmatrix	a969f18137	move premium channel to 'pro' since that's the only configuration where it works reliably.	2016-08-25 17:09:19 -07:00
redmatrix	8d94402d25	attach_move() function created to relocate files or photos to different directories in the cloud area and photo albums without deleting and recreating (which would create a new resource_id and invalidate any existing links).	2016-08-24 22:41:54 -07:00
redmatrix	d3369384d1	include port in pdo url when host is 'localhost'	2016-08-23 18:18:05 -07:00
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	e967bc9c45	public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms	2016-08-22 17:04:13 -07:00
redmatrix	7045b920ef	make zid() do the right things when confronted with url fragments	2016-08-21 17:38:36 -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
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
redmatrix	9fe4bae52f	block backdoor delivery of bulk imported items	2016-08-19 17:12:48 -07: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	fa98f4c55d	import anomaly	2016-08-17 19:44:24 -07:00
Andrew Manning	f2e87a204d	Progress implementing zip file export	2016-08-17 21:25:50 -04:00
Andrew Manning	c98b91f514	Stash changes for merge with dev	2016-08-17 18:19:36 -04:00
redmatrix	537401cf27	don't set session theme unless logged in.	2016-08-16 22:15:51 -07:00
redmatrix	b2eede891a	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-08-16 19:01:20 -07:00
redmatrix	a2873c18ca	get rid of ugly code construct	2016-08-16 19:00:38 -07:00
Mario Vavti	291b0edbe0	rename limited -> custom	2016-08-16 08:05:46 +02:00
hubzilla	752bb169ed	Merge pull request #487 from git-marijus/dev ... implement groups in the acl select.	2016-08-16 06:59:52 +10:00
Mario Vavti	4b101c2240	provide group options serverside and minor cleanup	2016-08-15 22:54:07 +02:00
redmatrix	4facae674d	fix attached photo/file permissions on clones	2016-08-15 13:18:25 -07:00
redmatrix	000861da0d	event_store_event hook	2016-08-14 18:22:18 -07:00
Andrew Manning	6868403383	Context help for settings/features page	2016-08-14 13:34:52 -04:00
Andrew Manning	229cc2ac43	Change text for submenu on small screens to be static toggle statement	2016-08-14 06:55:02 -04:00
Andrew Manning	cb9ac6dd34	Replace hardcoded button title in javascript to translatable text	2016-08-14 06:46:48 -04: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	165f442d70	pending flag not being reset when using autoperms from custom role	2016-08-12 18:17:39 -07:00
redmatrix	ebbe18a426	better method of dealing with api versions	2016-08-11 20:09:38 -07:00
redmatrix	6bc5dd75bd	more cleanup of api	2016-08-11 19:42:44 -07:00
redmatrix	0257d660ad	move error processing back inside the function	2016-08-11 18:09:48 -07:00
redmatrix	c63deda71a	embed filter adjustments	2016-08-11 17:33:28 -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	e985436b3b	forum detection was off for forums with custom perms	2016-08-10 20:49:51 -07:00
Mario Vavti	82e867a9a8	implement acl for folder creation	2016-08-10 16:17:09 +02:00
redmatrix	5238a27ab3	function order reversed	2016-08-09 20:50:33 -07:00
redmatrix	ec3ca11d0d	bad code format	2016-08-09 16:59:35 -07:00