redmatrix
|
d786eca126
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-25 13:27:42 -07:00 |
|
redmatrix
|
2fb4952137
|
issue #460
|
2016-07-25 13:27:17 -07:00 |
|
zottel
|
dcf2c07f29
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-25 13:38:12 +02:00 |
|
Mario Vavti
|
da512cef64
|
revert multiple test
|
2016-07-25 11:43:01 +02:00 |
|
Mario Vavti
|
f41b037fbe
|
css fixes
|
2016-07-25 11:41:27 +02:00 |
|
redmatrix
|
0f5f1c98ca
|
revert cloud acl selector (branched so as to continue development)
|
2016-07-25 01:46:40 -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 |
|
redmatrix
|
9967f2ab28
|
call wall_attach rather than wall_upload for drag/drop; which means you can drag/drop any file and not just photos.
|
2016-07-24 16:09:33 -07:00 |
|
hubzilla
|
52c3960946
|
Merge pull request #459 from anaqreon/jot-drag-attach
Drag and drop one image file at a time into the post editor will uplo…
|
2016-07-25 08:55:12 +10:00 |
|
Andrew Manning
|
1b1170bcf6
|
Drag and drop one image file at a time into the post editor will upload it.
|
2016-07-24 17:33:34 -04:00 |
|
hubzilla
|
eb03877aa4
|
Merge pull request #458 from anaqreon/dragdropupload
Drag-and-drop file upload for cloud files
|
2016-07-24 23:13:05 +10:00 |
|
Andrew Manning
|
4c4d185937
|
Remove logger calls
|
2016-07-24 08:35:21 -04: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 |
|
Andrew Manning
|
3a60bef2b6
|
Include credentials for session cookie in xhr
|
2016-07-23 08:39:23 -04:00 |
|
Andrew Manning
|
eb1eb38c01
|
AJAX single upload might be working, but permissions problems seem to cause failure.
|
2016-07-23 07:59:28 -04:00 |
|
Andrew Manning
|
3c5598407e
|
Drag and drop file information display in cloud files upload form. No actual upload implemented yet.
|
2016-07-22 21:27:32 -04:00 |
|
zottel
|
ed82cb108f
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-22 20:16:49 +02:00 |
|
Mario Vavti
|
4ffc4ee70a
|
rename the patch so that it explains what it does
|
2016-07-22 14:29:16 +02:00 |
|
Mario Vavti
|
52db649022
|
apply our custom patch to readmore.js
|
2016-07-22 14:14:20 +02:00 |
|
Mario Vavti
|
38e46fff54
|
upgrade readmore.js and improve collapsing a little
|
2016-07-22 14:03:14 +02:00 |
|
Wave
|
744ad84714
|
Merge pull request #6 from redmatrix/dev
Dev
|
2016-07-22 10:55:02 +02:00 |
|
redmatrix
|
7d897a3f03
|
more work on #453
|
2016-07-21 23:06:55 -07:00 |
|
redmatrix
|
2c1b432613
|
fix birthday addtocal
|
2016-07-21 21:35:26 -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 |
|
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 |
|
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
|
98a2dcad90
|
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
|
2016-07-21 15:51:25 -07: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
|
6167291488
|
issue #411
|
2016-07-21 11:28:38 +02:00 |
|
redmatrix
|
cf0b1f1f15
|
typo
|
2016-07-21 01:48:20 -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
|
d2e5b7cb76
|
delete test doc
|
2016-07-20 20:29:33 -07:00 |
|
redmatrix
|
6a56a509d3
|
Merge branch 'dev' into perms
|
2016-07-20 19:03:18 -07:00 |
|
redmatrix
|
dffa08adcc
|
fix vevent multi-line formatting
|
2016-07-20 19:00:45 -07:00 |
|
redmatrix
|
779885f9af
|
fix vevent multi-line formatting
|
2016-07-20 18:59:51 -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 |
|