 redmatrix
|
397a23499d
|
make the xchan_hash for the access token location independent
|
2016-07-14 21:28:17 -07:00 |
|
|
redmatrix
|
d660bde324
|
missing brace
|
2016-07-14 20:53:38 -07:00 |
|
|
redmatrix
|
94bd53c0f1
|
schema updates for zot access tokens
|
2016-07-14 20:51:15 -07:00 |
|
|
redmatrix
|
f70f4a4e85
|
add zat to acl
|
2016-07-14 20:26:22 -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
|
05a9f2f0f5
|
markdown is whitespace sensitive
|
2016-07-14 17:46:21 -07:00 |
|
|
redmatrix
|
115ef3249c
|
who are we
|
2016-07-14 17:45:09 -07:00 |
|
 zottel
|
a2461d9816
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-14 20:49:26 +02: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
|
960e9edff5
|
Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though.
|
2016-07-13 21:46:59 -04:00 |
|
|
redmatrix
|
b72720f6b6
|
Merge branch 'dev' into perms
|
2016-07-13 18:24:45 -07:00 |
|
|
redmatrix
|
f60a0c5ce0
|
document mod_acl a bit better and try to remove some redundancies and consolidate the various options
|
2016-07-13 17:51:19 -07:00 |
|
|
Andrew Manning
|
ba903e21ed
|
Updated import_blocks for database calls
|
2016-07-13 06:17:12 -04:00 |
|
|
Andrew Manning
|
75b943b98a
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-13 05:50:31 -04:00 |
|
|
redmatrix
|
18565600b2
|
missing namespace prefix \
|
2016-07-12 22:58:12 -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 |
|
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -04:00 |
|
|
Andrew Manning
|
1e4ef81244
|
Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2
|
2016-07-12 21:41:37 -04:00 |
|
|
redmatrix
|
0fa807e7ad
|
don't try to send sync packets to dead sites.
|
2016-07-12 18:38:39 -07:00 |
|
|
redmatrix
|
b6987b4287
|
the abconfig defaults weren't changed in the schema files when they were changed in the code
|
2016-07-12 13:15:20 -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
|
17c3e12eab
|
document the new change_channel hook
|
2016-07-11 17:43: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
|
fb36561a68
|
force non-null sess_data
|
2016-07-11 13:27:44 -07:00 |
|
|
redmatrix
|
67c60229ca
|
use the profile_uid here.
|
2016-07-11 13:20:12 -07:00 |
|
|
redmatrix
|
f4bcb82041
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-11 13:19:13 -07:00 |
|
 Mario Vavti
|
a849dcadb6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-11 12:50:12 +02:00 |
|
|
Mario Vavti
|
d5afd0d7c2
|
do not use visibility for fullscreen button and move fullscreen button to the right
|
2016-07-11 12:49:53 +02:00 |
|
|
zottel
|
ecc06aad24
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-11 10:33:51 +02:00 |
|
|
redmatrix
|
cc83983ae5
|
perms work
|
2016-07-10 17:45:14 -07:00 |
|
 hubzillaandGitHub
|
ba5183b244
|
Merge pull request #451 from git-marijus/dev
remove check for mcrypt
|
2016-07-11 09:06:11 +10:00 |
|
|
Mario Vavti
|
3d3584b36c
|
remove check for mcrypt
|
2016-07-10 13:42:04 +02: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 |
|
|
Mario Vavti
|
e11219888d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-10 11:34:10 +02: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 |
|