harukin
|
93113e0f00
|
edit translation /settings/channel fin
|
2018-11-26 03:29:31 +09:00 |
|
harukin
|
236692908a
|
edit translation /settings/channel
|
2018-11-26 03:22:27 +09:00 |
|
harukin
|
6eea7c7e50
|
edit translation /settings/channel
|
2018-11-26 00:48:51 +09:00 |
|
harukin
|
31516acec2
|
edit translation /settings/editor/ fin
|
2018-11-26 00:32:55 +09:00 |
|
harukin
|
c9728961bf
|
edit settings/editor/ launguage
|
2018-11-26 00:12:46 +09:00 |
|
harukin
|
7bd89a9ab1
|
|
2018-11-26 00:00:41 +09:00 |
|
harukin
|
1a1e8463cc
|
Merge branch 'develop' into 'japanese'
merge from upsream 3.8.5 release
See merge request harukin/core!19
|
2018-11-19 21:44:09 +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 |
|
Mario Vavti
|
5cb4cdaa5e
|
changelog
|
2018-11-19 11:10:22 +01:00 |
|
Mario
|
7be1d9e45a
|
Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts
See merge request hubzilla/core!1398
(cherry picked from commit f34af496ec)
3787c490 Fix: delayed items propagate before publication on cloned channels
|
2018-11-19 10:45:01 +01:00 |
|
Mario Vavti
|
ae97649948
|
update sql schemas to include update column in pconfig table
|
2018-11-19 10:42:18 +01:00 |
|
Mario Vavti
|
f15e32d063
|
recalculate photo filesize when rotating an image
|
2018-11-17 09:41:26 +01:00 |
|
Mario Vavti
|
afc75af62f
|
strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead.
|
2018-11-16 22:14:11 +01:00 |
|
Mario
|
2778a7220f
|
Merge branch 'master' into 'master'
delivery issue
See merge request hubzilla/core!1397
|
2018-11-16 10:29:45 +01:00 |
|
zotlabs
|
26f593afaa
|
delivery issue
|
2018-11-15 13:52:25 -08:00 |
|
harukin
|
839a29a2a6
|
Merge branch 'develop' into 'japanese'
利用規約追加
See merge request harukin/core!17
|
2018-11-15 00:33:51 +09:00 |
|
harukin
|
81bc44b30f
|
利用規約追加
|
2018-11-15 00:33:51 +09:00 |
|
harukin
|
58083ccb0c
|
|
2018-11-15 00:28:19 +09:00 |
|
harukin
|
976a4da0a1
|
|
2018-11-15 00:25:55 +09:00 |
|
harukin
|
74c48e5906
|
利用規約追加
|
2018-11-15 00:24:20 +09:00 |
|
harukin
|
1d0ad72800
|
Merge branch 'develop' into 'japanese'
Merge Upstream to here. 3.8.4
See merge request harukin/core!14
|
2018-11-14 19:51:21 +09:00 |
|
harukin
|
23b65c8e6e
|
Merge Upstream to here. 3.8.4
|
2018-11-14 19:45:51 +09:00 |
|
Mario Vavti
|
beac45b075
|
more changelog
|
2018-11-14 11:20:39 +01:00 |
|
Mario Vavti
|
dfc5159aa3
|
Merge branch 'dev'
|
2018-11-14 11:12:20 +01:00 |
|
Mario Vavti
|
886cdb440b
|
changelog and version
|
2018-11-14 11:08:25 +01:00 |
|
Mario
|
6ed9443972
|
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b
See merge request hubzilla/core!1395
|
2018-11-14 09:30:54 +01:00 |
|
Mario
|
08e0f172de
|
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
|
2018-11-14 09:30:28 +01:00 |
|
DM42.Net (Matt Dent)
|
f1d168f781
|
Fix double escaping after xss fix
|
2018-11-13 23:06:00 -05:00 |
|
DM42.Net (Matt Dent)
|
302d9796c4
|
Revert "Filter search box before display"
This reverts commit 35e66770be.
|
2018-11-13 22:59:36 -05:00 |
|
M. Dent
|
1260887fa7
|
Merge branch 'patch-20181113a' into 'dev'
Patch 20181113a
See merge request hubzilla/core!1394
|
2018-11-14 03:21:32 +01:00 |
|
DM42.Net (Matt Dent)
|
ce8073d25e
|
Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix to search xss and Superblock fix.
|
2018-11-13 20:19:12 -05:00 |
|
zotlabs
|
31f4d9066b
|
xss in search
|
2018-11-13 14:23:56 -08:00 |
|
DM42.Net (Matt Dent)
|
35e66770be
|
Filter search box before display
|
2018-11-13 17:20:21 -05:00 |
|
Max Kostikov
|
cf2f7f2132
|
Update Photo.php
|
2018-11-13 12:52:35 +01:00 |
|
Max Kostikov
|
a145559662
|
Remove uneccessary include/photos.php
|
2018-11-13 11:45:18 +01:00 |
|
Max Kostikov
|
d029e3dc16
|
Text formatting in Photo.php
|
2018-11-13 11:39:42 +01:00 |
|
Max Kostikov
|
286326a98e
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:38:49 +01:00 |
|
Max Kostikov
|
2f59d78737
|
Remove fetch_image_from_url() because of functions duplicate
|
2018-11-13 11:37:32 +01:00 |
|
Max Kostikov
|
adf4782076
|
Merge branch 'revert-6375f2d7' into 'dev'
Revert "Replace fetch_image_from_url() with z_fetch_url()"
See merge request hubzilla/core!1392
|
2018-11-13 11:36:02 +01:00 |
|
Max Kostikov
|
b38ffef2be
|
Revert "Replace fetch_image_from_url() with z_fetch_url()"
This reverts commit 6375f2d73a
|
2018-11-13 11:25:46 +01:00 |
|
Max Kostikov
|
6375f2d73a
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:25:14 +01:00 |
|
M. Dent
|
a7d3a49171
|
Merge branch 'fix-activity-filter-widget' into 'dev'
use the correct javascript function for this case
See merge request hubzilla/core!1390
|
2018-11-12 21:50:08 +01:00 |
|
M. Dent
|
920e7db709
|
Merge branch 'css-fixes' into 'dev'
css fixes
See merge request hubzilla/core!1391
|
2018-11-12 21:49:07 +01:00 |
|
zotlabs
|
4a6b45cf04
|
enotify::format hook for superblock
|
2018-11-12 11:13:36 -08:00 |
|
Mario Vavti
|
7bd60adfbe
|
fix css issues in bbcode conversion and focus-light schema
|
2018-11-12 09:35:12 +01:00 |
|
Mario Vavti
|
c335719e8f
|
use the correct javascript function for this case
|
2018-11-11 14:46:35 +01:00 |
|
Mario Vavti
|
d57cdf645e
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-11-11 14:01:25 +01:00 |
|
Mario
|
e47a96bf24
|
Merge branch 'dev' into 'dev'
Preserve photo modification date on edit
See merge request hubzilla/core!1389
|
2018-11-11 13:49:29 +01:00 |
|