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
|
e1922bd555
|
Merge branch 'develop' into 'origin'
# Conflicts:
# view/ja/hstrings.php
|
2019-12-29 13:31:01 +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 |
|
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
|
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 |
|
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
|
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
|
08b804cd2d
|
use minified version of jquery
(cherry picked from commit 89342ca9fbf329d5e84839c51f26db19bdd4ac8c)
|
2019-11-11 11:17:42 +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 |
|
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
|
e9a9fc5050
|
Merge branch 'dev' into 'dev'
Update Russian translation
See merge request hubzilla/core!1771
|
2019-11-07 14:24:19 +01:00 |
|
Max Kostikov
|
426668cd2e
|
Update hstrings.php
|
2019-11-07 14:14:41 +01:00 |
|
Max Kostikov
|
926d7c56a6
|
Update hmessages.po
|
2019-11-07 14:13:29 +01:00 |
|
harukin
|
972270ff3e
|
fix plural code
|
2019-10-27 09:44:24 +09:00 |
|
Mario
|
e27b19c756
|
fix hardcoded code/pre css in mod admin
(cherry picked from commit cddf6c4ff51580f3dec5d32eef06a40a473a9202)
|
2019-10-22 13:29:52 +02:00 |
|
Mario
|
045cb461f1
|
fix encoding issue
(cherry picked from commit 067010fc0a5a6c10825b869b822c9cfbb3d4516b)
|
2019-10-22 10:39:54 +02:00 |
|
harukin
|
e5137b03fc
|
Update view/ja/hstrings.php
|
2019-10-19 18:41:58 +02:00 |
|
harukin
|
76d34a4d74
|
Update view/ja/hmessages.po, view/ja/hstrings.php files
|
2019-10-17 17:57:23 +02:00 |
|
harukin
|
a3f7121a3a
|
fix translation miss
|
2019-10-18 00:56:42 +09:00 |
|
harukin
|
a65453676f
|
fix plural-Forms
|
2019-10-15 00:56:49 +09:00 |
|
harukin
|
1fc82c5daf
|
edit translation
|
2019-10-14 10:41:40 +09:00 |
|
harukin
|
d2b1a2e5a3
|
Upload .php file
|
2019-10-14 03:39:43 +02:00 |
|
harukin
|
4b01f6359b
|
Upload .po file
|
2019-10-14 03:39:05 +02:00 |
|
harukin
|
bcfa62f45a
|
japanese translation directory
|
2019-10-14 03:34:24 +02:00 |
|
harukin
|
ca50e9e6d6
|
edit translation
|
2019-10-10 08:39:58 +09:00 |
|
Mario Vavti
|
c2655370e0
|
issue #1401
(cherry picked from commit cac0672a49cd710b3eced1d66f1bfb18747ddbf8)
|
2019-10-08 11:28:36 +02:00 |
|
Max Kostikov
|
541146e8ce
|
Add 'Connect' button for not connected at this location channels
|
2019-10-01 11:15:29 +02:00 |
|
Max Kostikov
|
ba3a6ecb52
|
Fix empty string quotation; remove trailing spaces
|
2019-09-30 16:50:24 +02:00 |
|
harukin
|
4f9f5ac3e6
|
edit translation
|
2019-09-26 14:27:04 +09:00 |
|
harukin
|
9a61b7682b
|
言語ファイル調整
|
2019-09-15 10:10:39 +09:00 |
|
Max Kostikov
|
cc45129e9f
|
Merge branch 'dev' into 'dev'
Add selected text quote on comment reply
See merge request hubzilla/core!1724
|
2019-09-10 10:41:53 +02:00 |
|
harukin
|
c1e22f9e86
|
fix japanese translation php
|
2019-09-10 01:16:40 +09:00 |
|
harukin
|
e6e49ae3f7
|
部分日本語修復
|
2019-09-10 00:43:05 +09:00 |
|
Max Kostikov
|
fd30be7644
|
Add selected text quote on comment reply
|
2019-09-09 12:35:47 +02:00 |
|
harukin
|
efbe737439
|
Merge branch 'japanese' into 'master'
言語ファイル翻訳暫定完了
See merge request harukin/core!64
|
2019-09-06 12:10:43 +09:00 |
|
harukin
|
172fe3d7ff
|
php変換
|
2019-09-06 11:53:19 +09:00 |
|
harukin
|
5dc70562bf
|
機械翻訳ミスを修正
|
2019-09-06 11:49:55 +09:00 |
|
harukin
|
a598e1fc2c
|
google翻訳で一括処理
|
2019-09-06 10:53:54 +09:00 |
|
Terrox
|
93ec01e0a1
|
More nofollow tags to discourage backlink farmers
|
2019-09-03 14:32:52 +02:00 |
|
harukin
|
ae09281bb8
|
Merge branch 'origin' into 'master'
Update 4.4.1
See merge request harukin/core!63
|
2019-08-17 08:46:18 +09:00 |
|
harukin
|
9a776b3cdf
|
Merge branch 'origin' into 'japanese'
Update 4.4.1
See merge request harukin/core!62
|
2019-08-17 08:42:47 +09:00 |
|
Max Kostikov
|
5f551a8b47
|
Update hstrings.php
|
2019-08-12 11:33:03 +02:00 |
|
Max Kostikov
|
f73ff57148
|
Update hmessages.po
|
2019-08-12 11:32:39 +02:00 |
|
Manuel Jiménez Friaza
|
4a3fb07d5f
|
Updated Spanish translation
|
2019-08-11 11:15:07 +02:00 |
|
Max Kostikov
|
75a8b209f5
|
Update hstrings.php
|
2019-08-02 23:42:09 +02:00 |
|
Max Kostikov
|
d554b41fea
|
Update hmessages.po
|
2019-08-02 23:41:54 +02:00 |
|
Max Kostikov
|
95805d2e7c
|
Update hstrings.php
|
2019-07-31 19:50:07 +02:00 |
|