20483 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	5dad444026	fix php warnings on photo delete	2017-11-13 19:55:09 +01:00
Mario Vavti	217a684e5f	also filter atokens on acl search	2017-11-13 10:08:51 +01:00
zotlabs	7b6ddeb859	allow a site to block (public) the directory separately from other resources.	2017-11-12 21:43:46 -08:00
zotlabs	b12dc89bb1	improve removed_channel final cleanup. Hubzilla issue #386	2017-11-12 21:37:06 -08:00
zotlabs	a387868540	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-11-12 16:07:20 -08:00
zotlabs	59caf141d1	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-11-12 16:07:04 -08:00
zotlabs	1ac35dd047	fix some conflicts between private tags and forum tags	2017-11-12 15:07:12 -08:00
zotlabs	458f2e748d	cleanup of upload_to_comments test; we actually don't care about the profile owner. We only care that we're logged in locally and our storage is public by default.	2017-11-12 14:14:20 -08:00
Mario Vavti	6ea7ef43e0	removed underline only for testing purpose - revert	2017-11-12 21:04:43 +01:00
Mario Vavti	064464a553	fix some schema issues	2017-11-12 20:18:18 +01:00
Mario Vavti	4668f36ddd	more changelog	2017-11-11 21:48:58 +01:00
Mario Vavti	bd3bc503ed	Merge remote-tracking branch 'mike/master' into dev	2017-11-11 21:35:56 +01:00
Mario Vavti	823729d2c1	changelog	2017-11-11 21:25:59 +01:00
zotlabs	34b38f06e0	also disable uploading in comments if the channel permissionlimits for view_storage aren't PERMS_PUBLIC.	2017-11-11 12:23:20 -08:00
Mario Vavti	55995b0494	fix wiki pages not updating after creating new page	2017-11-11 20:01:03 +01:00
Mario Vavti	eb17598254	animate fast	2017-11-11 13:53:22 +01:00
Mario Vavti	0d512dffc3	dedicate the first click to slideup the cover again but make sure the nav buttons remain functional	2017-11-11 13:46:17 +01:00
zotlabs	988028577b	set os_syspath in DAV file put operation so that photos will scale correctly.	2017-11-10 13:50:52 -08:00
Klaus Weidenbach	6cf3ebb7db	👌 Fix a PHP warning in Permissions::FilledPerms(). ... When NULL is passed as parameter there is a PHP warning when testing against it in the function in_array().	2017-11-10 21:28:35 +01:00
Klaus Weidenbach	c571ca40d7	✅ unit tests for Zotlabs\Access classes.	2017-11-10 21:22:18 +01:00
Mario Vavti	3a17225546	revert back to get the mid from enotify - otherwise we can not distinct between posts and likes	2017-11-10 20:30:55 +01:00
Mario Vavti	5e541ff53b	bring some ajax to photo upload	2017-11-10 10:50:19 +01:00
zotlabs	9b19e40a74	hubzilla issue #901 - unicode characters in urls tripping up url regexes - these regexes have been modified to accept unicode "letters" which may preclude emojis and control sequences and symbols in url links; but should suffice for most legal URLs containing language context "text" glyphs.	2017-11-09 21:26:18 -08:00
zotlabs	71a30cd9a5	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-11-09 18:36:40 -08:00
Mario Vavti	766a7fb1b4	Merge remote-tracking branch 'mike/master' into dev	2017-11-09 23:13:15 +01:00
Mario Vavti	40a7446e3e	get the path infos from pathname instead of seperate data attribute	2017-11-09 12:41:57 +01:00
Mario Vavti	fc96cd3710	load notifications links to /display via ajax if we are already in /display	2017-11-09 11:34:41 +01:00
zotlabs	40c625158f	unable to change permissions on wiki with space in name	2017-11-08 21:19:03 -08:00
zotlabs	7dad842f35	use logger	2017-11-08 19:24:02 -08:00
zotlabs	909f67fb3a	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-11-08 19:22:09 -08:00
zotlabs	ef27a1ce6c	use logger	2017-11-08 19:21:36 -08:00
zotlabs	75471ba10f	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-11-08 19:21:20 -08:00
Mario Vavti	e7d20efb1b	css fixes	2017-11-08 12:00:15 +01:00
Mario Vavti	a8d527f1cd	only show nav app link if we have a selected app	2017-11-08 11:01:19 +01:00
Mario Vavti	e5f3296c6b	use text-muted on site location	2017-11-08 09:11:17 +01:00
Mario	9d584fc720	truncate nav-app-link if appropriate	2017-11-08 08:57:30 +01:00
zotlabs	92e0c502f7	make most recent cloud_tiles setting for local channels persistent across logins	2017-11-07 19:34:00 -08:00
Mario Vavti	b5d4acf10a	Merge remote-tracking branch 'mike/master' into dev	2017-11-07 12:20:11 +01:00
Mario Vavti	47fbdda409	rename channel app events to calendar and add nav_set_selected() to /cal	2017-11-07 11:22:11 +01:00
Mario Vavti	1bb6dfc9a0	move style out of template	2017-11-07 10:58:15 +01:00
Mario Vavti	549866c090	add location info to the navbar	2017-11-07 10:43:13 +01:00
zotlabs	7b69dc574b	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-11-06 21:56:16 -08:00
zotlabs	5e47b767ea	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-11-06 21:55:58 -08:00
zotlabs	5376a734d4	.htignore update	2017-11-06 21:55:36 -08:00
zotlabs	3f1a4b6559	second half of issue #893 - move channel default permissions to its own module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner.	2017-11-06 20:13:14 -08:00
zotlabs	11a7a08b9d	bring back tabindex to submit comments	2017-11-06 17:08:48 -08:00
Mario Vavti	d16bbfb224	update es-es help.html	2017-11-06 12:28:12 +01:00
git-marijus	48959d5606	Merge pull request #900 from anaqreon/dev ... Add Manuel's Spanish translations for context help	2017-11-06 11:36:47 +01:00
Mario Vavti	94e548b07a	lets try this in the wild for a while	2017-11-06 11:25:49 +01:00
Mario Vavti	9cd715bbbf	fix unable to mark all messages read	2017-11-06 09:34:20 +01:00