Max Kostikov
1e526e68ab
Merge branch 'patch-20181214b' into 'dev'
...
Recreate MR#1419 for dev branch
See merge request hubzilla/core!1428
2018-12-14 22:58:22 +01:00
Mario Vavti
d77c7d51e3
update changelog
...
(cherry picked from commit 4ff3c57976
2018-12-14 21:47:20 +01:00
Mario Vavti
4ff3c57976
update changelog
2018-12-14 21:46:48 +01:00
Mario Vavti
d51d0160d3
fix issue with linkdropper
...
(cherry picked from commit f81a3ba45d
2018-12-14 21:32:23 +01:00
zotlabs
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
DM42.Net (Matt Dent)
3416190e4b
Set min/maxversion for plugins to STD_VERSION unless otherwise specified
2018-12-14 14:22:28 -05:00
DM42.Net (Matt Dent)
de7cb6d6ad
Fix syntax error
2018-12-14 13:59:41 -05:00
DM42.Net (Matt Dent)
eb297104de
Make Affinity Slider (optionally) 'sticky' across page loads. (default is current behavior: reset slider with each page load)
2018-12-14 12:55:49 -05:00
DM42.Net (Matt Dent)
03a214c8b9
Recreate MR#1419 for dev branch
2018-12-14 10:05:41 -05:00
DM42.Net (Matt Dent)
3f06a857c2
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
2018-12-14 09:55:27 -05: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
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
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
f20a923dd7
total_identities restriction off by one
...
(cherry picked from commit e60fb17524
2018-12-14 11:29:33 +01:00
zotlabs
30403da326
reset page title if article has no title.
...
(cherry picked from commit 8ab1f31058
2018-12-14 11:29:06 +01:00
Mario Vavti
f81a3ba45d
fix issue with linkdropper
2018-12-14 11:23:08 +01:00
Mario Vavti
c771d2809f
Merge remote-tracking branch 'mike/master' into dev
2018-12-14 10:28:55 +01:00
zotlabs
fc78206049
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-13 16:13:13 -08:00
zotlabs
6464099364
regression: the ability to order apps messed up since adding pinned apps to the ordering
2018-12-12 19:11:30 -08:00
Max Kostikov
6bea3d6bfc
Merge branch 'fix_photo_imagick' into 'dev'
...
return on readImageBlob() exception
See merge request hubzilla/core!1426
2018-12-11 13:31:34 +01:00
Mario Vavti
993db01400
return on readImageBlob() exception
2018-12-11 12:21:09 +01:00
M. Dent
4cb4f17500
Merge branch 'photo-hook' into 'dev'
...
add photo_view_filter hook and fix minor issue with unset auto_save_draft…
See merge request hubzilla/core!1425
2018-12-10 21:49:12 +01:00
Mario Vavti
15a689c6f5
Merge remote-tracking branch 'mike/master' into dev
2018-12-10 10:38:06 +01:00
Mario Vavti
7894fed741
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
2018-12-10 10:37:29 +01:00
M. Dent
61f7c1e7d7
Merge branch 'dark-theme-dev' into 'dev'
...
change redbasic dark schema to make categories and highlights readable
See merge request hubzilla/core!1424
2018-12-10 05:36:58 +01:00
zotlabs
30efeb5bec
home notifications won't expand if there are more than 300 unseen network notifications ahead of them.
2018-12-09 20:24:04 -08:00
phani00
18caf0273f
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.
2018-12-10 03:03:28 +00:00
zotlabs
214b81e491
rmagic discovery for z6 networks
2018-12-09 16:37:15 -08:00
zotlabs
e60fb17524
total_identities restriction off by one
2018-12-09 11:20:57 -08:00
Mario Vavti
7f65d82a74
Merge remote-tracking branch 'mike/master' into dev
2018-12-06 12:50:23 +01:00
zotlabs
8ab1f31058
reset page title if article has no title.
2018-12-05 16:24:30 -08: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
