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
3beb94dc52
whitespace
2016-07-18 13:52:26 +02:00
Mario Vavti
4371e6ad97
resolve merge conflict
2016-07-18 13:50:32 +02: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
redmatrix
571b8cc85b
roll version
2016-07-17 19:57:19 -07:00
redmatrix
883fc5d753
update changelog
2016-07-17 19:56:32 -07:00
redmatrix
25b2a6e0cf
update changelog
2016-07-17 19:54:59 -07:00
redmatrix
4febdc3bcd
jquery update issue prevents comments from reloading and resetting watch cursor
2016-07-17 18:33:45 -07:00
redmatrix
c3617f5d1e
jquery update issue prevents comments from reloading and resetting watch cursor
2016-07-17 18:32:38 -07:00
redmatrix
fc78ba7c2f
change std_version
2016-07-17 16:38:21 -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
redmatrix
5d0ddb3123
booboo
2016-07-17 02:49:41 -07:00
hubzilla
2d4b75428a
Merge pull request #452 from anaqreon/patch-1
...
Fixed whitescreen when creating folders via cloud files web interface
2016-07-17 19:40:26 +10:00
Mario Vavti
f39d20ac97
some work on guest access token ui
2016-07-17 11:29:37 +02:00
Andrew Manning
db2b6f1268
Fixed whitescreen when creating folders via cloud files web interface
...
I'm getting a "not found" error when I try to create folders in the cloud files web interface. I click the "Create" button beside the "Upload" button, type a bland name for a new folder, and I get a white screen. Including the attach.php file fixes the bug.
Version 1.9.1+99354ac
2016-07-16 21:23:29 -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
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
