aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* missing permission descriptionMario Vavti2018-05-041-1/+1
|
* missing basetagMario Vavti2018-05-041-1/+4
|
* bump versionMario Vavti2018-05-041-1/+1
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-045-123/+35
|\
| * check for directorieszotlabs2018-05-031-0/+4
| |
| * tagging changes: + (old style forum mentions), and underscore space ↵zotlabs2018-05-033-121/+28
| | | | | | | | replacement are no longer supported.
| * add changes from ae35ac0cec3f6bf337 to contact_autocomplete so channel ↵zotlabs2018-05-031-2/+3
| | | | | | | | source completion will work correctly
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-033-2/+23
| |\
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-0227-1669/+2202
| |\ \
* | | | switch DIRECTORY_FALLBACK_MASTER to https://zotadel.netMario Vavti2018-05-041-1/+1
| | | |
* | | | update changelogMario Vavti2018-05-041-1/+5
| |_|/ |/| |
* | | quick fix for issue #1150 - needs improvement and review of other ↵Mario Vavti2018-05-031-2/+5
| | | | | | | | | | | | textcomplete implementations.
* | | 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.
| | * | Update composer autoload cache.Klaus Weidenbach2018-05-022-0/+18
| |/ / | | | | | | | | | | | | Should add to Prepare RC Release documentation: composer dump-autoload --no-dev
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-0316-53/+126
|\ \ \ | |/ / |/| / | |/
| * provide easy access to the autoperms setting for forum and repository ↵zotlabs2018-05-022-2/+14
| | | | | | | | channels. This may be needed in the future to protect an existing forum from assault by spammers with changing identities. The forum can quickly be turned into membership by approval and either left that way permanently or hopefully reversed at a later date. Previously this would require switching to expert mode or setting a pconfig manually.
| * 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 ↵zotlabs2018-05-023-29/+53
| | | | | | | | to give admin access to either the photos and/or the delete link.
| * Provide admin delete ability if the viewer is admin but has no existing ↵zotlabs2018-05-023-8/+18
| | | | | | | | delete authority. For 3.5+ as a new string is involved.
| * 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.html
| * | 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.html
| * | | 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/tokens
| * | | | 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.html
| * | | | 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.html
| * | | | 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.html
| * | | | 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.html
| * | | | 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.html
| * | | | 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 ↵zotlabs2018-05-014-79/+62
| | | | | | | | | | | | | | | | last couple of years.
| * | | provide warnings about profile photo and cover photo permissionszotlabs2018-05-014-1/+8
| | | |
| * | | hubzilla issue #1149, don't duplicate addressbook entries on repeated ↵zotlabs2018-05-011-4/+20
| | | | | | | | | | | | | | | | channel imports
* | | | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵Mario Vavti2018-05-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."" This reverts commit b223e364c6221aa3c680505fda4acfd6a1790272.
* | | | 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 ↵zotlabs2018-04-302-62/+47
| | | | | | | | | | | | directory in all cases
* | | activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵Mario Vavti2018-04-301-1/+1
| |/ |/| | | | | button if we do not find an xchan_addr
* | fix another pgsql update errorMario2018-04-301-1/+1
| |
* | Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵Mario Vavti2018-04-301-11/+0
| | | | | | | | | | | | sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array." This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc.
* | Merge pull request #1138 from galettesaucisse/patch-37git-marijus2018-04-301-0/+8
|\ \ | | | | | | Create /doc/context/fr/events/help.html