harukin
|
f560fe3b37
|
Merge branch 'develop' into 'master'
利用規約追加
See merge request harukin/core!16
|
2018-11-15 00:34:04 +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
|
d7f0b130ce
|
Merge branch 'develop' into 'master'
Merge Upstream to here. 3.8.4
See merge request harukin/core!15
|
2018-11-14 19:53:29 +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 |
|
Mario
|
daad607c7c
|
Merge branch 'dev' into 'dev'
fix shared_header img expanding to 100% width when sharing a share
See merge request hubzilla/core!1387
|
2018-11-11 13:47:03 +01:00 |
|
Max Kostikov
|
29f1f9c872
|
Merge branch 'dev' into 'dev'
# Conflicts:
# include/photo/photo_driver.php
|
2018-11-10 20:47:35 +01:00 |
|
Max Kostikov
|
a49cfa8142
|
Update photo_driver.php
|
2018-11-10 20:45:20 +01:00 |
|
Max Kostikov
|
b57d296adc
|
Preserve photo modification date
|
2018-11-10 20:35:14 +01:00 |
|
Mario
|
01d8bd445e
|
Merge branch 'dev' into 'dev'
Remove DNS check for database connection during installation...
See merge request hubzilla/core!1384
|
2018-11-10 15:02:27 +01:00 |
|
harukin
|
cb70c48b36
|
Merge branch 'develop' into 'master'
コメントのctl+enter投稿の完成(iOS未対応)
See merge request harukin/core!12
|
2018-11-10 21:31:11 +09:00 |
|
Mario Vavti
|
750d6f4be9
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-11-10 12:22:09 +01:00 |
|
Max Kostikov
|
c6e14a696e
|
Fixed wrong value assign on compare with 0
|
2018-11-10 11:56:34 +01:00 |
|
Max Kostikov
|
d34423fce9
|
Fixed wrong value assign on compare with 0
|
2018-11-10 11:53:49 +01:00 |
|
Mario
|
4999547f87
|
Merge branch 'dev' into 'dev'
Preserve received image modification date on caching
See merge request hubzilla/core!1386
|
2018-11-10 11:47:20 +01:00 |
|
Mario Vavti
|
fc5dc9717a
|
fix shared_header img expanding to 100% width when sharing a share
|
2018-11-10 11:31:06 +01:00 |
|
Max Kostikov
|
d20759c141
|
Do not return default images from vCard
|
2018-11-10 11:11:23 +01:00 |
|
Max Kostikov
|
f7b00c62a4
|
Remove unnecessary Zulu timezone mention
|
2018-11-10 10:05:28 +01:00 |
|
Max Kostikov
|
32873ce70d
|
Preserve received image modification date on caching
|
2018-11-09 22:20:41 +01:00 |
|
Max Kostikov
|
dc59561a95
|
Fixed timezone conversion
|
2018-11-09 22:17:11 +01:00 |
|
Mario
|
4bf3fdd898
|
Merge branch 'patch-1' into 'dev'
Return image modification date on remote fetch for caching
See merge request hubzilla/core!1383
|
2018-11-09 16:51:36 +01:00 |
|
harukin
|
d87eece1d2
|
コメント欄ctl+enter対応化
|
2018-11-09 22:22:36 +09:00 |
|
harukin
|
4fe4eacc00
|
ctl+enter試験実装
|
2018-11-09 22:11:12 +09:00 |
|