Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-14 | 197 | -5920/+7334 |
|\ | |||||
| * | Revert "We're no longer setting a backup ACL for private mention typos." | Mario Vavti | 2018-05-14 | 1 | -0/+4 |
| | | | | | | | | This reverts commit 356c7003f2d18a283a819c22c255f03397e99fc9. | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-14 | 1 | -4/+0 |
| |\ | |||||
| * | | bump version | Mario Vavti | 2018-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | consolidate recent autocomplete changes | Mario Vavti | 2018-05-13 | 3 | -32/+17 |
| | | | |||||
| * | | streamline appearence of guest tokens individual perms with those in connedit | Mario Vavti | 2018-05-13 | 2 | -5/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-13 | 2 | -5/+10 |
| |\ \ | |||||
| * | | | fix php warning | Mario Vavti | 2018-05-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix postgres issue if register mode is set to yes - with approval | Mario Vavti | 2018-05-12 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge pull request #1164 from einervonvielen/install_imagemagick | git-marijus | 2018-05-11 | 2 | -8/+43 |
| |\ \ \ | | | | | | | | | | | Install imagemagick. Instructions to avoid DNS check if it fails. | ||||
| | * | | | Corrected description for getting a domain. | Einer von Vielen | 2018-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Corrected description for getting a domain. | Einer von Vielen | 2018-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Instructions for imagemagick and failed DNS check. Some minor corrections. | Einer von Vielen | 2018-05-05 | 1 | -3/+32 |
| | | | | | |||||
| | * | | | Install imagemagick | Einer von Vielen | 2018-05-05 | 1 | -5/+11 |
| | | | | | |||||
| * | | | | Merge pull request #1168 from dawnbreak/dev | git-marijus | 2018-05-11 | 187 | -5870/+7261 |
| |\ \ \ \ | | | | | | | | | | | | | Fix composer.json | ||||
| | * | | | | :arrow_up: Update libraries. | Klaus Weidenbach | 2018-05-09 | 186 | -5866/+7258 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating smarty/smarty (v3.1.31 => v3.1.32) Updating sabre/vobject (4.1.5 => 4.1.6) | ||||
| | * | | | | Fix composer.json for recent composer. | Klaus Weidenbach | 2018-05-09 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old composer.json is not valid anymore. Make it work with current composer binaries again. | ||||
* | | | | | | more refactor tags/mentions | zotlabs | 2018-05-14 | 2 | -61/+54 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | We're no longer setting a backup ACL for private mention typos. | zotlabs | 2018-05-13 | 1 | -4/+0 |
| |_|_|/ |/| | | | |||||
* | | | | hubzilla issue #1045 - display pubsites link in info area if invite only | zotlabs | 2018-05-12 | 2 | -5/+10 |
|/ / / | |||||
* | | | use '[feed]' in the doc | zotlabs | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | add cancel button to editor, fix issue with autosave of categories | zotlabs | 2018-05-10 | 9 | -3/+21 |
| | | | |||||
* | | | use Zlib/MessageFilter for sourced messages also | zotlabs | 2018-05-10 | 1 | -34/+4 |
| | | | |||||
* | | | add top level posts containing the cid's url to the cid search in ↵ | zotlabs | 2018-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | mod_network. We could alternatively search for mention tags here for a bit more precision but the sql could get pretty hairy with all the joins going on. | ||||
* | | | hubzilla issue #1169 | zotlabs | 2018-05-10 | 6 | -63/+108 |
| | | | |||||
* | | | allow either | zotlabs | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | tag search not finding articles | zotlabs | 2018-05-09 | 1 | -1/+1 |
| | | | |||||
* | | | change the embed from albums hovertip as well to emphasise 'existing' | zotlabs | 2018-05-09 | 1 | -1/+1 |
| | | | |||||
* | | | Change hovertip on paperclip button to read 'Attach/Upload file' because a ↵ | zotlabs | 2018-05-09 | 2 | -2/+2 |
| | | | | | | | | | | | | lot of people gravitate to 'insert photo from album' instead, looking for a way to upload into the post. | ||||
* | | | thread_author_menu - add some more checks as to whether to show certain ↵ | zotlabs | 2018-05-09 | 1 | -9/+12 |
| | | | | | | | | | | | | links. This should complete work on hubzilla issue #1052 | ||||
* | | | minor regression on date queries from channel page | zotlabs | 2018-05-09 | 1 | -0/+3 |
| | | | |||||
* | | | loose ends discovered while fixing hubzilla #1166 | zotlabs | 2018-05-09 | 1 | -2/+2 |
| | | | |||||
* | | | hubzilla issue #1166 | zotlabs | 2018-05-09 | 1 | -2/+2 |
| | | | |||||
* | | | show/hide dot files only in mod_cloud. For DAV let the OS decide | zotlabs | 2018-05-09 | 1 | -1/+1 |
|/ / | |||||
* | | hide dotfiles by default in /cloud - the web interface (they are still ↵ | zotlabs | 2018-05-08 | 1 | -0/+2 |
| | | | | | | | | accessible but hidden). Change this behaviour with pconfig system.show_dot_files | ||||
* | | initial backend support for channel page item search | zotlabs | 2018-05-08 | 1 | -2/+18 |
| | | |||||
* | | changes made during testing imagick scaling for cover photo thumbnail | zotlabs | 2018-05-08 | 1 | -4/+6 |
| | | |||||
* | | use imagemagick first stage thumbnail for cover photos, if configured | zotlabs | 2018-05-07 | 2 | -7/+37 |
| | | |||||
* | | turn down logging from DAV basicauth until needed | zotlabs | 2018-05-07 | 1 | -6/+6 |
| | | |||||
* | | yet another postgres/"group by" issue | zotlabs | 2018-05-07 | 1 | -2/+2 |
| | | |||||
* | | Add supported protocols to siteinfo (not siteinfo.json) | zotlabs | 2018-05-07 | 2 | -0/+10 |
| | | |||||
* | | Simplify first channel creation even further by using a site-configurable ↵ | zotlabs | 2018-05-07 | 5 | -9/+33 |
| | | | | | | | | default permissions role and removing one more conceptual roadblock for first time registrants. This default role only applies to the first channel an account creates and can be changed from the settings page once they've started to explore. This functionality was always present but optional and not well exposed. Now it is part of the standard workflow and exposed in the admin settings. | ||||
* | | remove the old autocomplete cache mechanism | zotlabs | 2018-05-06 | 1 | -21/+1 |
| | | |||||
* | | autocomplete after 2 chars instead of 3; this was changed some months back ↵ | zotlabs | 2018-05-06 | 1 | -8/+8 |
| | | | | | | | | to work around implementation quirks in the custom cache driver that is now disabled. | ||||
* | | pdf embeds | zotlabs | 2018-05-06 | 2 | -2/+22 |
| | | |||||
* | | minor tweak to last pull: ensure that feeds have a name besides whitespace ↵ | zotlabs | 2018-05-06 | 1 | -1/+1 |
| | | | | | | | | characters | ||||
* | | ensure that feed xchans have a name | zotlabs | 2018-05-06 | 1 | -1/+4 |
| | | |||||
* | | minor change to test something | zotlabs | 2018-05-06 | 1 | -2/+2 |
| | | |||||
* | | If one has system.network_page_default set to a different sort order use ↵ | zotlabs | 2018-05-06 | 1 | -1/+1 |
| | | | | | | | | that order on the 'All Channels' selection of the Collections (privacy group) widget. | ||||
* | | Back in the day there were good reasons for showing a permission denied ↵ | zotlabs | 2018-05-06 | 1 | -8/+9 |
| | | | | | | | | photo instead of a null img. It distinguished a 403 from a 404 in an unmistakable way. What we've discovered is that nothing that is gained from this knowledge and it mostly just annoys and confuses people who can't really do anything about it except to express their annoyance/confusion. So just do a 403/404 instead. |