 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 |
|
 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 |
|
|
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 |
|
|
redmatrixandMario Vavti
|
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 |
|
|
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
|
1d90c4ea99
|
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC
|
2016-07-20 22:00: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 |
|
 git-marijusandGitHub
|
c3149a8d59
|
Merge pull request #456 from anaqreon/1.10RC-updates
Wiki delete page confirmation and max image width
|
2016-07-20 20:50:50 +02:00 |
|
|
git-marijusandGitHub
|
fd507ff597
|
Merge pull request #455 from anaqreon/wiki
Wiki delete page confirmation and max image width
|
2016-07-20 20:50:17 +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
|
da49befb18
|
Wiki delete page confirmation and max image width
|
2016-07-20 05:44:29 -04:00 |
|
|
Andrew Manning
|
e0d9d30bcf
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-20 05:39:08 -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
|
2c9938f0d5
|
add test sequence
|
2016-07-19 18:41:36 -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
|
9421e42dad
|
doc correction
|
2016-07-19 17:04:38 -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
|
8a9f062b95
|
Merge branch 'dev' into perms
|
2016-07-18 22:35:31 -07:00 |
|
|
redmatrix
|
eac35c05e9
|
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
|
2016-07-18 22:34:16 -07:00 |
|
|
redmatrix
|
07b96f2430
|
runaway cron emails
|
2016-07-18 22:34:07 -07:00 |
|
|
redmatrix
|
269b3cef72
|
runaway cron emails
|
2016-07-18 22:33:26 -07:00 |
|