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 |
|
Andrew Manning
|
d6b28cdc57
|
Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.
|
2016-07-17 16:05:26 -04:00 |
|
Andrew Manning
|
6c5086a933
|
Added functions to check cloud files path and return path with hashed names
|
2016-07-17 11:52:21 -04:00 |
|
Andrew Manning
|
99354ac576
|
Merge remote-tracking branch 'upstream/dev' into website-import-remote
|
2016-07-16 21:04:04 -04:00 |
|
Andrew Manning
|
e7b8531751
|
Stash changes to merge from dev
|
2016-07-16 21:02:13 -04:00 |
|
Andrew Manning
|
ff2f599142
|
Postpone remote folder import until filesystem mirroring matures.
|
2016-07-16 19:25:44 -04: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 |
|
Andrew Manning
|
0edf248cd1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-14 22:25:30 -04:00 |
|
Andrew Manning
|
514ffb74aa
|
Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works.
|
2016-07-14 22:24:23 -04: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 |
|
Andrew Manning
|
75b943b98a
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-13 05:50:31 -04: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 |
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -04: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 |
|
Andrew Manning
|
c5e534c0cb
|
Clearer import control interface
|
2016-07-10 07:21:52 -04:00 |
|
Andrew Manning
|
a338a97d5b
|
First draft of website import tools
|
2016-07-10 06:58:20 -04: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 |
|
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
|
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 |
|
Treer
|
5c062aaec4
|
force immediate avatar update
|
2016-07-03 22:38:05 +10:00 |
|
redmatrix
|
523e7b5084
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-01 20:48:49 -07:00 |
|