| Commit message (Expand) | Author | Age | Files | Lines |
* | Install imagemagick | Einer von Vielen | 2018-05-05 | 1 | -5/+11 |
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-05 | 2 | -2/+3 |
|\ |
|
| * | support '@' paths | zotlabs | 2018-05-05 | 2 | -2/+3 |
| * | removed the fakelink attribute as it changed the colour of the down arrow. We... | zotlabs | 2018-05-04 | 1 | -1/+1 |
* | | update nginx conf to address issue #1155 | Mario Vavti | 2018-05-05 | 1 | -8/+11 |
* | | use cursor-pointer class instead of fakelink to avoid the link color for the ... | Mario Vavti | 2018-05-05 | 2 | -2/+2 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-05 | 2 | -2/+2 |
|\| |
|
| * | If somebody precisely clicks the down-arrow on the author photo it should pro... | zotlabs | 2018-05-04 | 1 | -1/+1 |
| * | turn skip white back on - (xml actually doesn't parse if you disable this) | zotlabs | 2018-05-04 | 1 | -2/+2 |
* | | set XML_OPTION_SKIP_WHITE to 1 again | Mario Vavti | 2018-05-04 | 1 | -2/+2 |
* | | fix too big buttons in wiki list | Mario Vavti | 2018-05-04 | 1 | -2/+2 |
* | | missing permission description | Mario Vavti | 2018-05-04 | 1 | -1/+1 |
* | | missing basetag | Mario Vavti | 2018-05-04 | 1 | -1/+4 |
* | | bump version | Mario Vavti | 2018-05-04 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-04 | 5 | -123/+35 |
|\| |
|
| * | check for directories | zotlabs | 2018-05-03 | 1 | -0/+4 |
| * | tagging changes: + (old style forum mentions), and underscore space replaceme... | zotlabs | 2018-05-03 | 3 | -121/+28 |
| * | add changes from ae35ac0cec3f6bf337 to contact_autocomplete so channel source... | zotlabs | 2018-05-03 | 1 | -2/+3 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-03 | 3 | -2/+23 |
| |\ |
|
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-02 | 27 | -1669/+2202 |
| |\ \ |
|
* | | | | switch DIRECTORY_FALLBACK_MASTER to https://zotadel.net | Mario Vavti | 2018-05-04 | 1 | -1/+1 |
* | | | | update changelog | Mario Vavti | 2018-05-04 | 1 | -1/+5 |
| |_|/
|/| | |
|
* | | | quick fix for issue #1150 - needs improvement and review of other textcomplet... | Mario Vavti | 2018-05-03 | 1 | -2/+5 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-05-03 | 2 | -0/+18 |
|\ \ \ |
|
| * \ \ | Merge pull request #1152 from dawnbreak/dev | git-marijus | 2018-05-03 | 2 | -0/+18 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Update composer autoload cache. | Klaus Weidenbach | 2018-05-02 | 2 | -0/+18 |
| |/ / |
|
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-03 | 16 | -53/+126 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | provide easy access to the autoperms setting for forum and repository channel... | zotlabs | 2018-05-02 | 2 | -2/+14 |
| * | make the cloud logging a bit less verbose until we actually need it. | zotlabs | 2018-05-02 | 2 | -2/+2 |
| * | admin delete of files | zotlabs | 2018-05-02 | 5 | -12/+39 |
| * | backend work to allow admin to delete photos. Still requires frontend work to... | zotlabs | 2018-05-02 | 3 | -29/+53 |
| * | Provide admin delete ability if the viewer is admin but has no existing delet... | zotlabs | 2018-05-02 | 3 | -8/+18 |
| * | hubzilla issue #1151 - activitypub mention gets bookmarked | zotlabs | 2018-05-02 | 2 | -4/+4 |
* | | Merge pull request #1146 from galettesaucisse/patch-46 | git-marijus | 2018-05-02 | 1 | -0/+13 |
|\ \ |
|
| * | | Create /doc/context/fr/wiki/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+13 |
* | | | Merge pull request #1145 from galettesaucisse/patch-45 | git-marijus | 2018-05-02 | 1 | -0/+8 |
|\ \ \ |
|
| * | | | Create /doc/context/fr/webpages/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 |
* | | | | Merge pull request #1144 from galettesaucisse/patch-44 | git-marijus | 2018-05-02 | 1 | -0/+20 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/fr/settings/tokens | Galette Saucisse | 2018-04-30 | 1 | -0/+20 |
| |/ / / |
|
* | | | | Merge pull request #1143 from galettesaucisse/patch-43 | git-marijus | 2018-05-02 | 1 | -0/+18 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/fr/settings/channel/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 |
| |/ / / |
|
* | | | | Merge pull request #1142 from galettesaucisse/patch-42 | git-marijus | 2018-05-02 | 1 | -0/+18 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/fr/settings/account/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 |
| |/ / / |
|
* | | | | Merge pull request #1141 from galettesaucisse/patch-40 | git-marijus | 2018-05-02 | 1 | -0/+6 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/fr/profile/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 |
| |/ / / |
|
* | | | | Merge pull request #1140 from galettesaucisse/patch-39 | git-marijus | 2018-05-02 | 1 | -0/+6 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/photos/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 |
| |/ / / |
|
* | | | | Merge pull request #1139 from galettesaucisse/patch-38 | git-marijus | 2018-05-02 | 1 | -0/+10 |
|\ \ \ \ |
|
| * | | | | Create /doc/context/fr/mail/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+10 |
| |/ / / |
|
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-02 | 9 | -86/+114 |
|\ \ \ \
| | |_|/
| |/| | |
|