aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | 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.
* | | | | In the rare case where a default channel is not selected but channels ↵zotlabs2017-04-261-78/+82
| | | | | | | | | | | | | | | | | | | | actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel.
* | | | | support reverse magic-auth in oembed requests.zotlabs2017-04-261-2/+9
| | | | |
* | | | | provide a broken feed for services which require a broken feedzotlabs2017-04-266-70/+83
| | | | |
* | | | | make it easier to hook into feed headers in the futurezotlabs2017-04-261-13/+19
| | | | |
* | | | | smilies - add param to only list default emoticonszotlabs2017-04-261-1/+6
|/ / / /
* | / / Revert "fix the query of last pullrequest"Mario Vavti2017-04-241-1/+1
| |/ / |/| | | | | | | | This reverts commit bda9a833ba2511a36a569dd03991130e775c5ca7.
* | | fix the query of last pullrequestMario Vavti2017-04-231-1/+1
| | |
* | | Revert "Revert "if there is no site record, site_dead won't be 0, in a left ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | join it will in fact be null. As long as it isn't 1, we should attempt delivery."" This reverts commit b6be0e1b996840192ea50b864b260d4d4cefbbb2.
* | | Revert "if there is no site record, site_dead won't be 0, in a left join it ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | will in fact be null. As long as it isn't 1, we should attempt delivery." This reverts commit 42f5291f692965944076a5005b101fe409bb182c.
* | | Merge pull request #730 from zotlabs/nullsitegit-marijus2017-04-231-1/+1
|\ \ \ | |/ / |/| | if there is no site record, site_dead won't be 0, in a left join it w…
| * | if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-221-1/+1
|/ / | | | | | | fact be null. As long as it isn't 1, we should attempt delivery.
* | Merge pull request #728 from zotlabs/typo1git-marijus2017-04-211-1/+1
|\ \ | | | | | | Typo1