Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge red/master into dev | Mario Vavti | 2017-08-10 | 3 | -7/+8 |
| | |||||
* | ostatus feed was missing comments | zotlabs | 2017-08-06 | 2 | -9/+5 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-06 | 1 | -0/+86 |
|\ | |||||
| * | allow channel address to be changed | zotlabs | 2017-08-04 | 1 | -0/+86 |
| | | |||||
* | | consolidate disable_discover_tab config if it was not yet set to either 1 or ↵ | git-marijus | 2017-08-06 | 2 | -5/+5 |
|/ | | | | 0 in DB | ||||
* | some bb-to-markdown issues | zotlabs | 2017-08-03 | 1 | -5/+2 |
| | |||||
* | minor activitypub rendering stuff | zotlabs | 2017-08-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-01 | 1 | -54/+79 |
|\ | |||||
| * | finally fix recursive attachments permissions | git-marijus | 2017-08-01 | 1 | -54/+79 |
| | | |||||
* | | auto preview when inserting a media item or embed into a post. Since this ↵ | zotlabs | 2017-08-01 | 1 | -0/+2 |
|/ | | | | unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-31 | 1 | -20/+3 |
|\ | |||||
| * | improve file_activity() a little | git-marijus | 2017-07-31 | 1 | -20/+3 |
| | | |||||
* | | modify connection edit display for channels with no address/webbie | zotlabs | 2017-07-30 | 1 | -13/+14 |
| | | |||||
* | | ensure we can work around the $is_http var in include/follow - this is left ↵ | zotlabs | 2017-07-30 | 1 | -14/+13 |
|/ | | | | over from when the only non-webfinger connections we could make were RSS/Atom feeds. | ||||
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-31 | 2 | -3/+16 |
|\ | |||||
| * | provide a better "is_commentable" default for OStatus conversations that ↵ | zotlabs | 2017-07-30 | 1 | -1/+12 |
| | | | | | | | | were fetched on the fly | ||||
| * | add options flag to bb_to_markdown so we can distinguish between diaspora ↵ | zotlabs | 2017-07-30 | 1 | -2/+4 |
| | | | | | | | | | | | | use and other use and therefore filter and adjust content selectively | ||||
* | | disable file notifications on initial upload for now - it can behave funky ↵ | git-marijus | 2017-07-31 | 1 | -3/+3 |
| | | | | | | | | when uploading multiple small files at once | ||||
* | | fix a bug where if multiple channels uploaded the same file to the same ↵ | git-marijus | 2017-07-30 | 1 | -2/+4 |
| | | | | | | | | folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder | ||||
* | | ltrim $display_path in attach_store() to be consistent with attach_mkdir() ↵ | git-marijus | 2017-07-30 | 1 | -2/+2 |
|/ | | | | and go to created folder after successfully creating one | ||||
* | implement file notification on initial upload and rename ↵ | git-marijus | 2017-07-29 | 1 | -7/+14 |
| | | | | get_parent_cloudpath() to get_cloud_url() which now includes the filename | ||||
* | initial notifications support for new shared files and new (since initial ↵ | git-marijus | 2017-07-28 | 1 | -1/+7 |
| | | | | site load) pubstream activity | ||||
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-27 | 6 | -216/+477 |
|\ | |||||
| * | issue with OStatus comments being propagated downstream | zotlabs | 2017-07-26 | 1 | -0/+15 |
| | | |||||
| * | remove activitypub components from core | zotlabs | 2017-07-26 | 1 | -182/+0 |
| | | |||||
| * | more work on signature algorithm choice | zotlabs | 2017-07-26 | 1 | -12/+16 |
| | | |||||
| * | improve the formatting of shares when converting from bbcode to markdown | zotlabs | 2017-07-26 | 1 | -0/+69 |
| | | |||||
| * | start to implement the code needed for verifying variable signature algorithms | zotlabs | 2017-07-25 | 1 | -15/+31 |
| | | |||||
| * | consolidate duplicated code | zotlabs | 2017-07-25 | 1 | -208/+59 |
| | | |||||
| * | sync key changes to clones | zotlabs | 2017-07-25 | 2 | -6/+111 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-25 | 1 | -8/+9 |
| |\ | |||||
| * | | make signing methods variable and signable | zotlabs | 2017-07-25 | 2 | -1/+12 |
| | | | |||||
| * | | new field names did not get saved | zotlabs | 2017-07-24 | 1 | -2/+2 |
| | | | |||||
| * | | provide a keychange operation to rebase an identity on a new keypair | zotlabs | 2017-07-24 | 3 | -0/+372 |
| | | | |||||
* | | | move the active app code to include/nav.php - it is only relevant there | git-marijus | 2017-07-26 | 1 | -0/+3 |
| |/ |/| | |||||
* | | make local channel (not our own) nav menus appear similar to what we are ↵ | git-marijus | 2017-07-25 | 1 | -8/+9 |
|/ | | | | used from remote channels | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-21 | 1 | -18/+4 |
|\ | |||||
| * | provide a mechanism to mark apps active in the bin | git-marijus | 2017-07-21 | 1 | -18/+4 |
| | | |||||
* | | begin the tedious process of mapping activities between AS1, zot, and AS2 | zotlabs | 2017-07-20 | 1 | -0/+49 |
| | | |||||
* | | allow wildcard tag and category searches | zotlabs | 2017-07-20 | 1 | -2/+11 |
|/ | |||||
* | implement update_feed_item | zotlabs | 2017-07-19 | 1 | -3/+12 |
| | |||||
* | hubzilla issue #832 | zotlabs | 2017-07-19 | 2 | -2/+3 |
| | |||||
* | provide optional salmon signatures for AP entities | zotlabs | 2017-07-18 | 1 | -0/+8 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-18 | 1 | -2/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-18 | 2 | -12/+63 |
| |\ | |||||
| * | | issue #827 provide backward compatibility for album links generated in ↵ | git-marijus | 2017-07-18 | 1 | -0/+9 |
| | | | | | | | | | | | | 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 corrections to AS encoding based on the current spec (some of this work ↵ | zotlabs | 2017-07-17 | 1 | -7/+22 |
| | | | | | | | | | | | | was completed long before the spec settled). | ||||
* | | | activitypub, cont. | zotlabs | 2017-07-17 | 1 | -14/+26 |
| | | | |||||
* | | | Merge branch 'bug827' | zotlabs | 2017-07-17 | 1 | -3/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix typo | zotlabs | 2017-07-17 | 1 | -3/+4 |
| | | |