aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Install imagemagickEiner von Vielen2018-05-051-5/+11
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-052-2/+3
|\
| * support '@' pathszotlabs2018-05-052-2/+3
| |
| * removed the fakelink attribute as it changed the colour of the down arrow. ↵zotlabs2018-05-041-1/+1
| | | | | | | | We probably do want to change the hover cursor but not the colour.
* | update nginx conf to address issue #1155Mario Vavti2018-05-051-8/+11
| |
* | use cursor-pointer class instead of fakelink to avoid the link color for the ↵Mario Vavti2018-05-052-2/+2
| | | | | | | | dropdown caret
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-052-2/+2
|\|
| * If somebody precisely clicks the down-arrow on the author photo it should ↵zotlabs2018-05-041-1/+1
| | | | | | | | probably also trigger the dropdown
| * turn skip white back on - (xml actually doesn't parse if you disable this)zotlabs2018-05-041-2/+2
| |
* | set XML_OPTION_SKIP_WHITE to 1 againMario Vavti2018-05-041-2/+2
| |
* | fix too big buttons in wiki listMario Vavti2018-05-041-2/+2
| |
* | 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
|\ \ \ \ | | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 17:17:10 +0000