Commit Graph

5965 Commits

Author SHA1 Message Date
redmatrix
6a56a509d3 Merge branch 'dev' into perms 2016-07-20 19:03:18 -07:00
redmatrix
779885f9af fix vevent multi-line formatting 2016-07-20 18:59:51 -07:00
redmatrix
3affb2e817 sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for. 2016-07-20 17:55:40 -07:00
redmatrix
a3e5307b93 fix the forum detection in include/zot 2016-07-19 22:57:23 -07:00
redmatrix
ae6256f95a another couple of minor perms fixes 2016-07-19 22:32:22 -07:00
redmatrix
a961d5e6c8 permission fixes 2016-07-19 20:49:54 -07:00
redmatrix
237cca7a0d fixes to perms 2016-07-19 19:33:48 -07:00
redmatrix
ea83032863 translate more old perms calls 2016-07-19 17:52:45 -07:00
redmatrix
6a4573b935 Merge branch 'dev' into perms 2016-07-19 17:05:59 -07:00
redmatrix
f4b658d7b1 issue #411 2016-07-19 05:13:18 -07:00
redmatrix
7272b97e9a yet more grungy perms work. 2016-07-19 01:26:28 -07:00
redmatrix
99cf2cbaa9 missing bracket 2016-07-18 21:46:40 -07:00
redmatrix
b63165b6e0 more perms work (a lot more) 2016-07-18 21:37:34 -07:00
redmatrix
32ce790717 move legacy code inside the legacy check 2016-07-18 19:09:27 -07:00
redmatrix
b5b57523f1 more perms work 2016-07-18 16:45:43 -07:00
redmatrix
7524948a97 Merge branch 'dev' into perms 2016-07-18 16:10:41 -07:00
redmatrix
f9b67d3630 more perms work 2016-07-18 13:44:39 -07:00
Mario Vavti
f44ca74e99 do not transform hashes to tags in [code=xxx] or [code] blocks 2016-07-18 13:48:09 +02:00
redmatrix
10fa5c20e7 export/import channel permissions 2016-07-17 22:40:39 -07:00
redmatrix
f7833411a1 clone channel perms 2016-07-17 22:18:35 -07:00
redmatrix
de4f9d68bd Merge branch 'dev' into perms 2016-07-17 21:40:04 -07:00
redmatrix
7ee7f00bf3 Here's the basic UI for the Zot Access Tokens, requires some minor cleanup 2016-07-14 22:41:53 -07:00
redmatrix
397a23499d make the xchan_hash for the access token location independent 2016-07-14 21:28:17 -07:00
redmatrix
f3eb9af046 more ZAT work 2016-07-14 19:43:47 -07:00
redmatrix
e6c8614801 first cut at zot access tokens 2016-07-14 19:24:15 -07:00
redmatrix
191cd21028 more perms work 2016-07-13 23:05:19 -07:00
redmatrix
b3a785711c deprecate/remove json_decode_plus 2016-07-13 22:11:06 -07:00
redmatrix
503b420292 rework perm_is_allowed 2016-07-13 20:23:20 -07:00
redmatrix
0aa205044b Merge branch 'dev' into perms 2016-07-13 20:19:11 -07:00
redmatrix
00afe56cad let abconfig specify a family 2016-07-13 20:17:40 -07:00
redmatrix
1fd65c934d lots more permission work 2016-07-13 19:53:28 -07:00
redmatrix
f4e4e734de more work on perms 2016-07-12 21:47:24 -07:00
redmatrix
6424bac47c Merge branch 'dev' into perms 2016-07-12 20:50:27 -07:00
redmatrix
bdd7d24ac1 update_remote_id - updated to work with iconfig 2016-07-12 19:08:36 -07:00
redmatrix
0fa807e7ad don't try to send sync packets to dead sites. 2016-07-12 18:38:39 -07:00
redmatrix
ed0e2b52d7 move permissiondescription class to zotlabs/lib 2016-07-11 21:46:16 -07:00
redmatrix
168d35747d use the get_hostname function rather than parse the url 2016-07-11 18:59:54 -07:00
redmatrix
a01baab4f0 Merge branch 'dev' into perms 2016-07-11 17:45:10 -07:00
redmatrix
71b001fdb7 more perms work - notably the stuff in public_perms 2016-07-11 17:02:49 -07:00
redmatrix
833de9180e create change_channel hook 2016-07-11 13:46:06 -07:00
redmatrix
cc83983ae5 perms work 2016-07-10 17:45:14 -07:00
redmatrix
e6638b4715 change default so we don't have to check for array existence later 2016-07-09 21:23:00 -07:00
redmatrix
c9db8c6857 more permissions work 2016-07-09 21:08:02 -07:00
redmatrix
917a465ccd more work on perms 2016-07-09 19:03:29 -07:00
redmatrix
ce5adbf51e more sql fine tuning 2016-07-09 18:10:13 -07:00
redmatrix
e2574cf069 some work on the forum widget queries 2016-07-09 16:07:53 -07: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
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