aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-10-155-9/+92
| | | | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332 (cherry picked from commit c39de966df2ff28674697be77a527b2214afef42) b77acb3e add gitlab-ci.yml and phpunit.xml 22275f30 fix dba_pdoTest 0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown…
* Merge branch 'patch-16' into 'dev'Mario2018-10-153-8/+9
| | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 (cherry picked from commit 721461dd3e8cb6990ace54688ace953374506daf) b7280a44 JS plurals displaying code cleanup ab0e2f52 Update language.php f9c3b807 Update main.js ce52c27a Update main.js
* Merge branch 'patch-15' into 'dev'Mario2018-10-151-0/+1
| | | | | | | | | | Add JS function code for plurals translation in Russian See merge request hubzilla/core!1337 (cherry picked from commit 7042528d267627c7156b8e0cd3b825d2c88c2350) ee4a2629 Add JS function code for plurals translation 8af91b02 Update hstrings.php
* another min version change to mitigate caching issues. we are now at 3.8RC2.2Mario2018-10-131-1/+1
|
* Merge branch 'patch-14' into 'dev'Mario2018-10-135-27/+65
| | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 (cherry picked from commit a2575059e2a068a67cd984888422265c6888f261) 5c0d3187 Add date/time plurals translation in JavaScript 729d0d53 Update language.php f68674b3 Update js_strings.tpl 3ac4337a Update main.js e96e3dc6 Update po2php.php 54bdf59d Update js_strings.php
* bump version to 3.8RC2.1 due to javascript changesMario2018-10-131-1/+1
|
* Merge branch 'dev' into 3.8RCMario Vavti2018-10-134-65/+25
|\
| * Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-134-65/+25
| | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849.
| * Merge branch 'patch-12' into 'dev'Mario2018-10-132-103/+138
| |\ | | | | | | | | | | | | New russian plurals for JavaScript See merge request hubzilla/core!1333
| | * Update hmessages.poMax Kostikov2018-10-131-2/+2
| | |
| | * Update hstrings.phpMax Kostikov2018-10-131-2/+2
| | |
| | * Update hstrings.phpMax Kostikov2018-10-131-7/+27
| | |
| | * New russian plurals for JavaScriptMax Kostikov2018-10-131-96/+111
| |/
* | Update hmessages.poMax Kostikov2018-10-131-2/+2
| | | | | | (cherry picked from commit 451ee5a5935af94adb4658a347a4a31a540e713a)
* | Update hstrings.phpMax Kostikov2018-10-131-2/+2
| | | | | | (cherry picked from commit ba3811a2849bbe4c0ec1689ceb8127484dde6343)
* | Update hstrings.phpMax Kostikov2018-10-131-7/+27
| | | | | | (cherry picked from commit e2241b9365e950d941a881f03743be556cac0d40)
* | New russian plurals for JavaScriptMax Kostikov2018-10-131-96/+111
| | | | | | (cherry picked from commit fe2bb84403f656795d5a5521d00218ee436f377b)
* | 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 return See merge request hubzilla/core!1329
| | * 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
| |\ \ | | | | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1331
| | * | 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
| |\ \ | | |/ | |/| | | | | | | Missed strings added to Russian translation See merge request hubzilla/core!1328
| | * 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 translation See merge request hubzilla/core!1327
| | * | 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 documentation See merge request hubzilla/core!1326
| | * | Add wiki_preprocess hook and documentationM.Dent2018-10-104-1/+19
| | | |
| * | | Merge branch 'patch-9' into 'dev'Mario2018-10-112-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | Formatting fix in russian translation See merge request hubzilla/core!1325
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:09:49 +0000