aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* backport waitmans changes #1170 from masterMario Vavti2018-05-2013-13/+13
|
* do not update #acl-list-content on every click in jot. we just need this ↵Mario Vavti2018-05-201-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 Vavti2018-05-201-70/+10
|
* implement jot reset buttonMario Vavti2018-05-206-6/+37
|
* update to fork-awesome 1.1 and fix an old font-awesome referenceMario Vavti2018-05-199-51/+215
|
* fix issue where images were not visible in acl selector after using searchMario Vavti2018-05-191-0/+4
|
* fix issues with attachment labelsMario Vavti2018-05-191-2/+8
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-191-2/+6
|\
| * hubzilla issue #1086, pending count on admin summary pagezotlabs2018-05-191-2/+6
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-194-14/+7
|\|
| * wrong default param for pubstream_incl (this checkin also picked up a few ↵zotlabs2018-05-184-14/+7
| | | | | | | | minor and hopefully non-significant changes)
* | remove debug codeMario Vavti2018-05-181-4/+0
| |
* | versionMario Vavti2018-05-181-1/+1
| |
* | an attempt to fix the new_channel validation situationMario Vavti2018-05-183-32/+80
| |
* | display address in contact_format() instead of nickMario Vavti2018-05-171-1/+1
|/
* missing includeMario Vavti2018-05-161-0/+1
|
* provide function to fetch photo contents from urlzotlabs2018-05-153-10/+27
|
* anybody authenticated not correctly handled in can_comment_on_post()zotlabs2018-05-151-1/+1
|
* we must now provide the full path to the profile image for the cavatar ↵Mario Vavti2018-05-154-15/+15
| | | | plugin to work
* make get_default_profile_photo() pluggablezotlabs2018-05-141-0/+11
|
* code whitespace and formattingzotlabs2018-05-141-6/+6
|
* If somebody used hooks to create a new permission role, there was no ↵zotlabs2018-05-141-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 ↵zotlabs2018-05-141-80/+98
| | | | instance in mod_removeme)
* refactor the 'where does the register link point?' logiczotlabs2018-05-145-18/+43
|
* fine tuning the refactored tag/mention codezotlabs2018-05-141-1/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-14197-5920/+7334
|\
| * Revert "We're no longer setting a backup ACL for private mention typos."Mario Vavti2018-05-141-0/+4
| | | | | | | | This reverts commit 356c7003f2d18a283a819c22c255f03397e99fc9.
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-141-4/+0
| |\
| * | bump versionMario Vavti2018-05-131-1/+1
| | |
| * | consolidate recent autocomplete changesMario Vavti2018-05-133-32/+17
| | |
| * | streamline appearence of guest tokens individual perms with those in conneditMario Vavti2018-05-132-5/+6
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-132-5/+10
| |\ \
| * | | fix php warningMario Vavti2018-05-121-2/+2
| | | |
| * | | fix postgres issue if register mode is set to yes - with approvalMario Vavti2018-05-121-2/+4
| | | |
| * | | Merge pull request #1164 from einervonvielen/install_imagemagickgit-marijus2018-05-112-8/+43
| |\ \ \ | | | | | | | | | | Install imagemagick. Instructions to avoid DNS check if it fails.
| | * | | Corrected description for getting a domain.Einer von Vielen2018-05-051-1/+1
| | | | |
| | * | | Corrected description for getting a domain.Einer von Vielen2018-05-051-1/+1
| | | | |
| | * | | Instructions for imagemagick and failed DNS check. Some minor corrections.Einer von Vielen2018-05-051-3/+32
| | | | |
| | * | | Install imagemagickEiner von Vielen2018-05-051-5/+11
| | | | |
| * | | | Merge pull request #1168 from dawnbreak/devgit-marijus2018-05-11187-5870/+7261
| |\ \ \ \ | | | | | | | | | | | | Fix composer.json
| | * | | | :arrow_up: Update libraries.Klaus Weidenbach2018-05-09186-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 Weidenbach2018-05-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old composer.json is not valid anymore. Make it work with current composer binaries again.
* | | | | | more refactor tags/mentionszotlabs2018-05-142-61/+54
| |_|_|_|/ |/| | | |
* | | | | We're no longer setting a backup ACL for private mention typos.zotlabs2018-05-131-4/+0
| |_|_|/ |/| | |
* | | | hubzilla issue #1045 - display pubsites link in info area if invite onlyzotlabs2018-05-122-5/+10
|/ / /
* | | use '[feed]' in the doczotlabs2018-05-101-1/+1
| | |
* | | add cancel button to editor, fix issue with autosave of categorieszotlabs2018-05-109-3/+21
| | |
* | | use Zlib/MessageFilter for sourced messages alsozotlabs2018-05-101-34/+4
| | |
* | | add top level posts containing the cid's url to the cid search in ↵zotlabs2018-05-101-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 #1169zotlabs2018-05-106-63/+108
| | |