zotlabs
a33ed05bec
fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit.
2018-12-17 11:32:59 -08:00
phani00
aace8a14ce
new fix for dark theme
...
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css
this works for all schemas incl. dark.
2018-12-17 15:28:15 +00:00
phani00
d80b8ff30f
Merge branch 'dev' into dark-fix-dev
2018-12-17 15:18:24 +00:00
Max Kostikov
3a66255576
Remove scale_external_images()
2018-12-17 13:29:37 +01:00
Max Kostikov
1541f67eab
Remove scale_external_images()
2018-12-17 13:28:58 +01:00
Max Kostikov
a2959c6e9e
Remove scale_external_images()
2018-12-17 13:28:18 +01:00
phani00
70a7661711
remove my dark theme fixes.
2018-12-17 10:08:45 +00:00
Mario
d190b1995b
Merge branch 'dev' into 'dev'
...
Keep remote site headers to respect caching policy
See merge request hubzilla/core!1440
2018-12-17 10:55:53 +01:00
Mario
a6f8230063
Merge branch 'memory-warn2' into 'dev'
...
add warning if upload_filesize < 4MB.
See merge request hubzilla/core!1438
2018-12-17 10:55:29 +01:00
Mario Vavti
e4c60d70b0
Merge remote-tracking branch 'mike/master' into dev
2018-12-17 10:12:53 +01:00
Max Kostikov
4d8a815932
Keep remote site headers for caching
2018-12-17 09:34:30 +01:00
Max Kostikov
b0e5f5973a
Merge branch 'dev' into 'dev'
...
Move SSLify code from Photo cache addon
See merge request hubzilla/core!1439
2018-12-17 09:19:08 +01:00
Max Kostikov
05cb4fd897
Move SSLify code from Photo cache addon
2018-12-17 09:13:03 +01:00
Max Kostikov
72dc6ea77c
Revert Photos.php code
2018-12-17 01:16:08 +01:00
Max Kostikov
1b0a6fe9eb
SSLify cached URL on redirect if needed
2018-12-17 00:58:46 +01:00
Max Kostikov
363ad01bce
SSLify cached URL on redirect if needed
2018-12-17 00:30:36 +01:00
zotlabs
04a45a407e
default curl to http/1.1
2018-12-16 14:38:58 -08:00
phani00
14735e0a48
Update Zotlabs/Module/Setup.php
2018-12-16 22:04:28 +01:00
phani00
1c07428f89
add warning if upload_filesize < 4MB.
2018-12-16 20:35:20 +00:00
Max Kostikov
e0d68664c4
Remove photo_cache_enable variable
2018-12-16 20:48:36 +01:00
Mario
6c72c3d4a5
Merge branch 'patch-20181214a' into 'dev'
...
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
See merge request hubzilla/core!1427
2018-12-16 20:08:52 +01:00
DM42.Net (Matt Dent)
5bcc379530
Add return if no local_channel()
2018-12-15 19:49:59 -05:00
M. Dent
c854ec0686
Merge branch 'dev' into 'dev'
...
Update OAuth2Storage.php - fix email retrieval in getUser
See merge request hubzilla/core!1436
2018-12-15 22:33:03 +01:00
Pascal Deklerck
6a825cc504
Update OAuth2Storage.php - fix email retrieval in getUser
2018-12-15 22:19:18 +01:00
Mario
3ed6763da9
Merge branch 'custom-item-types' into 'dev'
...
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
See merge request hubzilla/core!1431
2018-12-15 20:55:28 +01:00
Mario
dbeabb8ff0
Merge branch 'patch-20181214f' into 'dev'
...
Set min/maxversion for plugins to STD_VERSION unless otherwise specified
See merge request hubzilla/core!1430
2018-12-15 20:32:01 +01:00
Mario
cc66e1d966
Merge branch 'patch-20181214d' into 'dev'
...
Make Affinity Slider (optionally) 'sticky' across page loads.
See merge request hubzilla/core!1429
2018-12-15 20:31:06 +01:00
Mario Vavti
919ea9f750
fix wiki preview issue with hyperlinks
2018-12-15 18:19:29 +01:00
DM42.Net (Matt Dent)
09b2cdd618
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
2018-12-14 20:20:26 -05:00
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
4ff3c57976
update changelog
2018-12-14 21:46:48 +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 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
