Mario
4cbaddf4c4
Merge branch 'dark-fix-dev' into 'dev'
...
fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css
See merge request hubzilla/core!1442
2018-12-19 10:14:29 +01:00
phani00
aaab905e72
remove some fancy formatting.
2018-12-18 12:37:51 +01:00
Mario
6fc8c174f9
Merge branch 'dev' into 'dev'
...
Remove scale_external_images()
See merge request hubzilla/core!1441
2018-12-18 10:17:57 +01:00
Mario Vavti
63b205c601
Merge remote-tracking branch 'mike/master' into dev
2018-12-18 09:59:34 +01:00
zotlabs
15ce8bc79b
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-17 18:45:42 -08:00
zotlabs
8d70b91955
regression: mail from dev to core not delivering
2018-12-17 18:14:32 -08:00
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
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
zotlabs
06c71eec65
default curl to http/1.1
...
(cherry picked from commit 04a45a407e
2018-12-17 12:17:44 +01:00
Mario Vavti
e4c60d70b0
Merge remote-tracking branch 'mike/master' into dev
2018-12-17 10:12:53 +01:00
zotlabs
04a45a407e
default curl to http/1.1
2018-12-16 14:38:58 -08: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
harukin
e02c09d361
merge again upstream/master for 3.8.7
2018-12-15 17:17:00 +09: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
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
harukin
097afab9f4
merge from upsream
2018-12-15 00:40:38 +09:00
Mario Vavti
ad4b18cbbe
return on readImageBlob() exception
...
(cherry picked from commit 993db01400
2018-12-14 11:31:11 +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
Mario Vavti
993db01400
return on readImageBlob() exception
2018-12-11 12:21:09 +01:00
Mario Vavti
15a689c6f5
Merge remote-tracking branch 'mike/master' into dev
2018-12-10 10:38:06 +01:00
zotlabs
214b81e491
rmagic discovery for z6 networks
2018-12-09 16:37:15 -08:00
harukin
e8acf7e87a
merge from upsream 3.8.6 release
2018-12-04 23:52:59 +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
zotlabs
ffc3dba682
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-03 19:19:31 -08:00
zotlabs
7d694dca07
more work on z6 commenting
2018-12-03 18:50:45 -08: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
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
zotlabs
4bf3d4d87a
attached photo permissions regression
...
(cherry picked from commit 6cade7d935
2018-12-02 10:17:29 +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
Max Kostikov
2a57e00cb4
Remove local_channel() check on cache_body_hook call
2018-12-02 10:07:12 +01:00
M. Dent
52424b0f9c
Merge branch 'pdf_embed_fixes' into 'dev'
...
make pdf preview 100% width and 300px height to match it openstreetmaps preview
See merge request hubzilla/core!1414
2018-12-02 05:09:45 +01:00
Mario Vavti
fdb0459288
Merge remote-tracking branch 'mike/master' into dev
2018-12-01 21:43:54 +01:00
Mario Vavti
df84352385
make pdf preview 100% width and 300px height to match it openstreetmaps preview
2018-12-01 21:37:33 +01:00
zotlabs
6cade7d935
attached photo permissions regression
2018-11-30 13:54:17 -08:00
Max Kostikov
c857ecab46
Create plink depending on message id format
2018-11-30 19:56:49 +01:00
