aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-10-112-7/+7
|\
| * Typos in Spanish translationManuel Jiménez Friaza2018-10-112-7/+7
|/
* Merge branch 'dev' into 'dev'Mario2018-10-114-1/+19
|\
| * Add wiki_preprocess hook and documentationM.Dent2018-10-104-1/+19
* | Merge branch 'patch-9' into 'dev'Mario2018-10-112-2/+2
|\ \ | |/ |/|
| * Update hstrings.phpMax Kostikov2018-10-101-1/+1
| * Formatting fix in russian translationMax Kostikov2018-10-101-1/+1
* | fix issue in zot fingerMario Vavti2018-10-101-1/+1
* | revert gitlab-ci until we have a working configurationMario Vavti2018-10-101-41/+0
|/
* missing installMario Vavti2018-10-101-1/+1
* one last try for nowMario Vavti2018-10-101-6/+7
* sigh...Mario Vavti2018-10-101-2/+3
* lets try thisMario Vavti2018-10-101-3/+2
* add some dependencies for gdMario Vavti2018-10-101-0/+1
* probably that is the way to do itMario Vavti2018-10-101-1/+3
* wrong package nameMario Vavti2018-10-101-1/+1
* add php-gd and use php7 imageMario Vavti2018-10-101-7/+2
* gitlab-ci example fileMario Vavti2018-10-101-0/+42
* fix minor issue in dark and light schemasMario Vavti2018-10-102-1/+3
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-105-5/+29
|\
| * SECURITY: signature issuezotlabs2018-10-094-2/+29
| * Merge branch 'dev'zotlabs2018-10-0852-19550/+21209
| |\
| * | whitespacezotlabs2018-10-081-3/+0
* | | fix even more wiki issuesMario Vavti2018-10-103-4/+4
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-102-41/+41
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Mario2018-10-102-41/+41
| |\ \ \
| | * | | Fixed some errors in Spanish translationManuel Jiménez Friaza2018-10-092-41/+41
| | | |/ | | |/|
* | / | fix some more wiki issuesMario Vavti2018-10-104-8/+8
|/ / /
* | | Merge branch 'fix-wiki-escaping' into 'dev'M. Dent2018-10-101-1/+1
|\ \ \ | |/ / |/| |
| * | Fix escaping quote for wiki_delete_pageM.Dent2018-10-091-1/+1
* | | Merge branch 'fix-wiki-escaping' into 'dev'Mario2018-10-086-41/+92
|\| |
| * | Rework Wiki encoding scheme.M.Dent2018-10-086-24/+32
| * | Implement custom escapingM.Dent2018-10-084-21/+64
* | | Merge branch 'dev' into 'dev'Mario2018-10-082-3472/+4305
|\ \ \ | |/ / |/| |
| * | Update Spanish translationManuel Jiménez Friaza2018-10-082-3472/+4305
|/ /
* | typoMario Vavti2018-10-081-1/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-083-13596/+13744
|\ \
| * \ Merge branch 'patch-8' into 'dev'Mario2018-10-082-13595/+13741
| |\ \
| | * | Update hstrings.phpMax Kostikov2018-10-081-2676/+2682
| | * | New russian translationMax Kostikov2018-10-081-10919/+11059
| * | | Merge branch 'patch-2' into 'dev'Mario2018-10-081-1/+3
| |\ \ \
| | * | | Prevent links damage on foreign channel repost for clonedMax Kostikov2018-10-051-1/+3
* | | | | the root cause for doubled entries is fixed nowMario Vavti2018-10-081-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-081-3/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | hubzilla core issue #1278 - page update always reloads if noscript content is...zotlabs2018-10-071-3/+2
* | | | Merge branch 'fix-runaway-cron' into 'dev'M. Dent2018-10-081-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix too many argumentsM.Dent2018-10-071-2/+0
|/ / /
* | | Merge branch 'fix-runaway-cron' into 'dev'M. Dent2018-10-071-4/+118
|\ \ \
| * | | Fix (potential) runaway cronM. Dent2018-10-071-4/+118
|/ / /
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-072-6/+6
|\| |