aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | allow to undelete deleted base appsMario Vavti2018-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 3588c4ab996f462f11cd89255e6d511441ed0315)
| | * | | | | | some changelog workMario Vavti2018-10-151-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 782ec06f2b022a77b6fc2c90a62186e5de7affe1)
| | * | | | | | fix wiki issue with wiki page links when using bbcodeMario Vavti2018-10-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit df62037c4a722606e84e28dd4d62e89dcc999980)
| | * | | | | | update readme for master and dev branch buildstatusMario Vavti2018-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 05b8c53ff7b96053c1095c1dc0f64bb215083feb)
| | * | | | | | 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
| | |\ \ \ \ \ \
| | * | | | | | | 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
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix order of assignment and get template file before returnZotSocial Admin2018-10-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8ebcc4439b373e2127ac33c79e254bc53e8d9070)
| | * | | | | | | | verify some edge case http signatureszotlabs2018-10-122-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c6bfd5e7befedf79ab6f7e70902e5fb2aa69fa6f)
| | * | | | | | | | Typos in Spanish translationManuel Jiménez Friaza2018-10-112-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c54ba1fb860292c1f439c0fc2c0e7c1c0090f23c)
| | * | | | | | | | Add wiki_preprocess hook and documentationM.Dent2018-10-114-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit bad4ea6e65a45ac2523a9a7c2ec624ad2535b652)
| | * | | | | | | | fix issue in zot fingerMario Vavti2018-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 802ccdff4ade258f09fd3dca4ff4aa63cf5f9ac6)
| | * | | | | | | | fix minor issue in dark and light schemasMario Vavti2018-10-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 97fcc495f2d6638eb2fce1aad93ea3e775b2738e)
| | * | | | | | | | SECURITY: signature issuezotlabs2018-10-104-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c6f3298f7864756f4a9b7827e8490a3ee859f82f)
| | * | | | | | | | fix even more wiki issuesMario Vavti2018-10-103-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c06b37b798d604a8e5768b8c9b52422b4b34ae36)
| | * | | | | | | | fix some more wiki issuesMario Vavti2018-10-104-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d29caa099af2d132978e634a454a29d5c85c23fe)
| | * | | | | | | | Fix escaping quote for wiki_delete_pageM.Dent2018-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1ccca9863c0b400b6597fe1a4ae46c697dd3550c)
| | * | | | | | | | Rework Wiki encoding scheme.M.Dent2018-10-106-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 709665846e66f093109730691b31d9e094d02088)
| | * | | | | | | | Implement custom escapingM.Dent2018-10-104-21/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 93a310582f044d35f0a3583671053595fefdbedb)
| | * | | | | | | | Fixed some errors in Spanish translationManuel Jiménez Friaza2018-10-102-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a7b03c1cea351d8c5eedf25c01127fd8d90fb630)
| | * | | | | | | | Update Spanish translationManuel Jiménez Friaza2018-10-082-3472/+4305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e877a001abf3b16e0c0391192d6e05f443d3e5f2)
| | * | | | | | | | typoMario Vavti2018-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f0b7a7e5d38a92268a67d8dedf69f97d88b4c542)
| | * | | | | | | | the root cause for doubled entries is fixed nowMario Vavti2018-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e0568f33e82de15e5d5a38ec7697d6afd67352f3)
| | * | | | | | | | Prevent links damage on foreign channel repost for clonedMax Kostikov2018-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d9efb037e3d0c14fa288e8b54c3d55d67689ab54)
| | * | | | | | | | hubzilla core issue #1278 - page update always reloads if noscript content ↵zotlabs2018-10-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled (cherry picked from commit 69584f541d052e6da410d9cd782656eb31fae22d)
| | * | | | | | | | Fix too many argumentsM.Dent2018-10-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 60d5443f000dd77c64b425c33ed341ef822734e8)
| | * | | | | | | | Fix (potential) runaway cronM. Dent2018-10-081-4/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 108855aca212a858bf60d85d6418bae5450111d0)
| | * | | | | | | | Add missing else clauseM.Dent2018-10-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 259db3778c9385b9e4811e495146267b14b67a46)
| | * | | | | | | | use hubloc_store_lowlevel to ensure all hubloc columns are initialisedzotlabs2018-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 52be5c1660abb1f3f8c6a8f0ba09799615214c30)
| | * | | | | | | | minor app cleanupzotlabs2018-10-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 835e222af0df627a262ab55e940f9d3808b6e000)
| | * | | | | | | | return success for postgresMario Vavti2018-10-061-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2d9fe72215f0853f9234f57466095ee762253d82)
| | * | | | | | | | fix issue #1281 - hubloc default valuesMario Vavti2018-10-063-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit dd3ec468f65f05c0fbf233a161cffae2698bd3db)
| | * | | | | | | | minor versionMario2018-10-061-1/+1
| | | | | | | | | |
| | * | | | | | | | those 3px make a difference on medium sized screensMario Vavti2018-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 65dcb39bacc6a7d2376f0994b907853eb80a3361)
| | * | | | | | | | give apps some more space and prevent linebreaks in app names. Add ellipsis ↵Mario Vavti2018-10-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to too long names. (cherry picked from commit 62433b5f0527f4fa232134a1f1e8a67739d3b711)
| | * | | | | | | | another db update to get rid of the old view bookmarks entriesMario Vavti2018-10-062-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6ffdf3880f89b83c701f866a6188ef6f079078c5)
| | * | | | | | | | move profile assign selector to profile settings and personal menu selector ↵Mario Vavti2018-10-066-74/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section. (cherry picked from commit 66cf0852728d2f95ed3a5b7a304dbc7b79111831)
| | * | | | | | | | this did not actually make senseMario Vavti2018-10-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d1745319318b47932cf5d4acf400bfbf62f94ddc)
| | * | | | | | | | strings and force import_system_apps() on std_version changeMario Vavti2018-10-062-267/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit cd5f25596678da5cba2e9208ec817a103e20914c)
| | * | | | | | | | rename widget titlesMario Vavti2018-10-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit da8b276699b7d4081125456946c2d3b6af330381)