harukin
|
770036c5a8
|
Merge branch 'develop' into 'japanese'
merge from upsream 3.8.6 release
See merge request harukin/core!23
|
2018-12-04 23:55:59 +09:00 |
|
harukin
|
e8acf7e87a
|
merge from upsream 3.8.6 release
|
2018-12-04 23:52:59 +09:00 |
|
harukin
|
2a4aea67b8
|
edit translation
|
2018-12-04 23:47:09 +09:00 |
|
Max Kostikov
|
d12744011a
|
Merge branch 'dev' into 'dev'
Add strings to Russian translation
See merge request hubzilla/core!1418
|
2018-12-04 11:50:04 +01:00 |
|
Max Kostikov
|
c0e4c92d47
|
Update hstrings.php
|
2018-12-04 11:41:59 +01:00 |
|
Max Kostikov
|
cc3e910194
|
Update hmessages.po
|
2018-12-04 11:41:42 +01:00 |
|
Mario Vavti
|
5d9f993352
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-12-04 11:39:14 +01:00 |
|
Mario
|
eaa52c19a8
|
Merge branch 'photocache' into 'dev'
Less dependence on cache logic
See merge request hubzilla/core!1417
|
2018-12-04 11:38:58 +01:00 |
|
zotlabs
|
42aeb19562
|
partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld']
|
2018-12-03 20:09:57 -08:00 |
|
zotlabs
|
ffc3dba682
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-03 19:19:31 -08:00 |
|
zotlabs
|
1acc5ceb5f
|
more merging
|
2018-12-03 19:18:20 -08:00 |
|
zotlabs
|
7d694dca07
|
more work on z6 commenting
|
2018-12-03 18:50:45 -08:00 |
|
zotlabs
|
7a693500c4
|
fix generated plink
|
2018-12-03 14:21:33 -08:00 |
|
Max Kostikov
|
1c44912aff
|
Update Photo.php
|
2018-12-03 21:33:32 +01:00 |
|
Mario Vavti
|
5e14da67e1
|
quickfix for es-es language
(cherry picked from commit 6b68a76bbe)
|
2018-12-03 21:24:29 +01:00 |
|
Mario Vavti
|
6b68a76bbe
|
quickfix for es-es language
|
2018-12-03 21:22:02 +01:00 |
|
Max Kostikov
|
b586fcebab
|
Update Photo.php
|
2018-12-03 21:21:23 +01:00 |
|
Max Kostikov
|
244c0d828a
|
Update Photo.php
|
2018-12-03 13:29:27 +01:00 |
|
Max Kostikov
|
57ebd7e170
|
New logic for less dependence on cache logic
|
2018-12-03 13:10:55 +01:00 |
|
Mario Vavti
|
8f10b58cb1
|
version 3.8.6
|
2018-12-03 12:23:55 +01:00 |
|
Mario Vavti
|
f8bc408abc
|
update strings
|
2018-12-03 12:07:56 +01:00 |
|
Mario Vavti
|
f581f6163a
|
optimize autoload cache
|
2018-12-03 11:52:38 +01:00 |
|
Mario Vavti
|
5776471547
|
changelog
(cherry picked from commit 88486a1278)
|
2018-12-03 11:48:30 +01:00 |
|
Mario Vavti
|
88486a1278
|
changelog
|
2018-12-03 11:47:28 +01:00 |
|
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
|
c50e3a702a
|
more notifications fixes
(cherry picked from commit 9ef6c57ca5)
|
2018-12-03 10:49:08 +01:00 |
|
Mario Vavti
|
2173ef5fb6
|
catch exception if readImageBlob() receives bogus data
(cherry picked from commit 443d7684db)
|
2018-12-03 10:48: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 |
|
Max Kostikov
|
1f6da1c653
|
Merge branch 'photocache' into 'dev'
Add flag to allow to save image without validation
See merge request hubzilla/core!1416
|
2018-12-03 00:57:52 +01:00 |
|
Max Kostikov
|
c165894ce9
|
Add Expires field support
|
2018-12-03 00:51:09 +01:00 |
|
Max Kostikov
|
19903ea3c1
|
Add flag to allow to save image without validation
|
2018-12-02 21:59:08 +01:00 |
|
M. Dent
|
0b38ab259c
|
Merge branch 'photocache' into 'dev'
Add Photo Cache addon support
See merge request hubzilla/core!1412
|
2018-12-02 19:33:54 +01:00 |
|
harukin
|
5d82037ffb
|
edit translation
|
2018-12-02 20:36:14 +09:00 |
|
harukin
|
a41713febb
|
edit translation
|
2018-12-02 20:29:11 +09:00 |
|
harukin
|
5002d8e1fa
|
edit translation
|
2018-12-02 19:59:58 +09:00 |
|
Mario Vavti
|
237c6eed50
|
fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
|
2018-12-02 11:39:04 +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
|
f13b1e8604
|
fix filtering by addr in handleNotificationsItems()
(cherry picked from commit f083c0cba1)
|
2018-12-02 10:59:33 +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 |
|