Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-24 | 2 | -28/+53 |
|\ | |||||
| * | Merge pull request #849 from anaqreon/doco | git-marijus | 2017-08-24 | 1 | -1/+24 |
| |\ | | | | | | | Added language selector menu for Help pages | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-24 | 8 | -6/+195 |
| | |\ | |||||
| | * | | Added language selector menu for Help pages | Andrew Manning | 2017-08-24 | 1 | -1/+24 |
| | | | | |||||
| * | | | ditch discover tab in favour of the public stream app | git-marijus | 2017-08-24 | 1 | -18/+1 |
| | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-24 | 8 | -6/+195 |
| |\ \ | | |/ | |/| | |||||
| * | | Fixed incorrect language path when choosing the language from browser preference | Andrew Manning | 2017-08-24 | 1 | -1/+1 |
| | | | |||||
| * | | Repaired and extended support for help page translations including table of ↵ | Andrew Manning | 2017-08-23 | 1 | -10/+29 |
| | | | | | | | | | | | | contents files at the top level. Moved help module javascript to mod_help.js. | ||||
* | | | cards - change placeholdertext, separate from button text | zotlabs | 2017-08-24 | 1 | -1/+5 |
| | | | |||||
* | | | make cards searchable | zotlabs | 2017-08-24 | 2 | -2/+5 |
| |/ |/| | |||||
* | | cards: make page load after comment post | zotlabs | 2017-08-23 | 1 | -0/+6 |
| | | |||||
* | | partial support (unfinished) for ajax loading cards with liveupdate; page ↵ | zotlabs | 2017-08-23 | 1 | -0/+9 |
| | | | | | | | | still functions even though this isn't finished | ||||
* | | use two keys for the updated sort | zotlabs | 2017-08-23 | 1 | -1/+3 |
| | | |||||
* | | add new conv_sort option | zotlabs | 2017-08-23 | 1 | -0/+6 |
| | | |||||
* | | lognoise: don't log sync packet contents if there are no clones to receive them | zotlabs | 2017-08-23 | 1 | -2/+3 |
| | | |||||
* | | several card enhancements | zotlabs | 2017-08-23 | 2 | -1/+8 |
| | | |||||
* | | cards feature | zotlabs | 2017-08-23 | 5 | -2/+154 |
| | | |||||
* | | util/dcp - support recursion and folders full of photos by importing files ↵ | zotlabs | 2017-08-22 | 1 | -1/+7 |
|/ | | | | singly in separate processes - not yet tested | ||||
* | stream_perms_xchans wasn't working which has effects in mod_display and ↵ | zotlabs | 2017-08-21 | 1 | -1/+2 |
| | | | | there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested | ||||
* | issue with oembed of a shared item, which wraps in another share. | zotlabs | 2017-08-20 | 1 | -2/+2 |
| | |||||
* | php warnings | zotlabs | 2017-08-18 | 1 | -1/+1 |
| | |||||
* | remove easter egg | zotlabs | 2017-08-15 | 1 | -7/+0 |
| | |||||
* | new content type | zotlabs | 2017-08-14 | 1 | -1/+0 |
| | |||||
* | add protocol selection to following feeds | zotlabs | 2017-08-12 | 1 | -2/+5 |
| | |||||
* | deliverable_singleton - also check hubloc_hash in case we don't have an ↵ | zotlabs | 2017-08-10 | 1 | -1/+9 |
| | | | | xchan_hash | ||||
* | prevent uploads to comments if the channel has a default private ACL. | zotlabs | 2017-08-10 | 1 | -1/+14 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-10 | 1 | -4/+8 |
|\ | |||||
| * | do not show channel manager and nav channel select if we are in a delegate ↵ | git-marijus | 2017-08-10 | 1 | -4/+8 |
| | | | | | | | | session | ||||
| * | merge red/master into dev | Mario Vavti | 2017-08-10 | 3 | -7/+8 |
| | | |||||
* | | include the mastodon summary in the post | zotlabs | 2017-08-10 | 1 | -2/+2 |
| | | |||||
* | | when following, allow [network]follow_address syntax to connect with a ↵ | zotlabs | 2017-08-10 | 2 | -7/+20 |
| | | | | | | | | specific network for multi-protocol services | ||||
* | | some doco fixes and other real minor stuff to improve logreading ability | zotlabs | 2017-08-09 | 1 | -2/+2 |
| | | |||||
* | | libxml errors | zotlabs | 2017-08-09 | 2 | -5/+6 |
|/ | |||||
* | 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 |