aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cherry-pick-e6f289de' into 'es-es'Manuel Jiménez Friaza2019-02-212-1644/+1992
|\ | | | | | | | | Update Spanish translation See merge request mjfriaza/core!4
| * Update Spanish translationManuel Jiménez Friaza2019-02-212-1644/+1992
|/ | | (cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76)
* Merge branch 'cherry-pick-5ac08ec3' into 'es-es'Manuel Jiménez Friaza2018-11-261-14/+21
|\ | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request mjfriaza/core!3
| * Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
|/ | | (cherry picked from commit 5ac08ec3aa8ede14141390670a8097a60769e11e)
* Update es-esManuel Jiménez Friaza2018-11-242-27/+27
|
* Resolved merge conflictsManuel Jiménez Friaza2018-11-2454-1060/+1770
|\
| * Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
| |\
| | * Organization actor type was missingzotlabs2018-11-231-1/+1
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario2018-11-233-18/+20
| |\|
| | * use uuid in file storagezotlabs2018-11-222-3/+3
| | |
| | * fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario2018-11-223-5/+8
| |\|
| | * no mention notifications from mastodon (and pleroma)zotlabs2018-11-212-5/+5
| | |
| | * use this form insteadzotlabs2018-11-191-2/+1
| | |
| | * push recent changeszotlabs2018-11-193-2/+6
| | |
| * | fix call to undefined functionMario Vavti2018-11-211-1/+1
| | | | | | | | | (cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2)
| * | Merge branch 'dev' into 'dev'Mario2018-11-202-712/+693
| |\ \ | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1400
| | * | Replace hmessages.poMax Kostikov2018-11-191-688/+673
| | | |
| | * | Replace hstrings.phpMax Kostikov2018-11-191-24/+20
| | | |
| * | | Revert "Fix return on wrong sotred in Content-Length size for full size photos"Mario2018-11-191-4/+2
| | | | | | | | | | | | This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408
| * | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| | | | | | | | | | | | This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80
| * | | changelogMario Vavti2018-11-191-0/+9
| | | | | | | | | | | | (cherry picked from commit 5cb4cdaa5e42f87e9d26501150d6d689b56a1cd2)
| * | | update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
| | | | | | | | | | | | (cherry picked from commit ae97649948b8af575441e5a1f5b69db9f627a0e2)
| * | | Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398
| | * | | Fix: delayed items propagate before publication on cloned channelsDM42.Net (Matt Dent)2018-11-181-2/+0
| | | | |
| * | | | Merge branch 'mod-zot-fix' into 'dev'Max Kostikov2018-11-181-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | fix typo which prevented propagation of comments See merge request hubzilla/core!1399
| | * | | fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
| |/ / /
| * | | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| | | | | | | | | | | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5)
| * | | Add filesize for streaming contentMax Kostikov2018-11-161-0/+1
| | | |
| * | | Fix return on wrong sotred in Content-Length size for full size photosMax Kostikov2018-11-161-2/+4
| | | |
| * | | strlen($this->imageString()) does not return the correct size when dealing ↵Mario Vavti2018-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | with os_storage images. use filesize() instead. (cherry picked from commit afc75af62f759181bbe6a806b523c6ca52126f5f)
| * | | Merge branch 'dev_homeinstall_raspihub' into 'dev'Mario2018-11-163-18/+46
| |\ \ \ | | | | | | | | | | | | | | | | | | | | localhost, URLs, version updates See merge request hubzilla/core!1396
| | * \ \ Merge remote-tracking branch 'official/dev' into dev_homeinstall_raspihubOJ Random2018-11-141-1/+1
| | |\ \ \
| | * | | | localhost, URLs, version updatesOJ Random2018-11-143-18/+46
| | | | | |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-1618-121/+75
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | datetime_convert wrong argszotlabs2018-11-152-2/+2
| | | | | |
| | * | | | more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
| | | | | |
| | * | | | delivery report issuezotlabs2018-11-151-2/+3
| | | | | |
| | * | | | add item.uuid to relevant placeszotlabs2018-11-1511-32/+44
| | | | | |
| | * | | | mid -> uuid conversions for basic reactionszotlabs2018-11-152-3/+7
| | | | | |
| | * | | | remove checkjs and nojszotlabs2018-11-152-65/+0
| | | | | |
| * | | | | fix update 1228Mario Vavti2018-11-151-1/+0
| |/ / / /
| * | | | separate by networkzotlabs2018-11-141-0/+1
| | | | |
| * | | | update httpsig unit test which is failingzotlabs2018-11-141-0/+2
| | | | |
| * | | | fixes to old z6 deliveryzotlabs2018-11-141-4/+3
| | | | |
| * | | | more loggingzotlabs2018-11-141-0/+2
| | | | |
| * | | | more loggingzotlabs2018-11-141-0/+1
| | | | |
| * | | | check keyidzotlabs2018-11-141-1/+1
| | | | |
| * | | | filter by networkzotlabs2018-11-141-2/+2
| | | | |
| * | | | crypto fixzotlabs2018-11-141-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:11:07 +0000