Andrew Manning
|
f17f51a9c1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-30 06:30:46 -04:00 |
|
redmatrix
|
02fc082e45
|
github didn't accept the last push. Touching the files to force a git revision
|
2016-07-27 22:40:33 -07:00 |
|
redmatrix
|
be1ffca6f4
|
fix italian strings (messed up by rtl variable); and finish removing openid from core
|
2016-07-27 22:28:30 -07:00 |
|
redmatrix
|
5f3a8cbe93
|
add the hidden flag also
|
2016-07-27 16:14:46 -07:00 |
|
redmatrix
|
72479041ae
|
don't include deleted or orphaned xchans in ratings search
|
2016-07-26 22:50:31 -07:00 |
|
redmatrix
|
5d4245ff01
|
move openid to addon
|
2016-07-25 17:16:41 -07:00 |
|
redmatrix
|
01338a7610
|
make drag/drop work with acl, which bypassed the form
|
2016-07-24 22:58:26 -07:00 |
|
redmatrix
|
271f85be3b
|
add acl selection to files upload via /cloud (still missing from directory creation)
|
2016-07-24 20:27:59 -07:00 |
|
redmatrix
|
b5f2b4af35
|
string update and some minor comment edits
|
2016-07-24 16:11:34 -07:00 |
|
redmatrix
|
7d897a3f03
|
more work on #453
|
2016-07-21 23:06:55 -07:00 |
|
Andrew Manning
|
5a63ddd645
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-21 21:14:54 -04:00 |
|
redmatrix
|
da707736a0
|
issue #453 and a bug noted from the logfiles related to the schema change last month
|
2016-07-20 23:04:07 -07:00 |
|
redmatrix
|
6a56a509d3
|
Merge branch 'dev' into perms
|
2016-07-20 19:03:18 -07:00 |
|
Andrew Manning
|
d504197a78
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 21:22:53 -04: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
|
df0cd4dbc7
|
Merge branch 'dev' into perms
|
2016-07-20 13:39:10 -07:00 |
|
Mario Vavti
|
4da005e209
|
type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid
|
2016-07-20 22:00:41 +02:00 |
|
Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
Andrew Manning
|
0c7ad924a8
|
Starting to make the import selection page after element scan.
|
2016-07-20 05:33:40 -04:00 |
|
redmatrix
|
a3e5307b93
|
fix the forum detection in include/zot
|
2016-07-19 22:57:23 -07:00 |
|
redmatrix
|
a961d5e6c8
|
permission fixes
|
2016-07-19 20:49:54 -07:00 |
|
redmatrix
|
ea83032863
|
translate more old perms calls
|
2016-07-19 17:52:45 -07:00 |
|
redmatrix
|
b63165b6e0
|
more perms work (a lot more)
|
2016-07-18 21:37:34 -07:00 |
|
redmatrix
|
b5b57523f1
|
more perms work
|
2016-07-18 16:45:43 -07:00 |
|
redmatrix
|
de4f9d68bd
|
Merge branch 'dev' into perms
|
2016-07-17 21:40:04 -07:00 |
|
redmatrix
|
279359c1bd
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-17 16:05:46 -07:00 |
|
redmatrix
|
dc9fa7cf64
|
include attach.php at the module level since 2d4b75428a wasn't backported to dev and we're about to branch an RC
|
2016-07-17 16:04:00 -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
|
75fb065526
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-17 11:54:36 -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 |
|
Mario Vavti
|
2b674d4cd9
|
hide fullscreen button in embedphotos modal album view
|
2016-07-17 12:54:10 +02: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
|
8e667866fd
|
add service class restrictions to access_tokens
|
2016-07-15 21:57:41 -07:00 |
|
redmatrix
|
f3aff45042
|
provide examples for using access tokens in urls
|
2016-07-15 16:31:21 -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 |
|
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
|
f70f4a4e85
|
add zat to acl
|
2016-07-14 20:26:22 -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
|
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
|
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 |
|