aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update changelogMario Vavti2018-05-041-1/+5
* quick fix for issue #1150 - needs improvement and review of other textcomplet...Mario Vavti2018-05-031-2/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-05-032-0/+18
|\
| * Merge pull request #1152 from dawnbreak/devgit-marijus2018-05-032-0/+18
| |\
| | * Update composer autoload cache.Klaus Weidenbach2018-05-022-0/+18
| |/
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-0316-53/+126
|\ \ | |/ |/|
| * provide easy access to the autoperms setting for forum and repository channel...zotlabs2018-05-022-2/+14
| * make the cloud logging a bit less verbose until we actually need it.zotlabs2018-05-022-2/+2
| * admin delete of fileszotlabs2018-05-025-12/+39
| * backend work to allow admin to delete photos. Still requires frontend work to...zotlabs2018-05-023-29/+53
| * Provide admin delete ability if the viewer is admin but has no existing delet...zotlabs2018-05-023-8/+18
| * hubzilla issue #1151 - activitypub mention gets bookmarkedzotlabs2018-05-022-4/+4
* | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
|\ \ \ \ \