aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* show the right conversation active and do not show any conversation active ↵git-marijus2017-07-222-2/+4
| | | | if we compose a new one
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-225-8/+67
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2119-35/+35
| |\
| * | begin the tedious process of mapping activities between AS1, zot, and AS2zotlabs2017-07-201-0/+49
| | |
| * | allow wildcard tag searches in search module alsozotlabs2017-07-201-2/+3
| | |
| * | allow wildcard tag and category searcheszotlabs2017-07-203-6/+15
| | |
* | | indicate the selected channel in the dropdown menu and minor css fixesgit-marijus2017-07-223-16/+4
| | |
* | | more nav_set_selectedgit-marijus2017-07-2214-12/+37
| |/ |/|
* | more nav_set_selected appsgit-marijus2017-07-216-6/+9
| |
* | provide a mechanism to mark apps active in the bingit-marijus2017-07-2113-29/+26
|/
* more css fixesgit-marijus2017-07-201-6/+6
|
* css fixgit-marijus2017-07-201-1/+1
|
* implement update_feed_itemzotlabs2017-07-191-3/+12
|
* hubzilla issue #832zotlabs2017-07-194-3/+8
|
* provide optional salmon signatures for AP entitieszotlabs2017-07-182-5/+18
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-1812-157/+130
|\
| * some fixes for the bs-default schemagit-marijus2017-07-182-15/+12
| |
| * Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-183-12/+149
| |\
| * | issue #827 provide backward compatibility for album links generated in ↵git-marijus2017-07-182-1/+10
| | | | | | | | | | | | earlier times before the ambiguity of photo album names was solved. This may provide incorrect results if two or more photo albums with the same basename exist in different directories of the file tree; but there is no easy way to solve that ambiguity - which is why the link format changed.
| * | some love for the installergit-marijus2017-07-178-139/+116
| | |
* | | ability to use a portion of the message-id to display a message wasn't ↵zotlabs2017-07-181-2/+2
| | | | | | | | | | | | honoured in all cases.
* | | related to hubzilla issue #831 - system.last_expire_day was not being set ↵zotlabs2017-07-181-1/+1
| | | | | | | | | | | | correctly, causing cron_daily to run more frequently than desired.
* | | some corrections to AS encoding based on the current spec (some of this work ↵zotlabs2017-07-171-7/+22
| | | | | | | | | | | | was completed long before the spec settled).
* | | activitypub, cont.zotlabs2017-07-173-15/+60
| | |
* | | Merge branch 'bug827'zotlabs2017-07-171-3/+4
|\ \ \ | |_|/ |/| |
| * | fix typozotlabs2017-07-171-3/+4
| | |
* | | provide content-type matching ability for activitypubzotlabs2017-07-171-0/+38
|/ /
* | fix for bug 827 to provide partial backward compatibility with album names ↵zotlabs2017-07-171-0/+9
| | | | | | | | | | | | in photo items from < hubzilla 2.4 this will only work part of the time - which is why the behaviour was changed
* | activitystreams converters updated to recent speczotlabs2017-07-171-12/+14
| |
* | mis-attributed profile photo when Mastodon comment author has no profile photozotlabs2017-07-161-0/+11
| |
* | initial activitystreams2 parserzotlabs2017-07-161-0/+86
|/
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-163-3/+22
|\
| * deal with mastodon privacy scopes - mark private and block commenting since ↵zotlabs2017-07-151-1/+20
| | | | | | | | we refuse to send private activities through the public OStatus connector.
| * incorrect follow url in webfingerzotlabs2017-07-142-2/+2
| |
* | fix photo item commentsgit-marijus2017-07-161-7/+5
| |
* | fix album linkgit-marijus2017-07-161-1/+1
| |
* | versionMario Vavti2017-07-141-1/+1
|/
* minor optimisationzotlabs2017-07-131-5/+2
|
* update some addon docs and ensure we only generate statistics once a dayzotlabs2017-07-135-10/+27
|
* turn url requests where argv[0] is something.xyz into module='something' and ↵zotlabs2017-07-133-18/+8
| | | | $_REQUEST['module_format'] = 'xyz'; But leave modules beginning with . (like .well_known) alone (convert the initial . to _ and then strip it). This really only affects Siteinfo_json at this time.
* turn platform name and std_version into config variableszotlabs2017-07-133-5/+11
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-135-458/+467
|\
| * Merge red/masterMario Vavti2017-07-1111-16/+56
| |\
| * | update to match primary colorMario Vavti2017-07-102-4/+4
| | |
| * | update r1191: return update_success if table principals exists otherwise ↵Mario Vavti2017-07-101-404/+414
| | | | | | | | | | | | proceed with creating cdav tables.
* | | implement chunked uploads on the wall; making it work painlessly on /cloud ↵zotlabs2017-07-134-134/+206
| | | | | | | | | | | | was attempted but will not be implemented today. That presents some interesting dragons to slay.
* | | fix typoszotlabs2017-07-121-6/+8
| | |
* | | make websub/PuSH and salmon both use consume_feed() for item storage as ↵zotlabs2017-07-121-13/+43
| | | | | | | | | | | | there is a lot of duplication of effort and patches applied to one that haven't been applied to the other. This will require an update of addons as well or follow activities may be duplicated
* | | even more logging of conversation parent discoveryzotlabs2017-07-111-0/+1
| |/ |/|
* | prevent expiration of conversations you are involved with - allows you to ↵zotlabs2017-07-106-4/+36
| | | | | | | | find your own comments months from now