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 |
|
Mario Vavti
|
f808f1601b
|
rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism
|
2016-07-27 16:49:55 +02:00 |
|
redmatrix
|
672c3d7c6d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-26 22:51:07 -07:00 |
|
redmatrix
|
72479041ae
|
don't include deleted or orphaned xchans in ratings search
|
2016-07-26 22:50:31 -07:00 |
|
hubzilla
|
e286b510f1
|
Merge pull request #463 from git-marijus/dev
allow multiple-file cloud upload
|
2016-07-27 14:54:51 +10:00 |
|
redmatrix
|
315dafbe12
|
restrict url cache to 254 maxlen
|
2016-07-26 20:05:40 -07:00 |
|
redmatrix
|
80e4338314
|
missing s
|
2016-07-26 19:28:28 -07:00 |
|
redmatrix
|
db176eec40
|
set App::$error on 404 so we don't get two 'Page not found.' page bodies.
|
2016-07-26 17:24:17 -07:00 |
|
Mario Vavti
|
560af7a5b8
|
allow multiple-file cloud upload
|
2016-07-26 13:17:46 +02:00 |
|
Mario Vavti
|
6900dd34a4
|
URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav clients
|
2016-07-26 09:04:52 +02: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
|
063b4286e7
|
trace log pconfig cache if for some reason it isn't an array
|
2016-07-24 22:36:37 -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 |
|
Andrew Manning
|
6998bb1f23
|
Multiple file upload by drag and drop with progress indicators and auto page reload
|
2016-07-24 07:41:53 -04:00 |
|
redmatrix
|
7d897a3f03
|
more work on #453
|
2016-07-21 23:06:55 -07:00 |
|
redmatrix
|
0c3d5e99a2
|
PConfig : Check for is_null($uid) as well as false. We actually allow $uid = 0 though it shouldn't normally happen.
|
2016-07-21 20:50:39 -07:00 |
|
Andrew Manning
|
5a63ddd645
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-21 21:14:54 -04:00 |
|
Mario Vavti
|
b63aff77df
|
merge 1.10RC into dev
|
2016-07-22 01:13:56 +02:00 |
|
Mario Vavti
|
5a1eb65ed6
|
missing $
|
2016-07-22 01:07:53 +02:00 |
|
redmatrix
|
77a021025f
|
DAV auth issue
|
2016-07-21 15:51:10 -07:00 |
|
redmatrix
|
63123759ed
|
DAV auth issue
|
2016-07-21 15:50:07 -07:00 |
|
redmatrix
|
824dedbe9d
|
issue #453 and a bug noted from the logfiles related to the schema change last month
|
2016-07-20 23:05:31 -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
|
8f57bb95fe
|
undefined function
|
2016-07-20 21:57:15 -07:00 |
|
redmatrix
|
0c3543ac43
|
undefined function
|
2016-07-20 21:55:23 -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
|
542fcaff9a
|
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
|
2016-07-20 17:57:42 -07:00 |
|
redmatrix
|
bc8c74eb42
|
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:57:17 -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 |
|
redmatrix
|
df0cd4dbc7
|
Merge branch 'dev' into perms
|
2016-07-20 13:39:10 -07:00 |
|
Mario Vavti
|
d54ad98802
|
Merge branch '1.10RC' into dev
|
2016-07-20 22:01:58 +02: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 |
|
Mario Vavti
|
8c2b93da72
|
Merge branch '1.10RC' into dev
|
2016-07-20 20:44:20 +02:00 |
|
Mario Vavti
|
ca82b45fe4
|
fix /mail wsod issue reported by giac hellvecio
|
2016-07-20 20:43:12 +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
|
237cca7a0d
|
fixes to perms
|
2016-07-19 19:33:48 -07:00 |
|