Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-02 | 27 | -1669/+2202 | |
|\| | | |/ |/| | ||||||
| * | Merge pull request #1146 from galettesaucisse/patch-46 | git-marijus | 2018-05-02 | 1 | -0/+13 | |
| |\ | ||||||
| | * | Create /doc/context/fr/wiki/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+13 | |
| * | | Merge pull request #1145 from galettesaucisse/patch-45 | git-marijus | 2018-05-02 | 1 | -0/+8 | |
| |\ \ | ||||||
| | * | | Create /doc/context/fr/webpages/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| * | | | Merge pull request #1144 from galettesaucisse/patch-44 | git-marijus | 2018-05-02 | 1 | -0/+20 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/settings/tokens | Galette Saucisse | 2018-04-30 | 1 | -0/+20 | |
| | |/ / | ||||||
| * | | | Merge pull request #1143 from galettesaucisse/patch-43 | git-marijus | 2018-05-02 | 1 | -0/+18 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/settings/channel/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 | |
| | |/ / | ||||||
| * | | | Merge pull request #1142 from galettesaucisse/patch-42 | git-marijus | 2018-05-02 | 1 | -0/+18 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/settings/account/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 | |
| | |/ / | ||||||
| * | | | Merge pull request #1141 from galettesaucisse/patch-40 | git-marijus | 2018-05-02 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/profile/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 | |
| | |/ / | ||||||
| * | | | Merge pull request #1140 from galettesaucisse/patch-39 | git-marijus | 2018-05-02 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/photos/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 | |
| | |/ / | ||||||
| * | | | Merge pull request #1139 from galettesaucisse/patch-38 | git-marijus | 2018-05-02 | 1 | -0/+10 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/mail/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+10 | |
| | |/ / | ||||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-02 | 9 | -86/+114 | |
| |\ \ \ | ||||||
| * | | | | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some unicode... | Mario Vavti | 2018-05-01 | 1 | -0/+11 | |
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-01 | 2 | -62/+47 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | activitypub xchans do not have an xchan_addr. use xchan_url for the follow bu... | Mario Vavti | 2018-04-30 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
| * | | | fix another pgsql update error | Mario | 2018-04-30 | 1 | -1/+1 | |
| * | | | Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequenc... | Mario Vavti | 2018-04-30 | 1 | -11/+0 | |
| * | | | Merge pull request #1138 from galettesaucisse/patch-37 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ | ||||||
| | * | | | Create /doc/context/fr/events/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| * | | | | Merge pull request #1137 from galettesaucisse/patch-36 | git-marijus | 2018-04-30 | 1 | -0/+13 | |
| |\ \ \ \ | ||||||
| | * | | | | Create /doc/context/fr/connedit/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+13 | |
| * | | | | | Merge pull request #1136 from galettesaucisse/patch-35 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Create /doc/context/fr/connections/ifpending/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| * | | | | | | Merge pull request #1135 from galettesaucisse/patch-34 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/connections/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1134 from galettesaucisse/patch-33 | git-marijus | 2018-04-30 | 1 | -0/+7 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/cloud/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+7 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1133 from HappyPony/patch-1 | git-marijus | 2018-04-30 | 1 | -0/+16 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Russian translation for cards | HappyPony | 2018-04-30 | 1 | -0/+16 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1127 from galettesaucisse/patch-26 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/chat/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+8 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1126 from galettesaucisse/patch-25 | git-marijus | 2018-04-30 | 1 | -0/+20 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/cards/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+20 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1125 from galettesaucisse/patch-24 | git-marijus | 2018-04-30 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/apps/edit/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+4 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1124 from galettesaucisse/patch-23 | git-marijus | 2018-04-30 | 1 | -0/+5 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Create /doc/context/fr/appman/help.html | Galette Saucisse | 2018-04-29 | 1 | -1/+1 | |
| | * | | | | | | Create /doc/context/fr/appman/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+5 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1123 from galettesaucisse/patch-22 | git-marijus | 2018-04-30 | 1 | -0/+7 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Create /doc/context/fr/apps/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+7 | |
| | |/ / / / | ||||||
| * | / / / | missing class | Mario Vavti | 2018-04-30 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-30 | 4 | -27/+15 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-27 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #1120 from phellmes/dev | git-marijus | 2018-04-27 | 2 | -1553/+1856 | |
| |\ \ \ \ \ |