aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow uninstall of plugins which no longer exists via cmdline toolzotlabs2018-05-052-1/+21
|
* more updates and clarifications re: tag/mention documentationzotlabs2018-05-051-2/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-059-18/+28
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-052-2/+3
| |\
| * | 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
| |\ \
| * | | 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
| |\ \ \
| * | | | switch DIRECTORY_FALLBACK_MASTER to https://zotadel.netMario Vavti2018-05-041-1/+1
| | | | |
| * | | | update changelogMario Vavti2018-05-041-1/+5
| | | | |
* | | | | check_item_source: always log uidzotlabs2018-05-051-0/+1
| | | | |
* | | | | log all possible return conditions from check_item_source(), use consistent ↵zotlabs2018-05-051-13/+36
| |_|_|/ |/| | | | | | | | | | | xchan
* | | | 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.
* | | 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
| |/ |/|
* | 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
|\|
| * 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
| |\ \ | | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-0227-1669/+2202
|\| | | |/ |/|
| * 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
| |\ \ \
| * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |