aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* version 3.8RC2Mario Vavti2018-10-131-1/+1
* Merge branch 'dev' into 3.8RCMario Vavti2018-10-139-13622/+13807
|\
| * bump versionMario Vavti2018-10-131-1/+1
| * Merge branch 'dev' into 'dev'Mario2018-10-131-2/+3
| |\
| | * Fix order of assignment and get template file before returnZotSocial Admin2018-10-121-2/+3
| * | Merge branch 'patch-11' into 'dev'Mario2018-10-134-25/+65
| |\ \
| | * | Update language.phpMax Kostikov2018-10-131-2/+1
| | * | Update language.phpMax Kostikov2018-10-131-3/+4
| | * | Update language.phpMax Kostikov2018-10-131-2/+2
| | * | Update language.phpMax Kostikov2018-10-131-1/+1
| | * | Update language.phpMax Kostikov2018-10-131-2/+1
| | * | Update language.phpMax Kostikov2018-10-131-4/+2
| | * | Update language.phpMax Kostikov2018-10-131-1/+1
| | * | Update language.phpMax Kostikov2018-10-131-1/+1
| | * | Update main.jsMax Kostikov2018-10-131-19/+22
| | * | Update language.phpMax Kostikov2018-10-131-5/+5
| | * | Update js_strings.tplMax Kostikov2018-10-121-1/+1
| | * | Update language.phpMax Kostikov2018-10-121-0/+31
| | * | Add plurals translation at browser side (JS)Max Kostikov2018-10-121-5/+14
| | |/
| * | Merge branch 'patch-10' into 'dev'Mario2018-10-132-102/+102
| |\ \ | | |/ | |/|
| | * Update hmessages.poMax Kostikov2018-10-121-1/+1
| | * Update hstrings.phpMax Kostikov2018-10-121-1/+1
| | * Update hstrings.phpMax Kostikov2018-10-121-2/+2
| | * Update hmessages.poMax Kostikov2018-10-121-2/+2
| | * Update hstrings.phpMax Kostikov2018-10-111-4/+4
| | * Missed strings added to Russian translationMax Kostikov2018-10-111-92/+92
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-122-4/+26
| |\ \ | | |/ | |/|
| | * verify some edge case http signatureszotlabs2018-10-112-4/+26
| * | 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
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 08:06:34 +0000