Andrew Manning
|
ff2f599142
|
Postpone remote folder import until filesystem mirroring matures.
|
2016-07-16 19:25:44 -04:00 |
|
Mario Vavti
|
f396b1bf73
|
check for variables after schema files have been added
|
2016-07-16 16:18:36 +02:00 |
|
Mario Vavti
|
e237dfc660
|
check for variables in schemes
|
2016-07-16 12:32:22 +02:00 |
|
Mario Vavti
|
641029ab18
|
hide/show mixup
|
2016-07-16 10:56:46 +02:00 |
|
Mario Vavti
|
065ef29de2
|
only use visibility for tabs
|
2016-07-16 10:52:06 +02:00 |
|
redmatrix
|
aac0fa2b5f
|
os_delete_prohibit
|
2016-07-16 01:02:41 -07:00 |
|
redmatrix
|
17edec8e4a
|
add new service class restriction to the doco
|
2016-07-15 21:59:41 -07:00 |
|
redmatrix
|
8e667866fd
|
add service class restrictions to access_tokens
|
2016-07-15 21:57:41 -07:00 |
|
redmatrix
|
01fe7d6620
|
remove expired access tokens
|
2016-07-15 17:34:44 -07:00 |
|
redmatrix
|
f3aff45042
|
provide examples for using access tokens in urls
|
2016-07-15 16:31:21 -07:00 |
|
redmatrix
|
d6d94d9427
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-15 15:31:50 -07:00 |
|
redmatrix
|
acb78205c8
|
login isn't always your email.
|
2016-07-15 15:30:52 -07:00 |
|
redmatrix
|
dcb3c2c299
|
mod_home: if using an atoken login on the home page redirect to the channel page of the channel that owns the atoken.
|
2016-07-15 15:26:36 -07:00 |
|
Mario Vavti
|
9048f8cffe
|
bump minor version because of jquery update
|
2016-07-15 14:53:15 +02:00 |
|
Mario Vavti
|
4a2fb8336e
|
round up height
|
2016-07-15 14:23:10 +02:00 |
|
Mario Vavti
|
34a16e0ab9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-15 13:21:07 +02:00 |
|
Mario Vavti
|
c2779b6f33
|
add jquery migrate for version 3
|
2016-07-15 13:20:55 +02:00 |
|
Mario Vavti
|
2e32b5f467
|
upgrade to jquery-3.1 and minor fixes
|
2016-07-15 13:20:00 +02:00 |
|
redmatrix
|
da5ec98f98
|
make lockview work with throwaway identities
|
2016-07-15 02:07:27 -07:00 |
|
redmatrix
|
d54f5a3831
|
more cleanup of atoken UI
|
2016-07-15 01:43:09 -07:00 |
|
redmatrix
|
5e475acb85
|
cleanup and debug of atoken feature
|
2016-07-15 01:33:28 -07:00 |
|
redmatrix
|
f666d8a083
|
enforce non-empty name and token/password on access tokens until better checks are instituted.
|
2016-07-15 01:06:25 -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
|
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 |
|