Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | get rid of edit activities | zotlabs | 2017-05-08 | 1 | -1/+11 |
| | |||||
* | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-08 | 1 | -3/+4 |
| | |||||
* | Merge pull request #756 from dawnbreak/QA_testing | git-marijus | 2017-05-07 | 4 | -6/+22 |
|\ | | | | | :construction_worker::white_check_mark::bug: Import table structure in TravisCI. | ||||
| * | :construction_worker::white_check_mark::bug: Import table structure in TravisCI. | Klaus Weidenbach | 2017-05-06 | 4 | -6/+22 |
| | | | | | | | | | | Fix a syntax error in schema_postres.sql which was discovered while working on this. | ||||
* | | Merge pull request #761 from anaqreon/dev | git-marijus | 2017-05-07 | 1 | -1/+1 |
|\ \ | |/ |/| | Mail subject bug fix | ||||
| * | Mail subject bug fix | Andrew Manning | 2017-05-07 | 1 | -1/+1 |
|/ | |||||
* | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 3 | -11/+38 |
| | |||||
* | css hack to make remote channel menu header look in line with the rest if in ↵ | Mario Vavti | 2017-05-05 | 1 | -0/+6 |
| | | | | collapsed state | ||||
* | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #751 from dawnbreak/docu | git-marijus | 2017-05-05 | 7 | -87/+135 |
|\ | | | | | :bulb: Add Doxygen fix for @var member variable documentation. | ||||
| * | :bulb: correct some Doxygen syntax mistakes. | Klaus Weidenbach | 2017-05-05 | 5 | -87/+114 |
| | | |||||
| * | :bulb: Add Doxygen fix for @var member variable documentation. | Klaus Weidenbach | 2017-05-04 | 2 | -0/+21 |
| | | | | | | | | | | | | Add an input filter to Doxygen to parse @var class member variable documentation, so it is bit more compatible how anybody else interpretes it. | ||||
* | | Merge pull request #753 from zotlabs/mdauto | git-marijus | 2017-05-05 | 1 | -5/+12 |
|\ \ | | | | | | | markdown autolinks - hubzilla bug #752 | ||||
| * | | markdown autolinks - hubzilla bug #752 | zotlabs | 2017-05-05 | 1 | -5/+12 |
|/ / | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-05-04 | 184 | -2689/+910 |
|\| | |||||
| * | update sabredav to version 3.2.2 | Mario Vavti | 2017-05-04 | 171 | -2623/+794 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-04 | 17 | -67/+117 |
| |\ | |||||
| | * | Merge pull request #750 from zotlabs/abnothere | git-marijus | 2017-05-04 | 7 | -6/+19 |
| | |\ | | | | | | | | | abook_not_here flag created to indicate singleton connections which a… | ||||
| | | * | one file hadn't yet been saved when doing pull request | zotlabs | 2017-05-03 | 1 | -0/+1 |
| | | | | |||||
| | | * | abook_not_here flag created to indicate singleton connections which are ↵ | zotlabs | 2017-05-03 | 6 | -6/+18 |
| | | | | | | | | | | | | | | | | connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented. | ||||
| | * | | Merge pull request #749 from anaqreon/dev | git-marijus | 2017-05-04 | 2 | -1/+18 |
| | |\ \ | | | | | | | | | | | German translations for demohub | ||||
| | | * | | Add contributor to credits | Andrew Manning | 2017-05-03 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | German translations for demohub | Andrew Manning | 2017-05-03 | 2 | -483/+520 |
| | | | | | |||||
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-05-03 | 20 | -624/+1175 |
| | | |\| | |||||
| | | * | | Reformatted Webpages.php to clean up whitespace, where there was a mixture ↵ | Andrew Manning | 2017-04-29 | 1 | -504/+483 |
| | | | | | | | | | | | | | | | | | | | | of spaces and tabs for indentation. No other changes made. | ||||
| | * | | | Merge pull request #747 from dawnbreak/simplepie | git-marijus | 2017-05-04 | 8 | -60/+80 |
| | |\ \ \ | | | |_|/ | | |/| | | :arrow_up: Update SimplePie library to 1.5. | ||||
| | | * | | :arrow_up: Update SimplePie library to 1.5. | Klaus Weidenbach | 2017-05-04 | 8 | -60/+80 |
| | |/ / | | | | | | | | | | | | | | | | | There is a new stable release, so upgrade from the dev branch to the new 1.5 release. | ||||
| * / / | bump version | Mario Vavti | 2017-05-03 | 1 | -1/+1 |
| |/ / | |||||
* / / | typo | zotlabs | 2017-05-04 | 1 | -1/+1 |
|/ / | |||||
* | | add check for php zip extension | Mario Vavti | 2017-05-03 | 1 | -1/+6 |
| | | |||||
* | | Update INSTALL.txt | Andrew Manning | 2017-05-03 | 1 | -1/+1 |
| | | | | | | The webpage element portation tools need the zip extension, such as the `php7.0-zip` package on Debian. | ||||
* | | Merge pull request #742 from dawnbreak/QA_testing | git-marijus | 2017-05-03 | 3 | -30/+289 |
|\ \ | | | | | | | :white_check_mark::bulb: Add Unit Tests for AccessList class. | ||||
| * | | :white_check_mark::bulb: Add Unit Tests for AccessList class. | Klaus Weidenbach | 2017-05-01 | 3 | -30/+289 |
|/ / | | | | | | | Also some Doxygen docu for this class. | ||||
* | | version and strings | Mario Vavti | 2017-05-01 | 2 | -541/+558 |
| | | |||||
* | | update bs4-dev | Mario Vavti | 2017-05-01 | 6 | -14/+50 |
| | | |||||
* | | use hostname, not url | zotlabs | 2017-05-01 | 1 | -1/+1 |
| | | |||||
* | | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵ | zotlabs | 2017-05-01 | 2 | -5/+22 |
| | | | | | | | | local server bypass the network access and invoke zotfeed directly. | ||||
* | | ugly postgres fixes | zotlabs | 2017-05-01 | 1 | -22/+34 |
| | | |||||
* | | more work on client side e2ee | zotlabs | 2017-05-01 | 2 | -6/+25 |
| | | |||||
* | | profile_tabs is now channel_apps (except the original was left behind as the ↵ | zotlabs | 2017-05-01 | 1 | -2/+171 |
| | | | | | | | | gitwiki addon still uses it). A couple of things were modernised but basic functionality is the same as the latest revisions to the original. | ||||
* | | more work client mail crypto | zotlabs | 2017-05-01 | 1 | -5/+15 |
| | | |||||
* | | make mail_store() safe for postgres or mysql5.7 - although this interface ↵ | zotlabs | 2017-05-01 | 1 | -2/+9 |
|/ | | | | needs to be refactored in the future | ||||
* | Update api_zot.bb | Andrew Manning | 2017-04-29 | 1 | -1/+1 |
| | | | Fix incorrect parameter name | ||||
* | Merge pull request #739 from zotlabs/mast35 | git-marijus | 2017-04-28 | 2 | -11/+22 |
|\ | | | | | update feedutils with as:author changes, also update tests | ||||
| * | update feedutils with as:author changes, also update tests | zotlabs | 2017-04-27 | 2 | -11/+22 |
|/ | |||||
* | issues from hubzilla:#737 | zotlabs | 2017-04-27 | 4 | -7/+18 |
| | |||||
* | Merge pull request #736 from zotlabs/feedfck | git-marijus | 2017-04-27 | 3 | -2/+50 |
|\ | | | | | provide a broken feed as a separate module | ||||
| * | provide a broken feed as a separate module | zotlabs | 2017-04-26 | 3 | -2/+50 |
|/ | |||||
* | make mastodon happy args | Mario Vavti | 2017-04-26 | 3 | -3/+3 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 9 | -14/+43 |
|\ |