Mario Vavti
|
9fcadc2d7c
|
prevent incompatible export files (osada/zap) from being imported (manual patch from dev)
|
2018-12-03 11:08:39 +01:00 |
|
Mario Vavti
|
9ef6c57ca5
|
more notifications fixes
|
2018-12-03 10:46:49 +01:00 |
|
Mario Vavti
|
443d7684db
|
catch exception if readImageBlob() receives bogus data
|
2018-12-03 10:45:43 +01:00 |
|
Mario Vavti
|
a3ba7f0788
|
fallback to url if we have not got an addr
|
2018-12-02 11:38:13 +01:00 |
|
Mario Vavti
|
f083c0cba1
|
fix filtering by addr in handleNotificationsItems()
|
2018-12-02 10:58:54 +01:00 |
|
Mario Vavti
|
defa2d9df1
|
make pdf preview 100% width and 300px height to match it openstreetmaps preview
(cherry picked from commit df84352385)
|
2018-12-02 10:18:37 +01:00 |
|
Mario Vavti
|
05c422ef23
|
redbasic sticky aside fixes
(cherry picked from commit 8d4f6a7865)
|
2018-12-02 10:18:20 +01:00 |
|
zotlabs
|
51d274961b
|
typo
(cherry picked from commit 6f22e47feb)
|
2018-12-02 10:18:05 +01:00 |
|
zotlabs
|
4b4cc04897
|
allow notification filtering by name or addr
(cherry picked from commit c6acb6191c)
|
2018-12-02 10:17:45 +01:00 |
|
zotlabs
|
4bf3d4d87a
|
attached photo permissions regression
(cherry picked from commit 6cade7d935)
|
2018-12-02 10:17:29 +01:00 |
|
Manuel Jiménez Friaza
|
71cc980e96
|
Revision 1 doc/es-es/about/about.bb
(cherry picked from commit 5ac08ec3aa)
(cherry picked from commit 37d563c30e)
|
2018-12-02 10:16:50 +01:00 |
|
Mario
|
58c0b81908
|
use flex for the default template
(cherry picked from commit 3775be4ce9)
|
2018-12-02 10:16:24 +01:00 |
|
M. Dent
|
3b42bd43ab
|
Do not store serialized pconfig value received via to Module/Pconfig.php
(cherry picked from commit 6b02c664fb)
|
2018-12-02 10:15:55 +01:00 |
|
Mario
|
a151532ffa
|
update jquery-file-upload and psr-log via composer
(cherry picked from commit c7ae3fdc9a)
|
2018-12-02 10:14:58 +01:00 |
|
Mario
|
a0d1ce77dc
|
update imagesloaded to version 4.1.4 via composer
(cherry picked from commit c667572d3e)
|
2018-12-02 10:14:37 +01:00 |
|
Manuel Jiménez Friaza
|
863cae1bab
|
Update es-es
(cherry picked from commit ca98a566ee)
|
2018-12-02 10:13:43 +01:00 |
|
zotlabs
|
4010ea814a
|
fix mastodon tag notifications (again)
(cherry picked from commit 8e71324514)
|
2018-12-02 10:13:12 +01:00 |
|
zotlabs
|
8e25c091f4
|
no mention notifications from mastodon (and pleroma)
(cherry picked from commit ea235c0c67)
|
2018-12-02 10:12:44 +01:00 |
|
harukin
|
39b553529d
|
add manifest.json
|
2018-11-25 23:36:59 +09:00 |
|
harukin
|
ea995d017b
|
Merge branch 'develop' into 'master'
merge from master/upstream
See merge request harukin/core!20
|
2018-11-21 21:54:12 +09:00 |
|
harukin
|
1aecbbece5
|
merge from master
|
2018-11-21 21:49:47 +09:00 |
|
Mario Vavti
|
0bba9482df
|
fix call to undefined function
|
2018-11-21 13:21:29 +01:00 |
|
Mario Vavti
|
f8a8559523
|
fix typo which prevented propagation of comments
(cherry picked from commit 0c94747ab1)
|
2018-11-20 10:09:46 +01:00 |
|
harukin
|
a12abaac9d
|
規約誤植修正
|
2018-11-19 22:30:10 +09:00 |
|
harukin
|
343fccd7fd
|
Merge branch 'develop' into 'master'
merge from upsream 3.8.5 release
See merge request harukin/core!18
|
2018-11-19 21:40:07 +09:00 |
|
harukin
|
577102c4ec
|
merge from upsream 3.8.5 release
|
2018-11-19 21:40:07 +09:00 |
|
harukin
|
f5faa053bf
|
merge from upsream 3.8.5 release
|
2018-11-19 20:40:12 +09:00 |
|
Mario Vavti
|
1044e8e91a
|
version 3.8.5
|
2018-11-19 11:12:32 +01:00 |
|
Mario Vavti
|
ba4b1cb5af
|
Merge branch 'master' of https://framagit.org/hubzilla/core
|
2018-11-19 11:10:36 +01:00 |
|
Mario Vavti
|
5cb4cdaa5e
|
changelog
|
2018-11-19 11:10:22 +01:00 |
|
Mario
|
7be1d9e45a
|
Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts
See merge request hubzilla/core!1398
(cherry picked from commit f34af496ec)
3787c490 Fix: delayed items propagate before publication on cloned channels
|
2018-11-19 10:45:01 +01:00 |
|
Mario Vavti
|
ae97649948
|
update sql schemas to include update column in pconfig table
|
2018-11-19 10:42:18 +01:00 |
|
Mario Vavti
|
f15e32d063
|
recalculate photo filesize when rotating an image
|
2018-11-17 09:41:26 +01:00 |
|
Mario Vavti
|
afc75af62f
|
strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead.
|
2018-11-16 22:14:11 +01:00 |
|
Mario
|
2778a7220f
|
Merge branch 'master' into 'master'
delivery issue
See merge request hubzilla/core!1397
|
2018-11-16 10:29:45 +01:00 |
|
zotlabs
|
26f593afaa
|
delivery issue
|
2018-11-15 13:52:25 -08:00 |
|
harukin
|
f560fe3b37
|
Merge branch 'develop' into 'master'
利用規約追加
See merge request harukin/core!16
|
2018-11-15 00:34:04 +09:00 |
|
harukin
|
58083ccb0c
|
|
2018-11-15 00:28:19 +09:00 |
|
harukin
|
976a4da0a1
|
|
2018-11-15 00:25:55 +09:00 |
|
harukin
|
74c48e5906
|
利用規約追加
|
2018-11-15 00:24:20 +09:00 |
|
harukin
|
d7f0b130ce
|
Merge branch 'develop' into 'master'
Merge Upstream to here. 3.8.4
See merge request harukin/core!15
|
2018-11-14 19:53:29 +09:00 |
|
harukin
|
23b65c8e6e
|
Merge Upstream to here. 3.8.4
|
2018-11-14 19:45:51 +09:00 |
|
Mario Vavti
|
beac45b075
|
more changelog
|
2018-11-14 11:20:39 +01:00 |
|
Mario Vavti
|
dfc5159aa3
|
Merge branch 'dev'
|
2018-11-14 11:12:20 +01:00 |
|
Mario Vavti
|
886cdb440b
|
changelog and version
|
2018-11-14 11:08:25 +01:00 |
|
Mario
|
6ed9443972
|
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b
See merge request hubzilla/core!1395
|
2018-11-14 09:30:54 +01:00 |
|
Mario
|
08e0f172de
|
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
|
2018-11-14 09:30:28 +01:00 |
|
DM42.Net (Matt Dent)
|
f1d168f781
|
Fix double escaping after xss fix
|
2018-11-13 23:06:00 -05:00 |
|
DM42.Net (Matt Dent)
|
302d9796c4
|
Revert "Filter search box before display"
This reverts commit 35e66770be.
|
2018-11-13 22:59:36 -05:00 |
|
M. Dent
|
1260887fa7
|
Merge branch 'patch-20181113a' into 'dev'
Patch 20181113a
See merge request hubzilla/core!1394
|
2018-11-14 03:21:32 +01:00 |
|