Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | backport waitmans changes #1170 from master | Mario Vavti | 2018-05-20 | 13 | -13/+13 |
| | |||||
* | do not update #acl-list-content on every click in jot. we just need this ↵ | Mario Vavti | 2018-05-20 | 1 | -49/+51 |
| | | | | updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts. | ||||
* | remove some cruft from initEditor(); | Mario Vavti | 2018-05-20 | 1 | -70/+10 |
| | |||||
* | implement jot reset button | Mario Vavti | 2018-05-20 | 6 | -6/+37 |
| | |||||
* | update to fork-awesome 1.1 and fix an old font-awesome reference | Mario Vavti | 2018-05-19 | 9 | -51/+215 |
| | |||||
* | fix issue where images were not visible in acl selector after using search | Mario Vavti | 2018-05-19 | 1 | -0/+4 |
| | |||||
* | fix issues with attachment labels | Mario Vavti | 2018-05-19 | 1 | -2/+8 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 1 | -2/+6 |
|\ | |||||
| * | hubzilla issue #1086, pending count on admin summary page | zotlabs | 2018-05-19 | 1 | -2/+6 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 4 | -14/+7 |
|\| | |||||
| * | wrong default param for pubstream_incl (this checkin also picked up a few ↵ | zotlabs | 2018-05-18 | 4 | -14/+7 |
| | | | | | | | | minor and hopefully non-significant changes) | ||||
* | | remove debug code | Mario Vavti | 2018-05-18 | 1 | -4/+0 |
| | | |||||
* | | version | Mario Vavti | 2018-05-18 | 1 | -1/+1 |
| | | |||||
* | | an attempt to fix the new_channel validation situation | Mario Vavti | 2018-05-18 | 3 | -32/+80 |
| | | |||||
* | | display address in contact_format() instead of nick | Mario Vavti | 2018-05-17 | 1 | -1/+1 |
|/ | |||||
* | missing include | Mario Vavti | 2018-05-16 | 1 | -0/+1 |
| | |||||
* | provide function to fetch photo contents from url | zotlabs | 2018-05-15 | 3 | -10/+27 |
| | |||||
* | anybody authenticated not correctly handled in can_comment_on_post() | zotlabs | 2018-05-15 | 1 | -1/+1 |
| | |||||
* | we must now provide the full path to the profile image for the cavatar ↵ | Mario Vavti | 2018-05-15 | 4 | -15/+15 |
| | | | | plugin to work | ||||
* | make get_default_profile_photo() pluggable | zotlabs | 2018-05-14 | 1 | -0/+11 |
| | |||||
* | code whitespace and formatting | zotlabs | 2018-05-14 | 1 | -6/+6 |
| | |||||
* | If somebody used hooks to create a new permission role, there was no ↵ | zotlabs | 2018-05-14 | 1 | -0/+2 |
| | | | | mechanism to insert the new role into the dropdown list of roles at selection time. | ||||
* | ensure all password checking goes through the authenticate plugin hook (for ↵ | zotlabs | 2018-05-14 | 1 | -80/+98 |
| | | | | instance in mod_removeme) | ||||
* | refactor the 'where does the register link point?' logic | zotlabs | 2018-05-14 | 5 | -18/+43 |
| | |||||
* | fine tuning the refactored tag/mention code | zotlabs | 2018-05-14 | 1 | -1/+2 |
| | |||||
* | 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 |
| | | |