Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2018-10-13 | 1 | -2/+3 |
|\ | | | | | | | | | Fix order of assignment and get template file before return See merge request hubzilla/core!1329 | ||||
| * | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-12 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'patch-11' into 'dev' | Mario | 2018-10-13 | 4 | -25/+65 |
|\ \ | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1331 | ||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -3/+4 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -4/+2 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | Update main.js | Max Kostikov | 2018-10-13 | 1 | -19/+22 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| | | | |||||
| * | | Update js_strings.tpl | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update language.php | Max Kostikov | 2018-10-12 | 1 | -0/+31 |
| | | | |||||
| * | | Add plurals translation at browser side (JS) | Max Kostikov | 2018-10-12 | 1 | -5/+14 |
| |/ | |||||
* | | Merge branch 'patch-10' into 'dev' | Mario | 2018-10-13 | 2 | -102/+102 |
|\ \ | |/ |/| | | | | | Missed strings added to Russian translation See merge request hubzilla/core!1328 | ||||
| * | 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 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-12 | 2 | -4/+26 |
|\ \ | |/ |/| | |||||
| * | verify some edge case http signatures | zotlabs | 2018-10-11 | 2 | -4/+26 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-11 | 2 | -7/+7 |
|\ \ | | | | | | | | | | | | | Typos in Spanish translation See merge request hubzilla/core!1327 | ||||
| * | | Typos in Spanish translation | Manuel Jiménez Friaza | 2018-10-11 | 2 | -7/+7 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-11 | 4 | -1/+19 |
|\ \ | | | | | | | | | | | | | Add wiki_preprocess hook and documentation See merge request hubzilla/core!1326 | ||||
| * | | Add wiki_preprocess hook and documentation | M.Dent | 2018-10-10 | 4 | -1/+19 |
| | | | |||||
* | | | Merge branch 'patch-9' into 'dev' | Mario | 2018-10-11 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | | | | | | | Formatting fix in russian translation See merge request hubzilla/core!1325 | ||||
| * | | 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 issue in zot finger | Mario Vavti | 2018-10-10 | 1 | -1/+1 |
| | | | |||||
* | | | revert gitlab-ci until we have a working configuration | Mario Vavti | 2018-10-10 | 1 | -41/+0 |
|/ / | |||||
* | | missing install | Mario Vavti | 2018-10-10 | 1 | -1/+1 |
| | | |||||
* | | one last try for now | Mario Vavti | 2018-10-10 | 1 | -6/+7 |
| | | |||||
* | | sigh... | Mario Vavti | 2018-10-10 | 1 | -2/+3 |
| | | |||||
* | | lets try this | Mario Vavti | 2018-10-10 | 1 | -3/+2 |
| | | |||||
* | | add some dependencies for gd | Mario Vavti | 2018-10-10 | 1 | -0/+1 |
| | | |||||
* | | probably that is the way to do it | Mario Vavti | 2018-10-10 | 1 | -1/+3 |
| | | |||||
* | | wrong package name | Mario Vavti | 2018-10-10 | 1 | -1/+1 |
| | | |||||
* | | add php-gd and use php7 image | Mario Vavti | 2018-10-10 | 1 | -7/+2 |
| | | |||||
* | | gitlab-ci example file | Mario Vavti | 2018-10-10 | 1 | -0/+42 |
| | | |||||
* | | fix minor issue in dark and light schemas | Mario Vavti | 2018-10-10 | 2 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-10 | 5 | -5/+29 |
|\| | |||||
| * | SECURITY: signature issue | zotlabs | 2018-10-09 | 4 | -2/+29 |
| | | |||||
| * | Merge branch 'dev' | zotlabs | 2018-10-08 | 52 | -19550/+21209 |
| |\ | |||||
| * | | whitespace | zotlabs | 2018-10-08 | 1 | -3/+0 |
| | | | |||||
* | | | 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 |
|\ \ \ |