harukin
|
bc7f029b0b
|
Merge branch 'develop' into 'master'
Update 4.6
See merge request harukin/core!71
|
2019-12-29 14:08:49 +09:00 |
|
harukin
|
6859053727
|
Revert "Revert "Merge branch 'develop' into 'origin'""
This reverts commit 8c207cf1eb.
|
2019-12-29 13:59:00 +09:00 |
|
harukin
|
8c207cf1eb
|
Revert "Merge branch 'develop' into 'origin'"
This reverts commit e1922bd555.
|
2019-12-29 13:53:59 +09:00 |
|
harukin
|
bce8c2ee5a
|
Merge branch 'origin' into 'develop'
Update 4.6
See merge request harukin/core!68
|
2019-12-29 13:33:15 +09:00 |
|
harukin
|
e1922bd555
|
Merge branch 'develop' into 'origin'
# Conflicts:
# view/ja/hstrings.php
|
2019-12-29 13:31:01 +09:00 |
|
harukin
|
84d190f81a
|
Merge branch 'japanese' into 'master'
sync Japanese translation
See merge request harukin/core!70
|
2019-12-29 13:11:47 +09:00 |
|
harukin
|
fc9a901c4c
|
Merge branch 'japanese' into 'develop'
Japanese translation sync
See merge request harukin/core!69
|
2019-12-29 13:10:22 +09:00 |
|
Mario
|
6f93d9848c
|
Disable oembed in directory profile about
|
2019-12-17 10:53:40 +01:00 |
|
Mario
|
bde429cff6
|
Merge branch '4.6RC'
|
2019-12-04 10:25:11 +00:00 |
|
Mario
|
4c8d33d1eb
|
bump version
|
2019-12-04 10:24:03 +00:00 |
|
Mario
|
fac7826efa
|
update changelog
(cherry picked from commit 295c08fcf31e44ed48284768e6df92aaa11ab964)
|
2019-12-04 11:22:56 +01:00 |
|
DM42.Net Hubzilla Development
|
3e133bbfa3
|
Move auto_save_draft to header from thread comment
(cherry picked from commit c86b35da701674510a97ccc21e46581bd864cc31)
|
2019-11-28 09:42:59 +01:00 |
|
Max Kostikov
|
6c8d1bdffe
|
Update CHANGELOG
(cherry picked from commit 9284b60a79bf226f4fef0e51f6eb58eacdb3973c)
|
2019-11-28 09:42:00 +01:00 |
|
Max Kostikov
|
59fc495593
|
Update Russian hstrings.php
(cherry picked from commit b69f8a3f298f3c80b75d4085399c4c1f03c0dfb0)
|
2019-11-28 09:41:40 +01:00 |
|
Max Kostikov
|
60827bdcc4
|
Update Russian hmessages.po
(cherry picked from commit 8ea7c08f43473560519ab3637022db6c31beec39)
|
2019-11-28 09:41:19 +01:00 |
|
Mario
|
f992feb71c
|
update changelog
(cherry picked from commit fcb065bcb2f8e61d1d9e804f8f251967732ee037)
|
2019-11-25 22:06:59 +01:00 |
|
Mario
|
cf66e66db8
|
Merge branch '4.6RC' of https://framagit.org/hubzilla/core into 4.6RC
|
2019-11-25 21:03:35 +00:00 |
|
Max Kostikov
|
63aa3948e5
|
resolve merge conflict
|
2019-11-25 21:03:22 +00:00 |
|
Max Kostikov
|
7899ed6f69
|
Revert "Add daily cached embedded content cleanup"
This reverts commit 5c47c9ed9579dc97e0a508045fe50264bb96490b
(cherry picked from commit 38de059156f9a6ec63727d47a96d1b15e96e3b47)
|
2019-11-25 21:58:36 +01:00 |
|
Max Kostikov
|
5e44239657
|
Add daily cached embedded content cleanup
(cherry picked from commit 5c47c9ed9579dc97e0a508045fe50264bb96490b)
|
2019-11-25 21:58:18 +01:00 |
|
Mario
|
17cd452fff
|
changelog
(cherry picked from commit f6f7e7e8d2a9045ac2010ab2308ef7bc5e896efa)
|
2019-11-25 12:33:36 +01:00 |
|
Mario
|
004861fbb7
|
merge opengraph fixes from dev
|
2019-11-25 08:41:34 +00:00 |
|
Manuel Jiménez Friaza
|
8727f12b18
|
no mention notifications from mastodon (and pleroma)
(cherry picked from commit ea235c0c67)
(cherry picked from commit 0159b631fcc2041009cc273b3f5308f06cee0429)
|
2019-11-21 14:49:59 +01:00 |
|
Mario
|
05604e4bd2
|
onepoll: do not update dead feeds
(cherry picked from commit 5a6b14f8787927ee6ea99c622d02875811d3a74a)
|
2019-11-15 11:03:54 +01:00 |
|
Mario
|
fd7d497cd1
|
make inline pdf a security option, move thumbnail security to security options from admin/site
(cherry picked from commit de9a7f0fa909792656d26d369f2ff21c57fc1e4d)
|
2019-11-15 11:03:38 +01:00 |
|
Mario
|
a974d0d52d
|
AP fixes
(cherry picked from commit 3009c88d246ddcafabf1965f88c5ebd8fe1717fd)
|
2019-11-15 11:02:55 +01:00 |
|
Mario
|
c850a61a89
|
check if file exists
(cherry picked from commit 52bd27a0280c736e563ccc67a9307cd75bd14d3f)
|
2019-11-13 16:26:57 +01:00 |
|
zotlabs
|
3a2fdec241
|
wildcard tag issue
(cherry picked from commit 2f4c619d510e64eeda05366e485d50f490cefebe)
|
2019-11-13 08:57:12 +01:00 |
|
Mario
|
08b804cd2d
|
use minified version of jquery
(cherry picked from commit 89342ca9fbf329d5e84839c51f26db19bdd4ac8c)
|
2019-11-11 11:17:42 +01:00 |
|
Mario
|
de7891771d
|
update strings
|
2019-11-11 08:14:42 +00:00 |
|
Mario
|
602768209b
|
bump version
|
2019-11-11 08:06:44 +00:00 |
|
Mario
|
73b1f8fcdd
|
Merge branch 'cherry-pick-1affcb80' into 'dev'
fix language tests
See merge request hubzilla/core!1782
|
2019-11-10 14:21:13 +01:00 |
|
Mario
|
e1b923ab7d
|
Merge branch 'cherry-pick-6685381f' into 'dev'
another bulk of composer updates
See merge request hubzilla/core!1781
|
2019-11-10 14:18:18 +01:00 |
|
Mario
|
bed9876d68
|
Merge branch 'cherry-pick-9ad4c652' into 'dev'
hopefully fix query for postgres
See merge request hubzilla/core!1780
|
2019-11-10 14:17:58 +01:00 |
|
Mario
|
d184e2708f
|
fix language tests
(cherry picked from commit 1affcb80172576dc46e4434cd10e1a534a9bb6c2)
|
2019-11-10 14:10:51 +01:00 |
|
Mario
|
580c3f4ffe
|
another bulk of composer updates
(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
|
2019-11-10 14:10:03 +01:00 |
|
Mario
|
158b8aea38
|
hopefully fix query for postgres
(cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c)
|
2019-11-10 12:02:12 +01:00 |
|
Max Kostikov
|
d22766f458
|
Merge branch 'cherry-pick-971e7eef' into 'dev'
remove some old unused javascript libraries
See merge request hubzilla/core!1779
|
2019-11-10 11:55:05 +01:00 |
|
Max Kostikov
|
70391243dc
|
Merge branch 'cherry-pick-b444bf59' into 'dev'
update jquery to version 3.4.1
See merge request hubzilla/core!1778
|
2019-11-10 11:54:43 +01:00 |
|
Mario
|
61eef68ff3
|
Ãremove some old unused javascript libraries
(cherry picked from commit 971e7eef9c415a2ce82eb0cd22eaabee12ae719c)
|
2019-11-10 09:59:22 +01:00 |
|
Mario
|
41cc2854c5
|
update jquery to version 3.4.1
(cherry picked from commit b444bf59560b3d918aa13b52035c602b03e8d013)
|
2019-11-10 09:58:18 +01:00 |
|
Max Kostikov
|
478014f02a
|
Better BBcode to Markdown conversion
|
2019-11-08 23:35:05 +01:00 |
|
M. Dent
|
aff7c2d771
|
Merge branch 'dev' into 'dev'
exempt svg from tag completion
See merge request hubzilla/core!1777
|
2019-11-08 23:30:30 +01:00 |
|
zotlabs
|
00dd52317a
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-11-08 13:10:24 -08:00 |
|
zotlabs
|
17522b31e9
|
exempt svg from tag completion
|
2019-11-08 13:07:42 -08:00 |
|
Max Kostikov
|
163b1ee9f8
|
Merge branch 'cherry-pick-fa437b79' into 'dev'
more fix date header format
See merge request hubzilla/core!1776
|
2019-11-08 21:35:06 +01:00 |
|
Mario
|
7b9a992f83
|
more fix date header format
(cherry picked from commit fa437b7977ba7fffd7368fa5c75e3d57fbf75424)
|
2019-11-08 21:27:43 +01:00 |
|
Max Kostikov
|
4efb258671
|
Merge branch 'cherry-pick-bb11cd15' into 'dev'
fix date header format
See merge request hubzilla/core!1775
|
2019-11-08 21:26:54 +01:00 |
|
Mario
|
7532358806
|
fix date header format
(cherry picked from commit bb11cd15d147ebbcc90b544788c9c2ef4925daa5)
|
2019-11-08 21:13:58 +01:00 |
|
Max Kostikov
|
13c05e7937
|
Merge branch 'dev' into 'dev'
Do not trim a sufficiently shortened Opengraph description
See merge request hubzilla/core!1774
|
2019-11-08 18:13:52 +01:00 |
|