aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-0227-1669/+2202
|\| | | |/ |/|
| * Merge pull request #1146 from galettesaucisse/patch-46git-marijus2018-05-021-0/+13
| |\
| | * Create /doc/context/fr/wiki/help.htmlGalette Saucisse2018-04-301-0/+13
| * | Merge pull request #1145 from galettesaucisse/patch-45git-marijus2018-05-021-0/+8
| |\ \
| | * | Create /doc/context/fr/webpages/help.htmlGalette Saucisse2018-04-301-0/+8
| * | | Merge pull request #1144 from galettesaucisse/patch-44git-marijus2018-05-021-0/+20
| |\ \ \
| | * | | Create /doc/context/fr/settings/tokensGalette Saucisse2018-04-301-0/+20
| | |/ /
| * | | Merge pull request #1143 from galettesaucisse/patch-43git-marijus2018-05-021-0/+18
| |\ \ \
| | * | | Create /doc/context/fr/settings/channel/help.htmlGalette Saucisse2018-04-301-0/+18
| | |/ /
| * | | Merge pull request #1142 from galettesaucisse/patch-42git-marijus2018-05-021-0/+18
| |\ \ \
| | * | | Create /doc/context/fr/settings/account/help.htmlGalette Saucisse2018-04-301-0/+18
| | |/ /
| * | | Merge pull request #1141 from galettesaucisse/patch-40git-marijus2018-05-021-0/+6
| |\ \ \
| | * | | Create /doc/context/fr/profile/help.htmlGalette Saucisse2018-04-301-0/+6
| | |/ /
| * | | Merge pull request #1140 from galettesaucisse/patch-39git-marijus2018-05-021-0/+6
| |\ \ \
| | * | | Create /doc/context/photos/help.htmlGalette Saucisse2018-04-301-0/+6
| | |/ /
| * | | Merge pull request #1139 from galettesaucisse/patch-38git-marijus2018-05-021-0/+10
| |\ \ \
| | * | | Create /doc/context/fr/mail/help.htmlGalette Saucisse2018-04-301-0/+10
| | |/ /
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-029-86/+114
| |\ \ \
| * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-271-1/+1
| |\ \ \ \
| * \ \ \ \ Merge pull request #1120 from phellmes/devgit-marijus2018-04-272-1553/+1856
| |\ \ \ \ \