Commit Graph - core - PCGF Git Server

harukin/core

Archived

Fork 0

Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

c1e22f9e86 fix japanese translation php harukin 2019-09-10 01:16:40 +09:00
e6e49ae3f7 部分日本語修復 harukin 2019-09-10 00:43:05 +09:00
fd30be7644 Add selected text quote on comment reply Max Kostikov 2019-09-09 12:35:47 +02:00
4b191b9cc7 Merge branch 'master' into 'develop' harukin 2019-09-06 12:14:46 +09:00
efbe737439 Merge branch 'japanese' into 'master' harukin 2019-09-06 12:10:43 +09:00
172fe3d7ff php変換 harukin 2019-09-06 11:53:19 +09:00
5dc70562bf 機械翻訳ミスを修正 harukin 2019-09-06 11:49:55 +09:00
a598e1fc2c google翻訳で一括処理 harukin 2019-09-06 10:53:54 +09:00
d9052c7e3c Zot -> Zot6 translation issue, liking a "new friend" activity zotlabs 2019-09-03 17:00:10 -07:00
dcfe10b691 Merge branch 'dev' into 'dev' Max Kostikov 2019-09-03 14:33:37 +02:00
914a096b42 Merge branch 'dev' into 'dev' Max Kostikov 2019-09-03 14:33:09 +02:00
5fa9dcbc7e Merge branch 'dev' into 'dev' Max Kostikov 2019-09-03 14:32:52 +02:00
93ec01e0a1 More nofollow tags to discourage backlink farmers TerroxandMax Kostikov 2019-09-03 14:32:52 +02:00
bbc98db6b4 Clarify private mail deletion policy. Related to issue #1391. zotlabs 2019-08-31 14:43:08 -07:00
1f8d29a221 improved conversion of emoji reactions from zot to zot6 zotlabs 2019-08-31 14:04:10 -07:00
d267dd2515 Update Well_known.php Max Kostikov 2019-08-30 00:55:36 +02:00
51954c7f3d Add CalDAV / CardDAV autodiscovery Max Kostikov 2019-08-30 00:51:46 +02:00
df842a8e8d Merge branch 'dev' into 'dev' Max Kostikov 2019-08-24 00:00:58 +02:00
60919488f1 Better spoiler BBcode tag conversion to Markdown Max Kostikov 2019-08-23 23:58:07 +02:00
4dbaaa63bb Merge branch 'dev' into 'dev' Max Kostikov 2019-08-23 23:09:14 +02:00
8cc4003837 issues with image import to zot6 - wrong mid. Also label source project of zotfeed since it is not completely compatible across projects. zotlabs 2019-08-22 19:39:11 -07:00
35790c584b Merge branch 'dev' into 'dev' Max Kostikov 2019-08-22 20:29:53 +02:00
09d7cf2cc1 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-22 20:25:57 +02:00
58d7c7f6ae Fix attach permissions sync for clonned channel Max Kostikov 2019-08-22 20:20:54 +02:00
cab24836d8 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-22 20:20:44 +02:00
cf9ef615c9 Fix spoiler displaying while convert BBcode to markdown Max Kostikov 2019-08-22 20:17:22 +02:00
8c96032b2b Merge branch 'dev' of https://framagit.org/zot/core into dev zotlabs 2019-08-21 18:51:25 -07:00
d256551907 possible for DB to return hublocs with no sitekey zotlabs 2019-08-21 18:49:11 -07:00
e800e2db2b Return in the case of further processing DM42.Net Zap Dev 2019-08-19 23:13:19 -04:00
ae09281bb8 Merge branch 'origin' into 'master' harukin 2019-08-17 08:46:18 +09:00
9a776b3cdf Merge branch 'origin' into 'japanese' harukin 2019-08-17 08:42:47 +09:00
63d7bfde81 Merge branch 'origin' into 'develop' harukin 2019-08-17 08:38:51 +09:00
cc9f41df5f bump version Mario Vavti 2019-08-16 20:22:16 +02:00
bb3784d8dd update changelog Mario Vavti 2019-08-16 18:19:49 +00:00
e5539c0d01 update changelog Mario Vavti 2019-08-16 20:19:49 +02:00
c997360b4a show correct profile photo when previewing and editing profiles zotlabsandMario 2019-08-16 02:18:46 +00:00
ea8621d6ec Merge branch 'dev' into 'dev' Mario 2019-08-16 19:32:08 +02:00
88fa18204f illegal offset warning (prevents encrypted signatures from being used for encrypted messages). Not fatal but can leak metadata. zotlabsandMario 2019-08-13 23:53:04 +00:00
ac05a2ede7 support "bearcaps" in Activity library zotlabs 2019-08-15 21:30:47 -07:00
808baf203d show correct profile photo when previewing and editing profiles zotlabs 2019-08-15 19:18:46 -07:00
beeafc6bc5 fix bitrot in util/zotsh zotlabs 2019-08-15 16:28:06 -07:00
6f8c977e73 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-08-15 13:49:02 -07:00
9a2fbdde20 zot6 compatibility: when posting from a non-primary clone the actor->id is that of the primary, resulting in an author/owner identity mismatch. Solution is to always post with the actor->id set to the sender if it is a local channel. zotlabs 2019-08-14 17:55:56 -07:00
b325b2c003 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-14 16:35:55 +02:00
feda23587c illegal offset warning (prevents encrypted signatures from being used for encrypted messages). Not fatal but can leak metadata. zotlabs 2019-08-13 16:53:04 -07:00
e8f3b7f853 Merge branch '4.4RC' Mario Vavti 2019-08-13 09:46:01 +02:00
e28341ca4b bump version Mario Vavti 2019-08-13 09:44:28 +02:00
6c11a020ee Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-13 09:42:21 +02:00
7200c2ac0c update changelog Mario Vavti 2019-08-13 09:41:58 +02:00
732ca49b02 Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-13 09:34:32 +02:00
ee976ed460 update directory servers Mario Vavti 2019-08-13 09:33:23 +02:00
06ac3e896a Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-13 09:27:03 +02:00
6ce0f6e806 Merge branch 'dev_homeinstall_debian10' into 'dev' Mario 2019-08-13 09:23:36 +02:00
e006586275 Merge branch 'rudocs' into 'dev' Max Kostikov 2019-08-12 23:01:09 +02:00
e9d6b17a00 Merge branch 'dev' into 'rudocs' Max Kostikov 2019-08-12 22:55:12 +02:00
bf2f199f37 Changes: Debian 10, MariaDB, adminer OJ Random 2019-08-12 22:02:28 +02:00
718ca548be Delete .gitkeep Max Kostikov 2019-08-12 21:57:24 +02:00
51c0dc070a Delete .gitkeep Max Kostikov 2019-08-12 21:57:07 +02:00
d5e0d52bc4 Update help.html Max Kostikov 2019-08-12 21:56:50 +02:00
f6b99db738 Update help.html Max Kostikov 2019-08-12 21:52:21 +02:00
ef69294072 Update help.html Max Kostikov 2019-08-12 21:52:10 +02:00
c56d395c90 Add Russian context help for Connections Max Kostikov 2019-08-12 21:43:42 +02:00
778e9141d8 Add new directory Max Kostikov 2019-08-12 21:27:50 +02:00
c70a4662b4 Update help.html Max Kostikov 2019-08-12 21:26:43 +02:00
e441a31051 Update help.html Max Kostikov 2019-08-12 12:04:46 +02:00
9f5ec5cc50 Update help.html Max Kostikov 2019-08-12 12:02:00 +02:00
825ded2e08 Update help.html Max Kostikov 2019-08-12 12:00:25 +02:00
a7c3776557 Merge branch 'rudocs' into 'dev' Max Kostikov 2019-08-12 11:56:13 +02:00
1e7cfc2644 Update help.html Max Kostikov 2019-08-12 11:38:34 +02:00
c6fd32ffde Update help.html Max Kostikov 2019-08-12 11:36:35 +02:00
5f551a8b47 Update hstrings.php Max Kostikov 2019-08-12 11:33:03 +02:00
f73ff57148 Update hmessages.po Max Kostikov 2019-08-12 11:32:39 +02:00
c538d7372e Add Russian context help for network page Max Kostikov 2019-08-12 11:25:08 +02:00
4e7804ca75 Add new directory Max Kostikov 2019-08-12 10:55:50 +02:00
8fe715983a Merge branch 'dev' into 'dev' Max Kostikov 2019-08-12 00:14:09 +02:00
4a3fb07d5f Updated Spanish translation Manuel Jiménez Friaza 2019-08-11 11:15:07 +02:00
f5062c0507 Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-11 10:56:00 +02:00
f0d7a17b72 linkinfo: only allow to embed public items Mario Vavti 2019-08-11 10:55:38 +02:00
b89d2d7580 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2019-08-11 10:39:03 +02:00
7a7f57fa45 Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-11 10:23:14 +02:00
047dd31724 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-10 11:23:51 +02:00
0ce1a200f7 Improve plink to share tag detection Max Kostikov 2019-08-10 11:15:48 +02:00
0e0024218f Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-09 22:21:40 +02:00
4886d088e9 use stripos() to match the body against terms in format_hashtags() Mario Vavti 2019-08-09 22:19:51 +02:00
6eec6e2d65 update changelog Mario Vavti 2019-08-09 21:58:25 +02:00
6c12880f5b fix version Mario Vavti 2019-08-09 20:37:06 +02:00
eb472111a8 Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-09 20:35:25 +02:00
8d8b7ed567 make fetch logging less chatty Mario Vavti 2019-08-09 18:33:03 +00:00
681dc70205 Merge branch 'dev' into 4.4RC Mario Vavti 2019-08-09 20:33:45 +02:00
130cfbf231 make fetch logging less chatty Mario Vavti 2019-08-09 20:33:03 +02:00
940e4a6152 Merge branch 'dev' into 'dev' Mario 2019-08-09 20:26:54 +02:00
38f7d9ad37 Replace plink URL with 'share' tag if possible Max Kostikov 2019-08-09 19:01:21 +02:00
e896d316f2 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-09 17:05:05 +02:00
af690b64d6 More intelligent quotation shortening while link embedding Max Kostikov 2019-08-09 16:59:14 +02:00
699aad8626 Merge branch 'dev' into 'dev' Max Kostikov 2019-08-08 18:53:14 +02:00
4382e53acb Remove condition Max Kostikov 2019-08-08 18:37:05 +02:00
832adf92a6 Update zid.php Max Kostikov 2019-08-08 18:30:08 +02:00
33e2582918 Update zid.php Max Kostikov 2019-08-08 18:29:26 +02:00
1c2f413211 Formatting Max Kostikov 2019-08-08 18:27:07 +02:00
2300581c93 Catch and exclude trailing punctuation while URL embedding Max Kostikov 2019-08-08 18:19:07 +02:00

1 2 3 4 5 ...

Commit Graph Select branches Hide Pull Requests 3.6RC CAPTHA develop japanese master origin 0.10 0.11 0.8 0.9 1.0 1.1 1.10 1.12 1.14 1.14.2 1.2 1.3 1.3.1 1.4 1.6 1.8 2.0 2.2 2.4 2.4.2 2.6 2.6.1 2.6.2 2.6.3 2.8 2.8.1 3.0 3.0.1 3.2 3.2.1 3.2.2 3.4 3.4.1 3.4.2 3.6 3.6.1 Mono Color