aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | new feature (post 3.4): allow a different username to be used when importing.zotlabs2018-05-013-2/+24
| * | The channel import page seems to have missed the big theme cleanup of the las...zotlabs2018-05-014-79/+62
| * | provide warnings about profile photo and cover photo permissionszotlabs2018-05-014-1/+8
| * | hubzilla issue #1149, don't duplicate addressbook entries on repeated channel...zotlabs2018-05-011-4/+20
* | | 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
| |\