| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into 'dev' | Mario | 2018-10-11 | 2 | -7/+7 |
|\ |
|
| * | 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 | M.Dent | 2018-10-10 | 4 | -1/+19 |
* | | Merge branch 'patch-9' into 'dev' | Mario | 2018-10-11 | 2 | -2/+2 |
|\ \
| |/
|/| |
|
| * | 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 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-10-10 | 2 | -41/+41 |
| |\ \ \ |
|
| | * | | | 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 | 4 | -8/+8 |
|/ / / |
|
* | | | Merge branch 'fix-wiki-escaping' into 'dev' | M. Dent | 2018-10-10 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 | 6 | -41/+92 |
|\| | |
|
| * | | Rework Wiki encoding scheme. | M.Dent | 2018-10-08 | 6 | -24/+32 |
| * | | Implement custom escaping | M.Dent | 2018-10-08 | 4 | -21/+64 |
* | | | Merge branch 'dev' into 'dev' | Mario | 2018-10-08 | 2 | -3472/+4305 |
|\ \ \
| |/ /
|/| | |
|
| * | | Update Spanish translation | Manuel Jiménez Friaza | 2018-10-08 | 2 | -3472/+4305 |
|/ / |
|
* | | typo | Mario Vavti | 2018-10-08 | 1 | -1/+1 |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-08 | 3 | -13596/+13744 |
|\ \ |
|
| * \ | Merge branch 'patch-8' into 'dev' | Mario | 2018-10-08 | 2 | -13595/+13741 |
| |\ \ |
|
| | * | | Update hstrings.php | Max Kostikov | 2018-10-08 | 1 | -2676/+2682 |
| | * | | New russian translation | Max Kostikov | 2018-10-08 | 1 | -10919/+11059 |
| * | | | Merge branch 'patch-2' into 'dev' | Mario | 2018-10-08 | 1 | -1/+3 |
| |\ \ \ |
|
| | * | | | Prevent links damage on foreign channel repost for cloned | Max Kostikov | 2018-10-05 | 1 | -1/+3 |
* | | | | | the root cause for doubled entries is fixed now | Mario Vavti | 2018-10-08 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-08 | 1 | -3/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | hubzilla core issue #1278 - page update always reloads if noscript content is... | zotlabs | 2018-10-07 | 1 | -3/+2 |
* | | | | Merge branch 'fix-runaway-cron' into 'dev' | M. Dent | 2018-10-08 | 1 | -2/+0 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Fix too many arguments | M.Dent | 2018-10-07 | 1 | -2/+0 |
|/ / / |
|
* | | | Merge branch 'fix-runaway-cron' into 'dev' | M. Dent | 2018-10-07 | 1 | -4/+118 |
|\ \ \ |
|
| * | | | Fix (potential) runaway cron | M. Dent | 2018-10-07 | 1 | -4/+118 |
|/ / / |
|
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-07 | 2 | -6/+6 |
|\| | |
|