harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,491 Commits 6 Branches 36 Tags 152 MiB
eb133ef9a7
Commit Graph

22491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario
eb133ef9a7 Merge branch 'patch-16' into 'dev' 
JS plurals displaying code cleanup

See merge request hubzilla/core!1338

(cherry picked from commit 721461dd3e)

b7280a44 JS plurals displaying code cleanup
ab0e2f52 Update language.php
f9c3b807 Update main.js
ce52c27a Update main.js
 2018-10-15 09:59:25 +02:00
Mario
337e25ad43 Merge branch 'patch-15' into 'dev' 
Add JS function code for plurals translation in Russian

See merge request hubzilla/core!1337

(cherry picked from commit 7042528d26)

ee4a2629 Add JS function code for plurals translation
8af91b02 Update hstrings.php
 2018-10-15 09:58:24 +02:00
Mario
c60c9b323b another min version change to mitigate caching issues. we are now at 3.8RC2.2 2018-10-13 20:22:04 +02:00
Mario
eaee27c9e4 Merge branch 'patch-14' into 'dev' 
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1336

(cherry picked from commit a2575059e2)

5c0d3187 Add date/time plurals translation in JavaScript
729d0d53 Update language.php
f68674b3 Update js_strings.tpl
3ac4337a Update main.js
e96e3dc6 Update po2php.php
54bdf59d Update js_strings.php
 2018-10-13 20:17:14 +02:00
Mario
5310f4e310 bump version to 3.8RC2.1 due to javascript changes 2018-10-13 17:32:08 +02:00
Mario Vavti
2c961328f1 Merge branch 'dev' into 3.8RC 2018-10-13 17:21:12 +02:00
Mario Vavti
c36773674e Revert "Merge branch 'patch-11' into 'dev'" 
This reverts commit e518445853, reversing
changes made to 8ce240b95c.
 2018-10-13 17:18:42 +02:00
Max Kostikov
54c615dbc2 Update hmessages.po 
(cherry picked from commit 451ee5a593)
 2018-10-13 14:55:25 +02:00
Max Kostikov
483ef09890 Update hstrings.php 
(cherry picked from commit ba3811a284)
 2018-10-13 14:54:57 +02:00
Max Kostikov
81a741e760 Update hstrings.php 
(cherry picked from commit e2241b9365)
 2018-10-13 14:54:29 +02:00
Max Kostikov
278f2a6cac New russian plurals for JavaScript 
(cherry picked from commit fe2bb84403)
 2018-10-13 14:54:05 +02:00
Mario
cf277261dc Merge branch 'patch-12' into 'dev' 
New russian plurals for JavaScript

See merge request hubzilla/core!1333
 2018-10-13 14:51:59 +02:00
Max Kostikov
451ee5a593 Update hmessages.po 2018-10-13 14:22:58 +02:00
Max Kostikov
ba3811a284 Update hstrings.php 2018-10-13 14:22:13 +02:00
Max Kostikov
e2241b9365 Update hstrings.php 2018-10-13 14:20:48 +02:00
Max Kostikov
fe2bb84403 New russian plurals for JavaScript 2018-10-13 14:20:10 +02:00
Mario Vavti
6f1067a889 version 3.8RC2 2018-10-13 14:12:09 +02:00
Mario Vavti
f0cdbd0f52 Merge branch 'dev' into 3.8RC 2018-10-13 14:11:08 +02:00
Mario Vavti
9632cafa95 bump version 2018-10-13 14:05:44 +02:00
ZotSocial Admin
321b2b9b49 Fix order of assignment and get template file before return 
(cherry picked from commit 8ebcc4439b)
 2018-10-13 14:01:43 +02:00
Mario
fb3dd5eee6 Merge branch 'dev' into 'dev' 
Fix order of assignment and get template file before return

See merge request hubzilla/core!1329
 2018-10-13 14:01:01 +02:00
Mario
e518445853 Merge branch 'patch-11' into 'dev' 
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1331
 2018-10-13 14:00:12 +02:00
Mario
8ce240b95c Merge branch 'patch-10' into 'dev' 
Missed strings added to Russian translation

See merge request hubzilla/core!1328
 2018-10-13 13:57:48 +02:00
Max Kostikov
6ae9ef571e Update language.php 2018-10-13 02:14:19 +02:00
Max Kostikov
8e5189464e Update language.php 2018-10-13 01:36:24 +02:00
Max Kostikov
0de713ff36 Update language.php 2018-10-13 01:08:06 +02:00
Max Kostikov
137bee9d27 Update language.php 2018-10-13 00:40:06 +02:00
Max Kostikov
3641ab8c7d Update language.php 2018-10-13 00:28:12 +02:00
Max Kostikov
16b6b76507 Update language.php 2018-10-13 00:25:57 +02:00
Max Kostikov
5cd9540d5f Update language.php 2018-10-13 00:24:04 +02:00
Max Kostikov
ae7873260e Update language.php 2018-10-13 00:20:23 +02:00
Max Kostikov
3dfe604ba0 Update main.js 2018-10-13 00:15:48 +02:00
Max Kostikov
3e19c4ddae Update language.php 2018-10-13 00:12:17 +02:00
Max Kostikov
de59300aaf Update js_strings.tpl 2018-10-12 23:51:01 +02:00
Max Kostikov
8cb05a91ab Update language.php 2018-10-12 23:45:52 +02:00
Max Kostikov
5f2c3f607e Add plurals translation at browser side (JS) 2018-10-12 23:43:38 +02:00
ZotSocial Admin
8ebcc4439b Fix order of assignment and get template file before return 2018-10-12 15:20:57 -04:00
Max Kostikov
b65ee01aef Update hmessages.po 2018-10-12 16:39:03 +02:00
Max Kostikov
2b311bd860 Update hstrings.php 2018-10-12 16:38:58 +02:00
Max Kostikov
a841b75b98 Update hstrings.php 2018-10-12 11:50:21 +02:00
Max Kostikov
9b3b7dc098 Update hmessages.po 2018-10-12 11:49:48 +02:00
zotlabs
f783454774 verify some edge case http signatures 
(cherry picked from commit c6bfd5e7be)
 2018-10-12 10:56:28 +02:00
Mario Vavti
81d9258e80 Merge remote-tracking branch 'mike/master' into dev 2018-10-12 09:42:57 +02:00
zotlabs
c6bfd5e7be verify some edge case http signatures 2018-10-11 21:28:47 -07:00
Max Kostikov
3c5cfd465b Update hstrings.php 2018-10-11 23:39:58 +02:00
Max Kostikov
f61f9bdc5f Missed strings added to Russian translation 2018-10-11 23:39:13 +02:00
Manuel Jiménez Friaza
2ab6e0843d Typos in Spanish translation 
(cherry picked from commit c54ba1fb86)
 2018-10-11 16:06:45 +02:00
Mario
d21bf41b6c Merge branch 'dev' into 'dev' 
Typos  in Spanish translation

See merge request hubzilla/core!1327
 2018-10-11 16:06:25 +02:00
Manuel Jiménez Friaza
c54ba1fb86 Typos in Spanish translation 2018-10-11 12:23:00 +02:00
M.Dent
4d86a199f0 Add wiki_preprocess hook and documentation 
(cherry picked from commit bad4ea6e65)
 2018-10-11 11:42:29 +02:00