aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #751 from dawnbreak/docugit-marijus2017-05-057-87/+135
|\ | | | | :bulb: Add Doxygen fix for @var member variable documentation.
| * :bulb: correct some Doxygen syntax mistakes.Klaus Weidenbach2017-05-055-87/+114
| |
| * :bulb: Add Doxygen fix for @var member variable documentation.Klaus Weidenbach2017-05-042-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/mdautogit-marijus2017-05-051-5/+12
|\ \ | | | | | | markdown autolinks - hubzilla bug #752
| * | markdown autolinks - hubzilla bug #752zotlabs2017-05-051-5/+12
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-05-04184-2689/+910
|\|
| * update sabredav to version 3.2.2Mario Vavti2017-05-04171-2623/+794
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-0417-67/+117
| |\
| | * Merge pull request #750 from zotlabs/abnotheregit-marijus2017-05-047-6/+19
| | |\ | | | | | | | | abook_not_here flag created to indicate singleton connections which a…
| | | * one file hadn't yet been saved when doing pull requestzotlabs2017-05-031-0/+1
| | | |
| | | * abook_not_here flag created to indicate singleton connections which are ↵zotlabs2017-05-036-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/devgit-marijus2017-05-042-1/+18
| | |\ \ | | | | | | | | | | German translations for demohub
| | | * | Add contributor to creditsAndrew Manning2017-05-031-1/+2
| | | | |
| | | * | German translations for demohubAndrew Manning2017-05-032-483/+520
| | | | |
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-05-0320-624/+1175
| | | |\|
| | | * | Reformatted Webpages.php to clean up whitespace, where there was a mixture ↵Andrew Manning2017-04-291-504/+483
| | | | | | | | | | | | | | | | | | | | of spaces and tabs for indentation. No other changes made.
| | * | | Merge pull request #747 from dawnbreak/simplepiegit-marijus2017-05-048-60/+80
| | |\ \ \ | | | |_|/ | | |/| | :arrow_up: Update SimplePie library to 1.5.
| | | * | :arrow_up: Update SimplePie library to 1.5.Klaus Weidenbach2017-05-048-60/+80
| | |/ / | | | | | | | | | | | | | | | | There is a new stable release, so upgrade from the dev branch to the new 1.5 release.
| * / / bump versionMario Vavti2017-05-031-1/+1
| |/ /
* / / typozotlabs2017-05-041-1/+1
|/ /
* | add check for php zip extensionMario Vavti2017-05-031-1/+6
| |
* | Update INSTALL.txtAndrew Manning2017-05-031-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_testinggit-marijus2017-05-033-30/+289
|\ \ | | | | | | :white_check_mark::bulb: Add Unit Tests for AccessList class.
| * | :white_check_mark::bulb: Add Unit Tests for AccessList class.Klaus Weidenbach2017-05-013-30/+289
|/ / | | | | | | Also some Doxygen docu for this class.
* | version and stringsMario Vavti2017-05-012-541/+558
| |
* | update bs4-devMario Vavti2017-05-016-14/+50
| |
* | use hostname, not urlzotlabs2017-05-011-1/+1
| |
* | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵zotlabs2017-05-012-5/+22
| | | | | | | | local server bypass the network access and invoke zotfeed directly.
* | ugly postgres fixeszotlabs2017-05-011-22/+34
| |
* | more work on client side e2eezotlabs2017-05-012-6/+25
| |
* | profile_tabs is now channel_apps (except the original was left behind as the ↵zotlabs2017-05-011-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 cryptozotlabs2017-05-011-5/+15
| |
* | make mail_store() safe for postgres or mysql5.7 - although this interface ↵zotlabs2017-05-011-2/+9
|/ | | | needs to be refactored in the future
* Update api_zot.bbAndrew Manning2017-04-291-1/+1
| | | Fix incorrect parameter name
* Merge pull request #739 from zotlabs/mast35git-marijus2017-04-282-11/+22
|\ | | | | update feedutils with as:author changes, also update tests
| * update feedutils with as:author changes, also update testszotlabs2017-04-272-11/+22
|/
* issues from hubzilla:#737zotlabs2017-04-274-7/+18
|
* Merge pull request #736 from zotlabs/feedfckgit-marijus2017-04-273-2/+50
|\ | | | | provide a broken feed as a separate module
| * provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
|/
* make mastodon happy argsMario Vavti2017-04-263-3/+3
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-269-14/+43
|\
| * Merge pull request #733 from zotlabs/etwoeemailgit-marijus2017-04-266-14/+31
| |\ | | | | | | Etwoeemail
| | * database support for client side e2ee for private mailzotlabs2017-04-256-14/+31
| | |
| * | Merge pull request #731 from anaqreon/devgit-marijus2017-04-262-0/+10
| |\ \ | | | | | | | | When template "none" is used in a webpage layout, then the contents o…
| | * | When template "none" is used in a webpage layout, then the contents of the ↵Andrew Manning2017-04-232-0/+10
| | | | | | | | | | | | | | | | page should be the sole output, with no other code before or after the page element content.
| * | | Merge pull request #734 from zotlabs/emojionelicensegit-marijus2017-04-261-0/+2
| |\ \ \ | | | | | | | | | | Emojionelicense
| | * | | Attribution is requiredzotlabs2017-04-261-0/+2
| | | |/ | | |/|
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-250-0/+0
| | |\ \ | | |/ / | |/| |
| | * | if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-231-1/+1
| | | | | | | | | | | | | | | | fact be null. As long as it isn't 1, we should attempt delivery.
* | | | The rest of the library and backend changes to support client-side e2ee and ↵zotlabs2017-04-266-59/+20
| | | | | | | | | | | | | | | | deprecate previous uses of item_obscured.