aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "hubzilla issue #1119 - xml2array has issues with some unicode...Mario Vavti2018-05-011-0/+11
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-012-62/+47
|\
| * parent folder permissions weren't being checked back to the cloud root direct...zotlabs2018-04-302-62/+47
* | activitypub xchans do not have an xchan_addr. use xchan_url for the follow bu...Mario Vavti2018-04-301-1/+1
* | fix another pgsql update errorMario2018-04-301-1/+1
* | Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequenc...Mario Vavti2018-04-301-11/+0
* | Merge pull request #1138 from galettesaucisse/patch-37git-marijus2018-04-301-0/+8
|\ \
| * | Create /doc/context/fr/events/help.htmlGalette Saucisse2018-04-301-0/+8
* | | Merge pull request #1137 from galettesaucisse/patch-36git-marijus2018-04-301-0/+13
|\ \ \
| * | | Create /doc/context/fr/connedit/help.htmlGalette Saucisse2018-04-301-0/+13
* | | | Merge pull request #1136 from galettesaucisse/patch-35git-marijus2018-04-301-0/+8
|\ \ \ \
| * | | | Create /doc/context/fr/connections/ifpending/help.htmlGalette Saucisse2018-04-301-0/+8
* | | | | Merge pull request #1135 from galettesaucisse/patch-34git-marijus2018-04-301-0/+8
|\ \ \ \ \
| * | | | | Create /doc/context/fr/connections/help.htmlGalette Saucisse2018-04-301-0/+8
| |/ / / /
* | | | | Merge pull request #1134 from galettesaucisse/patch-33git-marijus2018-04-301-0/+7
|\ \ \ \ \
| * | | | | Create /doc/context/fr/cloud/help.htmlGalette Saucisse2018-04-301-0/+7
| |/ / / /
* | | | | Merge pull request #1133 from HappyPony/patch-1git-marijus2018-04-301-0/+16
|\ \ \ \ \
| * | | | | Russian translation for cardsHappyPony2018-04-301-0/+16
| |/ / / /
* | | | | Merge pull request #1127 from galettesaucisse/patch-26git-marijus2018-04-301-0/+8
|\ \ \ \ \
| * | | | | Create /doc/context/fr/chat/help.htmlGalette Saucisse2018-04-291-0/+8
| |/ / / /
* | | | | Merge pull request #1126 from galettesaucisse/patch-25git-marijus2018-04-301-0/+20
|\ \ \ \ \
| * | | | | Create /doc/context/fr/cards/help.htmlGalette Saucisse2018-04-291-0/+20
| |/ / / /
* | | | | Merge pull request #1125 from galettesaucisse/patch-24git-marijus2018-04-301-0/+4
|\ \ \ \ \
| * | | | | Create /doc/context/fr/apps/edit/help.htmlGalette Saucisse2018-04-291-0/+4
| |/ / / /
* | | | | Merge pull request #1124 from galettesaucisse/patch-23git-marijus2018-04-301-0/+5
|\ \ \ \ \
| * | | | | Create /doc/context/fr/appman/help.htmlGalette Saucisse2018-04-291-1/+1
| * | | | | Create /doc/context/fr/appman/help.htmlGalette Saucisse2018-04-291-0/+5
| |/ / / /
* | | | | Merge pull request #1123 from galettesaucisse/patch-22git-marijus2018-04-301-0/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Create /doc/context/fr/apps/help.htmlGalette Saucisse2018-04-291-0/+7
| |/ / /
* | / / missing classMario Vavti2018-04-301-1/+1
| |/ / |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-304-27/+15
|\ \ \ | |/ / |/| / | |/
| * hubzilla issue #1119 - xml2array has issues with some unicode sequences/conve...zotlabs2018-04-291-0/+11
| * Update issues on postgreszotlabs2018-04-293-3/+3
| * remove unused functionzotlabs2018-04-281-24/+1
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-271-1/+1
|\|
| * sql errorzotlabs2018-04-271-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2611-1514/+2498
| |\
* | \ Merge pull request #1120 from phellmes/devgit-marijus2018-04-272-1553/+1856
|\ \ \
| * | | Update DE translation stringsphellmes2018-04-262-1553/+1856
* | | | Merge pull request #1117 from galettesaucisse/patch-19git-marijus2018-04-271-3/+3
|\ \ \ \
| * | | | Update FR toc.htmlGalette Saucisse2018-04-251-3/+3
* | | | | Merge pull request #1116 from galettesaucisse/patch-18git-marijus2018-04-271-179/+0
|\ \ \ \ \
| * | | | | Delete FR project.bb from wrong folderGalette Saucisse2018-04-251-179/+0
| |/ / / /
* | | | | Merge pull request #1115 from galettesaucisse/patch-17git-marijus2018-04-271-0/+174
|\ \ \ \ \
| * | | | | Update project.bbGalette Saucisse2018-04-251-7/+6
| * | | | | Update project.bb and place in correct folderGalette Saucisse2018-04-251-0/+175
| |/ / / /
* | | | | Merge pull request #1113 from mjfriaza/devgit-marijus2018-04-271-77/+109
|\ \ \ \ \
| * | | | | New strings: Spanish translationmjfriaza2018-04-251-77/+109
* | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-275-63/+89
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | where possible strip zid parameter from links that get pasted into posts so t...zotlabs2018-04-263-5/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 09:20:54 +0000