Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
* | | Rework Wiki encoding scheme. | M.Dent | 2018-10-10 | 2 | -2/+3 |
| | | | | | | (cherry picked from commit 709665846e66f093109730691b31d9e094d02088) | ||||
* | | Fixed some errors in Spanish translation | Manuel Jiménez Friaza | 2018-10-10 | 2 | -41/+41 |
| | | | | | | (cherry picked from commit a7b03c1cea351d8c5eedf25c01127fd8d90fb630) | ||||
* | | Update Spanish translation | Manuel Jiménez Friaza | 2018-10-08 | 2 | -3472/+4305 |
| | | | | | | (cherry picked from commit e877a001abf3b16e0c0391192d6e05f443d3e5f2) | ||||
* | | those 3px make a difference on medium sized screens | Mario Vavti | 2018-10-06 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 65dcb39bacc6a7d2376f0994b907853eb80a3361) | ||||
* | | 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. (cherry picked from commit 62433b5f0527f4fa232134a1f1e8a67739d3b711) | ||||
* | | 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. (cherry picked from commit 66cf0852728d2f95ed3a5b7a304dbc7b79111831) | ||||
* | | New russian translations hmessages.po | Max Kostikov | 2018-10-05 | 1 | -11229/+11308 |
| | | |||||
* | | New russian translations hstrings.php | Max Kostikov | 2018-10-05 | 1 | -2804/+2842 |
|/ | |||||
* | fix issues with bs accordions | Mario Vavti | 2018-10-04 | 3 | -5/+5 |
| | |||||
* | move *_divmore_height setting to the module extra_settings, and fix issue ↵ | Mario Vavti | 2018-10-04 | 2 | -2/+3 |
| | | | | where feature settings were not synced if rpath was provided | ||||
* | move *_list_mode to features | Mario Vavti | 2018-10-04 | 1 | -2/+0 |
| | |||||
* | Merge branch 'patch-1' into 'dev' | Mario | 2018-10-04 | 1 | -5/+4 |
|\ | | | | | | | | | Incorrect block wrapping fixed See merge request hubzilla/core!1306 | ||||
| * | Update settings.tpl | Max Kostikov | 2018-10-04 | 1 | -5/+4 |
| | | |||||
* | | Merge branch 'patch-1' into 'dev' | Mario | 2018-10-04 | 1 | -19/+21 |
|\| | | | | | | | | | button sticking fixed See merge request hubzilla/core!1305 |