harukin
|
4b191b9cc7
|
Merge branch 'master' into 'develop'
developのmaster追従
See merge request harukin/core!65
|
2019-09-06 12:14:46 +09: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 |
|
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 |
|
harukin
|
63d7bfde81
|
Merge branch 'origin' into 'develop'
Update 4.4.1
See merge request harukin/core!61
|
2019-08-17 08:38:51 +09:00 |
|
Mario Vavti
|
cc9f41df5f
|
bump version
|
2019-08-16 20:22:16 +02:00 |
|
Mario Vavti
|
bb3784d8dd
|
update changelog
(cherry picked from commit e5539c0d01)
|
2019-08-16 20:21:19 +02:00 |
|
zotlabs
|
c997360b4a
|
show correct profile photo when previewing and editing profiles
(cherry picked from commit 808baf203d)
|
2019-08-16 19:33:38 +02:00 |
|
zotlabs
|
88fa18204f
|
illegal offset warning (prevents encrypted signatures from being used for encrypted messages). Not fatal but can leak metadata.
(cherry picked from commit feda23587c)
|
2019-08-16 19:29:21 +02:00 |
|
Mario Vavti
|
e8f3b7f853
|
Merge branch '4.4RC'
|
2019-08-13 09:46:01 +02:00 |
|
Mario Vavti
|
e28341ca4b
|
bump version
|
2019-08-13 09:44:28 +02:00 |
|
Mario Vavti
|
6c11a020ee
|
Merge branch 'dev' into 4.4RC
|
2019-08-13 09:42:21 +02:00 |
|
Mario Vavti
|
7200c2ac0c
|
update changelog
|
2019-08-13 09:41:58 +02:00 |
|
Mario Vavti
|
732ca49b02
|
Merge branch 'dev' into 4.4RC
|
2019-08-13 09:34:32 +02:00 |
|
Mario Vavti
|
ee976ed460
|
update directory servers
|
2019-08-13 09:33:23 +02:00 |
|
Mario Vavti
|
06ac3e896a
|
Merge branch 'dev' into 4.4RC
|
2019-08-13 09:27:03 +02:00 |
|
Mario
|
6ce0f6e806
|
Merge branch 'dev_homeinstall_debian10' into 'dev'
Changes: Debian 10, MariaDB, adminer
See merge request hubzilla/core!1707
|
2019-08-13 09:23:36 +02:00 |
|
Max Kostikov
|
e006586275
|
Merge branch 'rudocs' into 'dev'
Add more Russian context help
See merge request hubzilla/core!1708
|
2019-08-12 23:01:09 +02:00 |
|
Max Kostikov
|
e9d6b17a00
|
Merge branch 'dev' into 'rudocs'
# Conflicts:
# doc/context/ru/network/help.html
|
2019-08-12 22:55:12 +02:00 |
|
OJ Random
|
bf2f199f37
|
Changes: Debian 10, MariaDB, adminer
|
2019-08-12 22:02:28 +02:00 |
|
Max Kostikov
|
718ca548be
|
Delete .gitkeep
|
2019-08-12 21:57:24 +02:00 |
|
Max Kostikov
|
51c0dc070a
|
Delete .gitkeep
|
2019-08-12 21:57:07 +02:00 |
|
Max Kostikov
|
d5e0d52bc4
|
Update help.html
|
2019-08-12 21:56:50 +02:00 |
|
Max Kostikov
|
f6b99db738
|
Update help.html
|
2019-08-12 21:52:21 +02:00 |
|
Max Kostikov
|
ef69294072
|
Update help.html
|
2019-08-12 21:52:10 +02:00 |
|
Max Kostikov
|
c56d395c90
|
Add Russian context help for Connections
|
2019-08-12 21:43:42 +02:00 |
|
Max Kostikov
|
778e9141d8
|
Add new directory
|
2019-08-12 21:27:50 +02:00 |
|
Max Kostikov
|
c70a4662b4
|
Update help.html
|
2019-08-12 21:26:43 +02:00 |
|
Max Kostikov
|
e441a31051
|
Update help.html
|
2019-08-12 12:04:46 +02:00 |
|
Max Kostikov
|
9f5ec5cc50
|
Update help.html
|
2019-08-12 12:02:00 +02:00 |
|
Max Kostikov
|
825ded2e08
|
Update help.html
|
2019-08-12 12:00:25 +02:00 |
|
Max Kostikov
|
a7c3776557
|
Merge branch 'rudocs' into 'dev'
Add Russian context help and update translation
See merge request hubzilla/core!1706
|
2019-08-12 11:56:13 +02:00 |
|
Max Kostikov
|
1e7cfc2644
|
Update help.html
|
2019-08-12 11:38:34 +02:00 |
|
Max Kostikov
|
c6fd32ffde
|
Update help.html
|
2019-08-12 11:36:35 +02: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 |
|
Max Kostikov
|
c538d7372e
|
Add Russian context help for network page
|
2019-08-12 11:25:08 +02:00 |
|
Max Kostikov
|
4e7804ca75
|
Add new directory
|
2019-08-12 10:55:50 +02:00 |
|
Max Kostikov
|
8fe715983a
|
Merge branch 'dev' into 'dev'
Updated Spanish translation
See merge request hubzilla/core!1705
|
2019-08-12 00:14:09 +02:00 |
|
Manuel Jiménez Friaza
|
4a3fb07d5f
|
Updated Spanish translation
|
2019-08-11 11:15:07 +02:00 |
|
Mario Vavti
|
f5062c0507
|
Merge branch 'dev' into 4.4RC
|
2019-08-11 10:56:00 +02:00 |
|
Mario Vavti
|
f0d7a17b72
|
linkinfo: only allow to embed public items
|
2019-08-11 10:55:38 +02:00 |
|
Manuel Jiménez Friaza
|
b89d2d7580
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2019-08-11 10:39:03 +02:00 |
|
Mario Vavti
|
7a7f57fa45
|
Merge branch 'dev' into 4.4RC
|
2019-08-11 10:23:14 +02:00 |
|
Max Kostikov
|
047dd31724
|
Merge branch 'dev' into 'dev'
Improve plink to share tag detection
See merge request hubzilla/core!1704
|
2019-08-10 11:23:51 +02:00 |
|
Max Kostikov
|
0ce1a200f7
|
Improve plink to share tag detection
|
2019-08-10 11:15:48 +02:00 |
|
Mario Vavti
|
0e0024218f
|
Merge branch 'dev' into 4.4RC
|
2019-08-09 22:21:40 +02:00 |
|