 Mario Vavti
|
120e9a1e4c
|
multi acl: port /webpages and /mitem
|
2016-08-04 11:23:43 +02:00 |
|
|
Mario Vavti
|
b49cfb2efd
|
multi acl: port /chat
|
2016-08-04 10:46:50 +02:00 |
|
|
Mario Vavti
|
0340160ba7
|
multi acl: port /cloud and /filestorage
|
2016-08-04 10:36:45 +02:00 |
|
|
Mario Vavti
|
4ede3fd771
|
multi acl: port photos
|
2016-08-04 09:10:21 +02:00 |
|
|
Mario Vavti
|
3783c1af3e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-04 08:10:13 +02:00 |
|
 Andrew Manning
|
05a9f0aa14
|
Convert select bbcode tags including [observer], [baseurl], [sitename]
|
2016-08-03 20:53:51 -04:00 |
|
 redmatrix
|
178c983871
|
issue #473 - unable to delete privacy groups
|
2016-08-03 16:10:28 -07:00 |
|
|
Mario Vavti
|
908e15bc90
|
multi acl: port events
|
2016-08-03 23:57:41 +02:00 |
|
|
Mario Vavti
|
b959641ca8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-03 21:17:08 +02:00 |
|
|
Mario Vavti
|
c50bfa07ca
|
multiple acl work
|
2016-08-03 21:16:57 +02:00 |
|
|
redmatrix
|
0febfce268
|
missing comma in atoken update sql
|
2016-08-02 19:31:31 -07:00 |
|
|
redmatrix
|
69354e808f
|
this should sort out likes showing up as wall-to-wall posts on diaspora
|
2016-08-01 22:12:44 -07:00 |
|
|
redmatrix
|
3a7d3e3a54
|
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
|
2016-08-01 20:12:52 -07:00 |
|
|
redmatrix
|
4c76b31684
|
/storeurl/cloudurl/
|
2016-08-01 17:44:21 -07:00 |
|
|
redmatrix
|
3d0c90cbc5
|
allow individual permissions on atokens
|
2016-07-31 23:17:07 -07:00 |
|
|
redmatrix
|
9b9621e10d
|
add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)
|
2016-07-31 20:14:25 -07:00 |
|
|
Andrew Manning
|
42b718b3e0
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-31 07:38:44 -04:00 |
|
|
Andrew Manning
|
7c47557554
|
Improved UI. Removed logger statements.
|
2016-07-31 07:30:25 -04:00 |
|
|
Andrew Manning
|
32366284a8
|
Import element selection page added to allow selective importing.
|
2016-07-30 09:56:47 -04:00 |
|
|
Andrew Manning
|
f17f51a9c1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-30 06:30:46 -04:00 |
|
|
redmatrix
|
4ce8f965aa
|
issue #466, sql typo
|
2016-07-28 13:10:19 -07: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 |
|