Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-20 | 3 | -5/+15 |
|\ | |||||
| * | Merge pull request #1174 from anaqreon/dev | git-marijus | 2018-05-20 | 1 | -2/+2 |
| |\ | | | | | | | Rename Permission Groups to Permission Categories and clarify feature… | ||||
| | * | Rename Permission Groups to Permission Categories and clarify feature ↵ | Andrew Manning | 2018-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | settings text. | ||||
| * | | implement jot reset button | Mario Vavti | 2018-05-20 | 1 | -1/+5 |
| | | | |||||
| * | | fix issues with attachment labels | Mario Vavti | 2018-05-19 | 1 | -2/+8 |
| | | | |||||
* | | | pleroma does not return a valid JRD when given an accept header of ↵ | zotlabs | 2018-05-20 | 1 | -2/+2 |
| | | | | | | | | | | | | application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint) | ||||
* | | | remove unused mindate parameter in the network/stream API method | zotlabs | 2018-05-20 | 1 | -3/+4 |
|/ / | |||||
* | | wrong default param for pubstream_incl (this checkin also picked up a few ↵ | zotlabs | 2018-05-18 | 1 | -9/+1 |
| | | | | | | | | minor and hopefully non-significant changes) | ||||
* | | provide function to fetch photo contents from url | zotlabs | 2018-05-15 | 1 | -0/+20 |
| | | |||||
* | | 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 | 1 | -4/+4 |
| | | | | plugin to work | ||||
* | make get_default_profile_photo() pluggable | zotlabs | 2018-05-14 | 1 | -0/+11 |
| | |||||
* | ensure all password checking goes through the authenticate plugin hook (for ↵ | zotlabs | 2018-05-14 | 1 | -80/+98 |
| | | | | instance in mod_removeme) | ||||
* | 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 | 1 | -2/+4 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * | | fix postgres issue if register mode is set to yes - with approval | Mario Vavti | 2018-05-12 | 1 | -2/+4 |
| | | | |||||
* | | | more refactor tags/mentions | zotlabs | 2018-05-14 | 1 | -60/+53 |
| |/ |/| | |||||
* | | We're no longer setting a backup ACL for private mention typos. | zotlabs | 2018-05-13 | 1 | -4/+0 |
|/ | |||||
* | use Zlib/MessageFilter for sourced messages also | zotlabs | 2018-05-10 | 1 | -34/+4 |
| | |||||
* | hubzilla issue #1169 | zotlabs | 2018-05-10 | 3 | -62/+18 |
| | |||||
* | 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 | 1 | -1/+1 |
| | | | | 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 | ||||
* | loose ends discovered while fixing hubzilla #1166 | zotlabs | 2018-05-09 | 1 | -2/+2 |
| | |||||
* | hubzilla issue #1166 | zotlabs | 2018-05-09 | 1 | -2/+2 |
| | |||||
* | use imagemagick first stage thumbnail for cover photos, if configured | zotlabs | 2018-05-07 | 1 | -3/+4 |
| | |||||
* | pdf embeds | zotlabs | 2018-05-06 | 1 | -2/+18 |
| | |||||
* | 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 |
| | |||||
* | 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. | ||||
* | allow uninstall of plugins which no longer exists via cmdline tool | zotlabs | 2018-05-05 | 1 | -1/+7 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-05 | 2 | -2/+5 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-05 | 1 | -1/+1 |
| |\ | |||||
| * | | set XML_OPTION_SKIP_WHITE to 1 again | Mario Vavti | 2018-05-04 | 1 | -2/+2 |
| | | | |||||
| * | | missing basetag | Mario Vavti | 2018-05-04 | 1 | -1/+4 |
| | | | |||||
* | | | check_item_source: always log uid | zotlabs | 2018-05-05 | 1 | -0/+1 |
| | | | |||||
* | | | log all possible return conditions from check_item_source(), use consistent ↵ | zotlabs | 2018-05-05 | 1 | -13/+36 |
| |/ |/| | | | | | xchan | ||||
* | | turn skip white back on - (xml actually doesn't parse if you disable this) | zotlabs | 2018-05-04 | 1 | -2/+2 |
|/ | |||||
* | tagging changes: + (old style forum mentions), and underscore space ↵ | zotlabs | 2018-05-03 | 1 | -105/+22 |
| | | | | replacement are no longer supported. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-02 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-02 | 2 | -1/+31 |
| |\ | |||||
| * | | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵ | Mario Vavti | 2018-05-01 | 1 | -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 dev | Mario Vavti | 2018-05-01 | 1 | -13/+26 |
| |\ \ | |||||
| * | | | activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵ | Mario Vavti | 2018-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | button if we do not find an xchan_addr | ||||
| * | | | Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵ | Mario Vavti | 2018-04-30 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 f620274c6a68ae9a2a6a5142947aa199862087fc. | ||||
* | | | | admin delete of files | zotlabs | 2018-05-02 | 1 | -1/+1 |
| | | | |