Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | only provide 'connected apps' on the settings menu if techlevel > 0. | zotlabs | 2017-05-30 | 1 | -5/+7 |
| | | |||||
* | | remove text_highlight css load from core | zotlabs | 2017-05-30 | 1 | -1/+0 |
| | | |||||
* | | add the hl tag to the bbcode ref | zotlabs | 2017-05-30 | 1 | -0/+3 |
| | | |||||
* | | correct the bbcode documentation for syntax highlighted code blocks now that ↵ | zotlabs | 2017-05-30 | 1 | -1/+3 |
| | | | | | | | | this is provided by a plugin. | ||||
* | | move code syntax highlighting to plugin | zotlabs | 2017-05-30 | 54 | -23416/+7 |
| | | |||||
* | | re-arrange a few functions | zotlabs | 2017-05-30 | 3 | -67/+68 |
| | | |||||
* | | bring back html2markdown which went away in the merge | zotlabs | 2017-05-30 | 1 | -0/+30 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-30 | 10 | -141/+580 |
|\| | |||||
| * | update changelog | Mario Vavti | 2017-05-30 | 1 | -0/+1 |
| | | |||||
| * | fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ↵ | Mario Vavti | 2017-05-30 | 1 | -1/+2 |
| | | | | | | | | case there are further issues we should probably also put a ob_end_clean() right before readfile() | ||||
| * | Merge pull request #800 from git-marijus/dev | git-marijus | 2017-05-29 | 1 | -1/+6 |
| |\ | | | | | | | fix update_r1189() for mysql and postgres | ||||
| | * | fix update_r1189() for mysql and postgres | Mario Vavti | 2017-05-28 | 1 | -1/+6 |
| | | | |||||
| * | | Merge pull request #796 from dawnbreak/QA_testing | git-marijus | 2017-05-28 | 7 | -142/+538 |
| |\ \ | | |/ | |/| | Testing HTML 2 Markdown conversion. | ||||
| | * | Don't drop PHP5 support yet. | Klaus Weidenbach | 2017-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | Scalar Type Hints and Return Type Declarations were introduced in PHP7. | ||||
| | * | :hammer::white_check_mark: Add html2markdown unit tests. | Klaus Weidenbach | 2017-05-27 | 3 | -9/+208 |
| | | | | | | | | | | | | | | | | | | A tiny refactoring to make HTML 2 markdown conversion testable. Add some unit tests to check the behavior of the now used HTML2Markdown library. There are some differences compared to the old pixel418/markdownify library. | ||||
| | * | :arrow_up: Update dev libraries. | Klaus Weidenbach | 2017-05-24 | 4 | -133/+330 |
| | | | | | | | | | | | | phpunit 6.1, behat, etc. | ||||
| * | | update changelog for 2.4 | Mario Vavti | 2017-05-28 | 1 | -1/+78 |
| | | | |||||
* | | | 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 | ||||
* | | | move disapora xrd stuff to plugin | zotlabs | 2017-05-30 | 3 | -20/+3 |
| | | | |||||
* | | | create account_store_lowlevel() | zotlabs | 2017-05-29 | 1 | -34/+58 |
| | | | |||||
* | | | remove server role from language configs | zotlabs | 2017-05-29 | 10 | -78/+0 |
| | | | |||||
* | | | more deprecate server_role | zotlabs | 2017-05-29 | 4 | -14/+6 |
| | | | |||||
* | | | start deprecation of server_role | zotlabs | 2017-05-29 | 13 | -76/+23 |
| | | | |||||
* | | | work through the diaspora_v2 outgoing status posts | zotlabs | 2017-05-28 | 1 | -1/+2 |
| | | | |||||
* | | | replace really old example widgets with pointer to current widget list | zotlabs | 2017-05-28 | 1 | -7/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-27 | 0 | -0/+0 |
|\| | | |||||
| * | | Merge pull request #798 from zotlabs/pagetitlefix | git-marijus | 2017-05-27 | 3 | -4/+6 |
| |\ \ | | |/ | |/| | hubzilla issue #795 | ||||
| | * | hubzilla issue #795 | zotlabs | 2017-05-27 | 3 | -4/+6 |
| |/ | |||||
* | | hubzilla issue #795 | zotlabs | 2017-05-26 | 3 | -4/+6 |
| | | |||||
* | | update link to account roles help on new_channel page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | update the link to account roles help on register page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | looks like a commit was lost someplace, but I'll re-do it later (convert sql ↵ | zotlabs | 2017-05-25 | 1 | -18/+18 |
| | | | | | | | | schema files to default integers to int values); in any event change all the mysql strings that were 255 maxlength to 191 maxlength in case they get used as indexes down the line | ||||
* | | put back obsolete permission fields in abook and channel schema files so we ↵ | zotlabs | 2017-05-25 | 1 | -0/+20 |
| | | | | | | | | can restore the old data without choking when upgrading the table type | ||||
* | | start using the abook_not_here flag (requires changes in addons, not easily ↵ | zotlabs | 2017-05-25 | 3 | -5/+14 |
| | | | | | | | | portable to hubzilla) | ||||
* | | only store search info for text filetypes when updating the documentation ↵ | zotlabs | 2017-05-24 | 1 | -4/+10 |
| | | | | | | | | indexes | ||||
* | | some minor help cleanup - add '-/foo' override of language detection | zotlabs | 2017-05-24 | 2 | -42/+45 |
| | | |||||
* | | remove php version checks for older ( < 5.4) code incompatibilities | zotlabs | 2017-05-23 | 3 | -30/+15 |
| | |