aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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. We...zotlabs2018-05-041-1/+1
* | 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
* | 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 pro...zotlabs2018-05-041-1/+1
| * 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 replaceme...zotlabs2018-05-033-121/+28
| * add changes from ae35ac0cec3f6bf337 to contact_autocomplete so channel source...zotlabs2018-05-031-2/+3
| * 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 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
|\ \ \ \ | | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 04:58:28 +0000