harukin
bcb258bcbb
Merge branch 'develop' into 'master'
...
merge again upstream/master for 3.8.7
See merge request harukin/core!26
2018-12-15 17:20:18 +09:00
harukin
e02c09d361
merge again upstream/master for 3.8.7
2018-12-15 17:17:00 +09:00
Mario Vavti
d77c7d51e3
update changelog
...
(cherry picked from commit 4ff3c57976
2018-12-14 21:47:20 +01:00
Mario Vavti
d51d0160d3
fix issue with linkdropper
...
(cherry picked from commit f81a3ba45d
2018-12-14 21:32:23 +01:00
zotlabs and Mario
c2ad9d4996
regression: the ability to order apps messed up since adding pinned apps to the ordering
...
(cherry picked from commit 6464099364
2018-12-14 21:31:02 +01:00
harukin
9cd9776b7d
Merge branch 'develop' into 'master'
...
merge from upsream
See merge request harukin/core!24
2018-12-15 00:47:46 +09:00
harukin
097afab9f4
merge from upsream
2018-12-15 00:40:38 +09:00
Mario
79f828125d
version bump
2018-12-14 11:47:02 +01:00
Mario Vavti
ad4b18cbbe
return on readImageBlob() exception
...
(cherry picked from commit 993db01400
2018-12-14 11:31:11 +01:00
Mario Vavti
1bd49671b7
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
...
(cherry picked from commit 7894fed741
2018-12-14 11:30:57 +01:00
zotlabs and Mario
9896057549
home notifications won't expand if there are more than 300 unseen network notifications ahead of them.
...
(cherry picked from commit 30efeb5bec
2018-12-14 11:30:25 +01:00
phani00 and Mario
44832bbacb
change redbasic dark schema to make categories and highlights readable
...
additions to /view/theme/redbasic/schema/dark.css to change the appearance of category
badges and highlighted text ([hl]...[/hl]).
hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class
selector that works in master but not in dev anymore.
(cherry picked from commit 18caf0273f
2018-12-14 11:30:05 +01:00
zotlabs and Mario
f20a923dd7
total_identities restriction off by one
...
(cherry picked from commit e60fb17524
2018-12-14 11:29:33 +01:00
zotlabs and Mario
30403da326
reset page title if article has no title.
...
(cherry picked from commit 8ab1f31058
2018-12-14 11:29:06 +01:00
harukin
d38b75900a
Merge branch 'develop' into 'master'
...
merge from upsream 3.8.6 release
See merge request harukin/core!22
2018-12-04 23:55:47 +09:00
harukin
e8acf7e87a
merge from upsream 3.8.6 release
2018-12-04 23:52:59 +09:00
Mario Vavti
6b68a76bbe
quickfix for es-es language
2018-12-03 21:22:02 +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
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
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 and Mario
51d274961b
typo
...
(cherry picked from commit 6f22e47feb
2018-12-02 10:18:05 +01:00
zotlabs and Mario
4b4cc04897
allow notification filtering by name or addr
...
(cherry picked from commit c6acb6191c
2018-12-02 10:17:45 +01:00
zotlabs and Mario
4bf3d4d87a
attached photo permissions regression
...
(cherry picked from commit 6cade7d935
2018-12-02 10:17:29 +01:00
Manuel Jiménez Friaza and Mario
71cc980e96
Revision 1 doc/es-es/about/about.bb
...
(cherry picked from commit 5ac08ec3aa37d563c30e
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 and Mario
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 and Mario
863cae1bab
Update es-es
...
(cherry picked from commit ca98a566ee
2018-12-02 10:13:43 +01:00
zotlabs and Mario
4010ea814a
fix mastodon tag notifications (again)
...
(cherry picked from commit 8e71324514
2018-12-02 10:13:12 +01:00
zotlabs and Mario
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
harukin
Mario Vavti
zotlabsandMario
phani00andMario
Manuel Jiménez FriazaandMario
M. DentandMario