17528 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	0b2ad9deca	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-07-07 20:39:52 +02:00
Mario Vavti	227320f6f0	more fixes for /cloud and /dav	2016-07-07 20:16:27 +02:00
redmatrix	3bee6543fb	reduce the memory usage of the expire query dramatically.	2016-07-06 22:19:05 -07:00
redmatrix	581a3c5323	expire crashing on shared hosting from memory exhaustion. Lower the expire limit. Also the sys channel was being expired with everybody else due to a flag change regression.	2016-07-06 22:02:06 -07:00
Mario Vavti	a59e84cadd	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-07-06 21:31:17 +02:00
Mario Vavti	d4627a0b1c	fix /cloud after recent changes	2016-07-06 21:31:05 +02:00
zottel	95e45bbeac	Merge remote-tracking branch 'upstream/dev' into dev	2016-07-06 08:55:26 +02:00
redmatrix	08a4763bff	more work on permissions	2016-07-05 20:21:47 -07:00
redmatrix	537f30f707	Merge branch 'dev' into perms	2016-07-05 19:40:09 -07:00
redmatrix	ad954d01de	unused file	2016-07-05 17:57:36 -07:00
redmatrix	e3d70e6b62	merge include/reddav.php into Zotlabs/Storage/Directory.php	2016-07-05 17:54:05 -07:00
redmatrix	cbf009a95d	cleanup	2016-07-05 16:56:40 -07:00
redmatrix	35cc763a92	regression - save bookmarks no longer present in item menu	2016-07-05 16:24:45 -07:00
redmatrix	cf05111622	start to refactor the permission roles	2016-07-04 22:37:30 -07:00
redmatrix	e6224898d2	more heavy lifting on xtensible perms	2016-07-04 21:33:25 -07:00
redmatrix	d566ffa678	more heavy lifting on extensible perms	2016-07-04 17:55:13 -07:00
redmatrix	6bf2e8a108	some perms fixes to stuff that was already written before I move on	2016-07-04 16:30:03 -07:00
redmatrix	805ecde6a5	minor	2016-07-04 00:12:53 -07:00
redmatrix	2a26b0ae91	perms work - settings page	2016-07-03 22:47:46 -07:00
redmatrix	916e088462	make permissionlimits into a class	2016-07-03 18:20:15 -07:00
redmatrix	c918bbba25	more work on x permissions	2016-07-03 17:10:00 -07:00
redmatrix	57226b2e13	Merge branch 'dev' into perms	2016-07-03 15:58:20 -07:00
hubzilla	f46eecc1e7	Merge pull request #448 from Treer/avatars ... Force local cache update when user changes their profile picture	2016-07-04 06:38:49 +10:00
Treer	5c062aaec4	force immediate avatar update	2016-07-03 22:38:05 +10:00
Treer	b87106b6fe	Mark nickname as required field, if left empty then channel creation fails silently	2016-07-03 17:59:44 +10:00
redmatrix	523e7b5084	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-07-01 20:48:49 -07:00
redmatrix	41fa2d6c69	delivery invoked twice in mod_tagger, once in post_activity_item() and another at the main module level	2016-07-01 20:46:57 -07:00
redmatrix	5947467339	use small photo for Diaspora attribution correction; the medium looks awkward in the D* stream.	2016-07-01 20:34:00 -07:00
Mario Vavti	0a11991340	use visibility instead of display to hide elements	2016-07-01 12:58:15 +02:00
Andrew Manning	0630609d6e	Merge remote-tracking branch 'upstream/dev' into wiki	2016-07-01 06:36:25 -04:00
Andrew Manning	205924ff29	JavaScript popup for page delete confirmation	2016-07-01 06:35:49 -04:00
Mario Vavti	7371e08625	ditch the change_view widget and make header fixed in fullscreen mode	2016-07-01 12:21:19 +02:00
redmatrix	bb5ec8cfb8	allow multiple apd's per plugin dir	2016-07-01 02:16:23 -07:00
redmatrix	e6c8de5e4c	if cron is broken because the entire db or config table is crashed, don't send a cron broken email - because we have no way of limiting it to just one email. We need a working config to do that.	2016-06-30 21:43:00 -07:00
redmatrix	bd403276f2	disable wiki if feature disabled, sync updates of delayed publish posts	2016-06-30 21:27:59 -07:00
redmatrix	7f8dcf4f12	sync flags even if post has not been edited	2016-06-30 21:12:39 -07:00
hubzilla	eef8f3b417	Merge pull request #445 from anaqreon/wiki ... Table of contents with links is generated if [toc] is found in Markdown text	2016-07-01 11:57:48 +10:00
Andrew Manning	0fd8eeec23	Merge remote-tracking branch 'upstream/dev' into wiki	2016-06-30 21:51:33 -04:00
Andrew Manning	7124c0aee5	Replace homemade table of content generator with existing jQuery plugin. Now toc is linked to document headings.	2016-06-30 21:50:38 -04:00
Mario Vavti	852b2659e9	update moment.js to version 2.13	2016-06-30 21:56:00 +02:00
zottel	b41357e2a1	Merge remote-tracking branch 'upstream/dev' into dev	2016-06-30 15:51:36 +02:00
redmatrix	1cc816f662	dreport: convert timestamp to channel localtime and get rid of old pre-template code	2016-06-29 22:53:18 -07:00
redmatrix	bfe84a9ff7	templatise the Dreport page and add a redeliver option for when things stuff up badly.	2016-06-29 22:46:47 -07:00
redmatrix	339e620738	wiki featured disabled by default in UNO.	2016-06-29 21:03:53 -07:00
redmatrix	9ef710c557	provide wiki as a feature (default is on so there aren't any surprises) and add to channel menu and profile tabs	2016-06-29 20:59:00 -07:00
redmatrix	df4ff26845	only request geolocation permission if we're creating a post.	2016-06-29 17:53:59 -07:00
redmatrix	2e93a09d83	stream large photos through buffered I/O if possible	2016-06-29 17:31:48 -07:00
hubzilla	05aba0b4dd	Merge pull request #444 from git-marijus/dev ... Merge branch sabre32 into dev	2016-06-30 09:34:22 +10:00
Mario Vavti	f098600c41	missing backslash leads to wsod on refresh permissions	2016-06-29 23:04:34 +02:00
Mario Vavti	3102440d40	Merge branch 'dev' into sabre32	2016-06-29 09:11:22 +02:00