Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 | |
|\ \ | ||||||
| * \ | Merge pull request #733 from zotlabs/etwoeemail | git-marijus | 2017-04-26 | 6 | -14/+31 | |
| |\ \ | | | | | | | | | Etwoeemail | |||||
| | * | | database support for client side e2ee for private mail | zotlabs | 2017-04-25 | 6 | -14/+31 | |
| | | | | ||||||
| * | | | Merge pull request #731 from anaqreon/dev | git-marijus | 2017-04-26 | 2 | -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 Manning | 2017-04-23 | 2 | -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/emojionelicense | git-marijus | 2017-04-26 | 1 | -0/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Emojionelicense | |||||
| | * | | | | Attribution is required | zotlabs | 2017-04-26 | 1 | -0/+2 | |
| | | |/ / | | |/| | | ||||||
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-25 | 0 | -0/+0 | |
| | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | if there is no site record, site_dead won't be 0, in a left join it will in ↵ | zotlabs | 2017-04-23 | 1 | -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 ↵ | zotlabs | 2017-04-26 | 6 | -59/+20 | |
| | | | | | | | | | | | | | | | | | | | | deprecate previous uses of item_obscured. | |||||
* | | | | | In the rare case where a default channel is not selected but channels ↵ | zotlabs | 2017-04-26 | 1 | -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. | zotlabs | 2017-04-26 | 1 | -2/+9 | |
| | | | | | ||||||
* | | | | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-26 | 6 | -70/+83 | |
| | | | | | ||||||
* | | | | | make it easier to hook into feed headers in the future | zotlabs | 2017-04-26 | 1 | -13/+19 | |
| | | | | | ||||||
* | | | | | smilies - add param to only list default emoticons | zotlabs | 2017-04-26 | 1 | -1/+6 | |
|/ / / / | ||||||
* | / / | Revert "fix the query of last pullrequest" | Mario Vavti | 2017-04-24 | 1 | -1/+1 | |
| |/ / |/| | | | | | | | | This reverts commit bda9a833ba2511a36a569dd03991130e775c5ca7. | |||||
* | | | fix the query of last pullrequest | Mario Vavti | 2017-04-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "Revert "if there is no site record, site_dead won't be 0, in a left ↵ | Mario Vavti | 2017-04-23 | 1 | -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 Vavti | 2017-04-23 | 1 | -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/nullsite | git-marijus | 2017-04-23 | 1 | -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 ↵ | zotlabs | 2017-04-22 | 1 | -1/+1 | |
|/ / | | | | | | | fact be null. As long as it isn't 1, we should attempt delivery. |