Mario Vavti
|
9fa3956aa8
|
translate mime types to icons, update some icons, move file preview (upload progress) below table header
|
2016-07-28 10:28:48 +02:00 |
|
redmatrix
|
80e4338314
|
missing s
|
2016-07-26 19:28:28 -07:00 |
|
redmatrix
|
56957b60e2
|
issue #460 - remove reference to $a which was passed by value since it doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
|
2016-07-26 15:57:33 -07:00 |
|
redmatrix
|
2fb4952137
|
issue #460
|
2016-07-25 13:27:17 -07:00 |
|
redmatrix
|
b5f2b4af35
|
string update and some minor comment edits
|
2016-07-24 16:11:34 -07:00 |
|
redmatrix
|
2c1b432613
|
fix birthday addtocal
|
2016-07-21 21:35:26 -07:00 |
|
redmatrix
|
bc46f70a90
|
zat URL auth updated to match changes to the atoken_login interface
|
2016-07-21 20:04:30 -07:00 |
|
Andrew Manning
|
5a63ddd645
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-21 21:14:54 -04:00 |
|
redmatrix
|
8566f91303
|
fail oembed if it is attempted and less than 80% of the original content is left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
|
2016-07-21 17:44:04 -07:00 |
|
redmatrix
|
cf0b1f1f15
|
typo
|
2016-07-21 01:48:20 -07: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 |
|
redmatrix
|
779885f9af
|
fix vevent multi-line formatting
|
2016-07-20 18:59:51 -07: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 |
|
Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
redmatrix
|
a3e5307b93
|
fix the forum detection in include/zot
|
2016-07-19 22:57:23 -07:00 |
|
redmatrix
|
ae6256f95a
|
another couple of minor perms fixes
|
2016-07-19 22:32:22 -07:00 |
|
redmatrix
|
a961d5e6c8
|
permission fixes
|
2016-07-19 20:49:54 -07:00 |
|
redmatrix
|
237cca7a0d
|
fixes to perms
|
2016-07-19 19:33:48 -07:00 |
|
redmatrix
|
ea83032863
|
translate more old perms calls
|
2016-07-19 17:52:45 -07:00 |
|
redmatrix
|
6a4573b935
|
Merge branch 'dev' into perms
|
2016-07-19 17:05:59 -07:00 |
|
redmatrix
|
f4b658d7b1
|
issue #411
|
2016-07-19 05:13:18 -07:00 |
|
redmatrix
|
7272b97e9a
|
yet more grungy perms work.
|
2016-07-19 01:26:28 -07:00 |
|
redmatrix
|
99cf2cbaa9
|
missing bracket
|
2016-07-18 21:46:40 -07:00 |
|
redmatrix
|
b63165b6e0
|
more perms work (a lot more)
|
2016-07-18 21:37:34 -07:00 |
|
redmatrix
|
32ce790717
|
move legacy code inside the legacy check
|
2016-07-18 19:09:27 -07:00 |
|
redmatrix
|
b5b57523f1
|
more perms work
|
2016-07-18 16:45:43 -07:00 |
|
redmatrix
|
7524948a97
|
Merge branch 'dev' into perms
|
2016-07-18 16:10:41 -07:00 |
|
redmatrix
|
f9b67d3630
|
more perms work
|
2016-07-18 13:44:39 -07:00 |
|
Mario Vavti
|
f44ca74e99
|
do not transform hashes to tags in [code=xxx] or [code] blocks
|
2016-07-18 13:48:09 +02:00 |
|
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 |
|