Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-17' into 'dev' | Mario | 2018-10-16 | 2 | -101/+116 |
| | | | | | | | | | | Add Russian translations to Newmember widget See merge request hubzilla/core!1339 (cherry picked from commit ed08eb07c63223d09011eab90709d8f3da44f549) 04edb741 Add Russian translations to Newmember widget d2d6f8c9 Update hstrings.php | ||||
* | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 1 | -6/+7 |
| | | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 (cherry picked from commit 721461dd3e8cb6990ace54688ace953374506daf) b7280a44 JS plurals displaying code cleanup ab0e2f52 Update language.php f9c3b807 Update main.js ce52c27a Update main.js | ||||
* | Merge branch 'patch-15' into 'dev' | Mario | 2018-10-15 | 1 | -0/+1 |
| | | | | | | | | | | Add JS function code for plurals translation in Russian See merge request hubzilla/core!1337 (cherry picked from commit 7042528d267627c7156b8e0cd3b825d2c88c2350) ee4a2629 Add JS function code for plurals translation 8af91b02 Update hstrings.php | ||||
* | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 2 | -20/+22 |
| | | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 (cherry picked from commit a2575059e2a068a67cd984888422265c6888f261) 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 | ||||
* | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 2 | -23/+20 |
|\ | |||||
| * | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 2 | -23/+20 |
| | | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849. | ||||
| * | Update hmessages.po | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -7/+27 |
| | | |||||
| * | New russian plurals for JavaScript | Max Kostikov | 2018-10-13 | 1 | -96/+111 |
| | | |||||
* | | Update hmessages.po | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | | | | | (cherry picked from commit 451ee5a5935af94adb4658a347a4a31a540e713a) | ||||
* | | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | | | | | (cherry picked from commit ba3811a2849bbe4c0ec1689ceb8127484dde6343) | ||||
* | | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -7/+27 |
| | | | | | | (cherry picked from commit e2241b9365e950d941a881f03743be556cac0d40) | ||||
* | | New russian plurals for JavaScript | Max Kostikov | 2018-10-13 | 1 | -96/+111 |
| | | | | | | (cherry picked from commit fe2bb84403f656795d5a5521d00218ee436f377b) | ||||
* | | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 4 | -13612/+13762 |
|\| | |||||
| * | Merge branch 'patch-11' into 'dev' | Mario | 2018-10-13 | 2 | -20/+23 |
| |\ | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1331 | ||||
| | * | Update main.js | Max Kostikov | 2018-10-13 | 1 | -19/+22 |
| | | | |||||
| | * | Update js_strings.tpl | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update hmessages.po | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-10-12 | 1 | -2/+2 |
| | | | |||||
| * | | Update hmessages.po | Max Kostikov | 2018-10-12 | 1 | -2/+2 |
| | | | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-10-11 | 1 | -4/+4 |
| | | | |||||
| * | | Missed strings added to Russian translation | Max Kostikov | 2018-10-11 | 1 | -92/+92 |
| |/ | |||||
| * | Typos in Spanish translation | Manuel Jiménez Friaza | 2018-10-11 | 2 | -7/+7 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-10 | 1 | -1/+1 |
| | | |||||
| * | Formatting fix in russian translation | Max Kostikov | 2018-10-10 | 1 | -1/+1 |
| | | |||||
| * | fix minor issue in dark and light schemas | Mario Vavti | 2018-10-10 | 2 | -1/+3 |
| | | |||||
| * | fix even more wiki issues | Mario Vavti | 2018-10-10 | 3 | -4/+4 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-10 | 2 | -41/+41 |
| |\ | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-10-10 | 2 | -41/+41 |
| | |\ | | | | | | | | | | | | | | | | | Fixed some errors in Spanish translation See merge request hubzilla/core!1323 | ||||
| | | * | Fixed some errors in Spanish translation | Manuel Jiménez Friaza | 2018-10-09 | 2 | -41/+41 |
| | | | | |||||
| * | | | fix some more wiki issues | Mario Vavti | 2018-10-10 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge branch 'fix-wiki-escaping' into 'dev' | M. Dent | 2018-10-10 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | | | | Fix escaping quote for wiki_delete_page See merge request hubzilla/core!1324 | ||||
| | * | Fix escaping quote for wiki_delete_page | M.Dent | 2018-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'fix-wiki-escaping' into 'dev' | Mario | 2018-10-08 | 2 | -2/+3 |
| |\| | | | | | | | | | | | | | Fix wiki escaping (Regression tests needed) See merge request hubzilla/core!1321 | ||||
| | * | Rework Wiki encoding scheme. | M.Dent | 2018-10-08 | 2 | -2/+3 |
| | | | |||||
| * | | Update Spanish translation | Manuel Jiménez Friaza | 2018-10-08 | 2 | -3472/+4305 |
| |/ | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-08 | 1 | -2676/+2682 |
| | | |||||
| * | New russian translation | Max Kostikov | 2018-10-08 | 1 | -10919/+11059 |
| | | |||||
| * | those 3px make a difference on medium sized screens | Mario Vavti | 2018-10-06 | 1 | -1/+1 |
| | | |||||
| * | give apps some more space and prevent linebreaks in app names. Add ellipsis ↵ | Mario Vavti | 2018-10-06 | 1 | -2/+5 |
| | | | | | | | | to too long names. | ||||
| * | move profile assign selector to profile settings and personal menu selector ↵ | Mario Vavti | 2018-10-06 | 2 | -37/+1 |
| | | | | | | | | to channel_home settings and get rid of misc channel settings section. | ||||
| * | New russian translations hmessages.po | Max Kostikov | 2018-10-05 | 1 | -11229/+11308 |
| | | | | | | (cherry picked from commit ff53da5b0a796d1ae4c6d3e217af927da982b802) | ||||
| * | New russian translations hstrings.php | Max Kostikov | 2018-10-05 | 1 | -2804/+2842 |
| | | | | | | (cherry picked from commit 9520123f6de69543f52f30a10da814c855791a05) | ||||
* | | Typos in Spanish translation | Manuel Jiménez Friaza | 2018-10-11 | 2 | -7/+7 |
| | | | | | | (cherry picked from commit c54ba1fb860292c1f439c0fc2c0e7c1c0090f23c) | ||||
* | | fix minor issue in dark and light schemas | Mario Vavti | 2018-10-10 | 2 | -1/+3 |
| | | | | | | (cherry picked from commit 97fcc495f2d6638eb2fce1aad93ea3e775b2738e) | ||||
* | | fix even more wiki issues | Mario Vavti | 2018-10-10 | 3 | -4/+4 |
| | | | | | | (cherry picked from commit c06b37b798d604a8e5768b8c9b52422b4b34ae36) | ||||
* | | fix some more wiki issues | Mario Vavti | 2018-10-10 | 1 | -3/+3 |
| | | | | | | (cherry picked from commit d29caa099af2d132978e634a454a29d5c85c23fe) | ||||
* | | Fix escaping quote for wiki_delete_page | M.Dent | 2018-10-10 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 1ccca9863c0b400b6597fe1a4ae46c697dd3550c) |