harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,587 Commits 6 Branches 36 Tags 152 MiB
8f10b58cb1
Commit Graph

23587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs
e28dab17d6 app update and ownership issues 2018-07-27 13:59:27 -07:00
Max Kostikov
05b3237bae Update nav.php 2018-07-27 11:50:04 +02:00
Max Kostikov
4fd9d1ee5f Update Apps.php 2018-07-27 11:29:38 +02:00
Max Kostikov
0fe7004d38 Update Apps.php 2018-07-27 11:03:02 +02:00
Max Kostikov
06b0dbdfba Update hstrings.php 2018-07-26 12:21:33 +02:00
Max Kostikov
48fb3d3653 Update hmessages.po 2018-07-26 12:20:53 +02:00
Max Kostikov
baa5fd9739 Update passchanged_eml.tpl 2018-07-26 12:19:59 +02:00
Max Kostikov
e01c277c56 Update lostpass_eml.tpl 2018-07-26 12:18:54 +02:00
Mario Vavti
7062a7ce66 fix sql error 
(cherry picked from commit ec3a066e4e)
 2018-07-26 09:34:48 +02:00
Mario Vavti
ec3a066e4e fix sql error 2018-07-26 09:32:52 +02:00
kostikov
b0c8e75c6e Fix duplicate transport displaying 2018-07-25 22:28:21 +02:00
Mario Vavti
52ad5b7df5 version 3.6 2018-07-25 10:28:52 +02:00
Mario Vavti
1b1d11dcf1 Merge branch '3.6RC' 2018-07-25 10:19:19 +02:00
Mario Vavti
35200e5f1b Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC 2018-07-25 10:15:23 +02:00
Mario
d39942902c Merge branch 'patch-4' into 'dev' 
Update hmessages.po

See merge request hubzilla/core!1238
 2018-07-23 19:57:43 +02:00
Mario
87fc4e6588 Merge branch 'patch-5' into 'dev' 
Update hstrings.php

See merge request hubzilla/core!1239
 2018-07-23 19:57:10 +02:00
Mario
091ef33f18 Merge branch 'patch-2' into 'dev' 
Escape internal quotes in translation on export

See merge request hubzilla/core!1237

(cherry picked from commit 84e57d040b)

64efd07f Escape internal quotes in translation on export
87857fe5 Update hmessages.po
3342fc22 Update hstrings.php
 2018-07-23 19:55:25 +02:00
Mario
84e57d040b Merge branch 'patch-2' into 'dev' 
Escape internal quotes in translation on export

See merge request hubzilla/core!1237
 2018-07-23 19:55:00 +02:00
kostikov
a4f64c02d0 Update hstrings.php 2018-07-23 12:20:50 +02:00
kostikov
278eeb5ee9 Update hmessages.po 2018-07-23 12:19:46 +02:00
kostikov
3342fc2244 Update hstrings.php 2018-07-23 12:15:10 +02:00
kostikov
87857fe5d9 Update hmessages.po 2018-07-23 12:14:33 +02:00
kostikov
64efd07f6b Escape internal quotes in translation on export 2018-07-22 19:39:53 +02:00
Mario Vavti
aa01c2f4db update changelog 
(cherry picked from commit 6be66d6df9)
 2018-07-21 22:08:12 +02:00
Mario Vavti
6be66d6df9 update changelog 2018-07-21 22:01:59 +02:00
kostikov
740015339d Add var to respect current hstrings.php format 
(cherry picked from commit 062633d312)
 2018-07-21 11:39:20 +02:00
kostikov
b7778ca1f9 Update php2po.php 
(cherry picked from commit f9b18aa62f)
 2018-07-21 11:38:35 +02:00
kostikov
ddd77ee6ee Update update_fail_eml.tpl 
(cherry picked from commit 8fc7f2aca1)
 2018-07-21 11:37:27 +02:00
kostikov
b625b5f645 Update register_verify_eml.tpl 
(cherry picked from commit b6c2c8117e)
 2018-07-21 11:36:58 +02:00
kostikov
c9e272a78d Update register_open_eml.tpl 
(cherry picked from commit 86a42aad16)
 2018-07-21 11:35:30 +02:00
kostikov
9bfb63fd98 Update passchanged_eml.tpl 
(cherry picked from commit 8e2e09bb16)
 2018-07-21 11:35:07 +02:00
kostikov
21ecf54b73 Update lostpass_eml.tpl 
(cherry picked from commit 3713aa210f)
 2018-07-21 11:34:42 +02:00
kostikov
429e3ce30a Add new file 
(cherry picked from commit a65c23546b)
 2018-07-21 11:34:14 +02:00
kostikov
26e20d35c2 Update hstrings.php 
(cherry picked from commit 790a9155d4)
 2018-07-21 11:32:57 +02:00
kostikov
f40406514c Update hmessages.po 
(cherry picked from commit f141b845fd)
 2018-07-21 11:32:33 +02:00
Mario
a68934f498 Merge branch 'patch-2' into 'dev' 
New russian templates

See merge request hubzilla/core!1233
 2018-07-21 11:29:09 +02:00
Mario
95ef78ab23 Merge branch 'patch-1' into 'dev' 
Add var to respect current hstrings.php format

See merge request hubzilla/core!1231
 2018-07-21 11:27:49 +02:00
Mario
5be0743751 Merge branch 'dev' into 'dev' 
Update russian translation for 3.6

See merge request hubzilla/core!1230
 2018-07-21 11:26:43 +02:00
kostikov
8fc7f2aca1 Update update_fail_eml.tpl 2018-07-20 19:28:45 +02:00
kostikov
4db4ab9798 Create register_verify_member.tpl 2018-07-20 19:28:13 +02:00
kostikov
b6c2c8117e Update register_verify_eml.tpl 2018-07-20 19:27:29 +02:00
kostikov
86a42aad16 Update register_open_eml.tpl 2018-07-20 19:26:54 +02:00
kostikov
8e2e09bb16 Update passchanged_eml.tpl 2018-07-20 19:26:24 +02:00
kostikov
3713aa210f Update lostpass_eml.tpl 2018-07-20 19:25:46 +02:00
kostikov
a65c23546b Add new file 2018-07-20 19:21:58 +02:00
Mario Vavti
ed79bef51b prevent double file uploads when dropping files into jot 
(cherry picked from commit f6de91bf0f)
 2018-07-20 16:45:50 +02:00
Mario Vavti
f6de91bf0f prevent double file uploads when dropping files into jot 2018-07-20 16:44:43 +02:00
kostikov
062633d312 Add var to respect current hstrings.php format 2018-07-20 16:40:35 +02:00
Mario Vavti
0cde7f9897 fix jot drag and drop 
(cherry picked from commit c72f6e6ea8)
 2018-07-20 10:43:38 +02:00
Mario Vavti
4a54699c1f Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-20 10:42:45 +02:00