Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-07 | 32 | -570/+3492 |
|\ | |||||
| * | update bs-dev | Mario Vavti | 2017-06-07 | 17 | -462/+3376 |
| | | |||||
| * | Fixed TEXT fields with default values (fixes #803) in mysql creation script. | Manuel Tancoigne | 2017-06-07 | 1 | -6/+6 |
| | | |||||
| * | Merge pull request #809 from dawnbreak/QA_testing | git-marijus | 2017-06-07 | 2 | -11/+24 |
| |\ | | | | | | | :construction_worker::white_check_mark: Add MySQL 5.7 in TravisCI. | ||||
| | * | :construction_worker::white_check_mark: Add MySQL 5.7 in TravisCI. | Klaus Weidenbach | 2017-06-05 | 2 | -11/+24 |
| | | | | | | | | | | | | | | | | | | Use a Docker container to add MySQL 5.7 in TravisCI. A lot of sql_mode settings have changed with 5.7, so finnaly provide it to test against it. | ||||
| * | | Looks like we need the mastodon feed check in core - grrr. Will do that for ↵ | zotlabs | 2017-06-07 | 1 | -0/+3 |
| | | | | | | | | | | | | now until it can be put back into plugins. | ||||
| * | | hubzilla issue #810 | zotlabs | 2017-06-07 | 2 | -2/+32 |
| | | | |||||
| * | | whitespace | zotlabs | 2017-06-07 | 1 | -3/+5 |
| | | | |||||
| * | | always add a length to ostatus compat enclosures - even if unknown (0) | zotlabs | 2017-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | ostatus feeds: extract photo information from posts and convert to ↵ | zotlabs | 2017-06-07 | 1 | -3/+42 |
| | | | | | | | | | | | | enclosures as otherwise OStatus servers will strip them from the HTML in the feed and refuse to render them | ||||
| * | | oembed: ensure that width and height are returned as type int and not float | zotlabs | 2017-06-07 | 1 | -2/+2 |
| | | | |||||
| * | | make authenticated oembeds optional, default to false. | zotlabs | 2017-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | include/socgraph - remove a few obsolete and long-deprecated functions | zotlabs | 2017-06-07 | 1 | -71/+0 |
| | | | |||||
| * | | cleanup only | zotlabs | 2017-06-07 | 2 | -10/+9 |
| | | | |||||
| * | | don't allow negative age in directory listings | zotlabs | 2017-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | a slight tweak to author_is_pmable hook to make it useful | zotlabs | 2017-06-07 | 2 | -6/+6 |
| | | | |||||
| * | | remove text_highlight css load from core | zotlabs | 2017-06-07 | 1 | -1/+0 |
| | | | |||||
| * | | add the hl tag to the bbcode ref | zotlabs | 2017-06-07 | 1 | -0/+3 |
| | | | |||||
| * | | correct the bbcode documentation for syntax highlighted code blocks now that ↵ | zotlabs | 2017-06-07 | 1 | -1/+3 |
| | | | | | | | | | | | | this is provided by a plugin. | ||||
| * | | move code syntax highlighting to plugin | zotlabs | 2017-06-07 | 54 | -23416/+7 |
| | | | |||||
| * | | re-arrange a few functions | zotlabs | 2017-06-07 | 3 | -67/+68 |
| |/ | |||||
| * | fix nav-tabs for dark scheme | git-marijus | 2017-06-04 | 1 | -14/+8 |
| | | |||||
| * | remove duplicate code | git-marijus | 2017-06-04 | 1 | -12/+0 |
| | | |||||
| * | fix allow setting a default schema for the hub (issue #797) and allow ↵ | git-marijus | 2017-06-04 | 2 | -6/+16 |
| | | | | | | | | selecting of focus (hubzilla default) schema if a default is set. | ||||
| * | class mixup | git-marijus | 2017-06-04 | 1 | -1/+1 |
| | | |||||
| * | rewrite wiki pages widget - no need for ajax on pageload, show the pages to ↵ | git-marijus | 2017-06-03 | 4 | -53/+57 |
| | | | | | | | | not authenticated people. | ||||
| * | convert randprof to use chanlink_hash() instead of chanlink_url() and filter ↵ | git-marijus | 2017-06-03 | 2 | -7/+7 |
| | | | | | | | | sys channels by xchan.xchan_system instead of xchan_addr != sys@% | ||||
* | | provide hook when deleting a connection - we need this to clean up dangling ↵ | zotlabs | 2017-06-07 | 2 | -0/+8 |
| | | | | | | | | PuSH subscriptions | ||||
* | | Looks like we need the mastodon feed check in core - grrr. Will do that for ↵ | zotlabs | 2017-06-06 | 1 | -0/+3 |
| | | | | | | | | now until it can be put back into plugins. | ||||
* | | fix a merge mixup on install/schema_msyql.php | zotlabs | 2017-06-06 | 1 | -230/+230 |
| | | |||||
* | | hubzilla issue #810 | zotlabs | 2017-06-06 | 2 | -2/+32 |
| | | |||||
* | | whitespace | zotlabs | 2017-06-05 | 1 | -3/+5 |
| | | |||||
* | | always add a length to ostatus compat enclosures - even if unknown (0) | zotlabs | 2017-06-04 | 1 | -1/+1 |
| | | |||||
* | | ostatus feeds: extract photo information from posts and convert to ↵ | zotlabs | 2017-06-04 | 1 | -3/+42 |
| | | | | | | | | enclosures as otherwise OStatus servers will strip them from the HTML in the feed and refuse to render them | ||||
* | | oembed: ensure that width and height are returned as type int and not float | zotlabs | 2017-06-03 | 1 | -2/+2 |
| | | |||||
* | | make authenticated oembeds optional, default to false. | zotlabs | 2017-06-03 | 1 | -1/+1 |
| | | |||||
* | | include/socgraph - remove a few obsolete and long-deprecated functions | zotlabs | 2017-06-01 | 1 | -71/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-01 | 4 | -322/+345 |
|\| | |||||
| * | Merge pull request #802 from zotlabs/searchwebpages | git-marijus | 2017-06-01 | 3 | -3/+9 |
| |\ | | | | | | | provide ability to search webpages (either public or which contain th… | ||||
| | * | provide ability to search webpages (either public or which contain the ↵ | zotlabs | 2017-05-30 | 3 | -3/+9 |
| | | | | | | | | | | | | observer in the acl) in addition to conversations | ||||
| * | | Merge pull request #805 from zotlabs/mailexport | git-marijus | 2017-06-01 | 2 | -6/+8 |
| |\ \ | | | | | | | | | minor export issue with mail | ||||
| | * | | minor export issue with mail | zotlabs | 2017-05-31 | 2 | -6/+8 |
| | |/ | |||||
| * | | Merge pull request #804 from dawnbreak/dev | git-marijus | 2017-06-01 | 52 | -581/+925 |
| |\ \ | | |/ | |/| | :arrow_up:Update Sabre libraries. | ||||
| | * | :arrow_up:Update Sabre libraries. | Klaus Weidenbach | 2017-06-01 | 52 | -581/+925 |
| |/ | |||||
* | | cleanup only | zotlabs | 2017-05-31 | 2 | -10/+9 |
| | | |||||
* | | active nav-link was white on white | zotlabs | 2017-05-31 | 1 | -0/+4 |
| | | |||||
* | | minor export issue with mail | zotlabs | 2017-05-31 | 2 | -6/+8 |
| | | |||||
* | | don't allow negative age in directory listings | zotlabs | 2017-05-31 | 1 | -1/+1 |
| | | |||||
* | | a slight tweak to author_is_pmable hook to make it useful | zotlabs | 2017-05-31 | 2 | -6/+6 |
| | | |||||
* | | remove default for text/mediumtext sql fields | zotlabs | 2017-05-31 | 2 | -7/+7 |
| | |