| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 12 | -17/+46 |
| |\ | |||||
| | * | 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 |
| | |/ / / | |||||
| * | | | | issues from hubzilla:#737 | zotlabs | 2017-04-26 | 4 | -7/+18 |
| | | | | | |||||
| * | | | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 6 | -70/+83 |
| | | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-25 | 0 | -0/+0 |
| |\| | | | |||||
| | * | | | 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. | ||||
| | * | Merge pull request #728 from zotlabs/typo1 | git-marijus | 2017-04-21 | 1 | -1/+1 |
| | |\ | | | | | | | Typo1 | ||||
| | | * | typo - this time the correct repo | zotlabs | 2017-04-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | Revert "typo" - wrong repo | zotlabs | 2017-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | This reverts commit d9a48092e690f582585d939f5b193aedd4bcebfb. | ||||
| | | * | typo | zotlabs | 2017-04-20 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #723 from zotlabs/followfeed | git-marijus | 2017-04-20 | 2 | -2/+2 |
| | |\ | | | | | | | follow_from_feed issue when called from push | ||||
| | | * | follow_from_feed issue when called from push | zotlabs | 2017-04-19 | 2 | -2/+2 |
| | |/ | |||||
| * | | mostly text formatting changes | zotlabs | 2017-04-25 | 1 | -64/+66 |
| | | | |||||
| * | | smilies - add param to only list default emoticons | zotlabs | 2017-04-25 | 1 | -1/+6 |
| | | | |||||
| * | | database upgrade | zotlabs | 2017-04-23 | 3 | -216/+214 |
| | | | |||||
| * | | 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. | ||||
| * | | make it easier to hook into feed headers in the future | zotlabs | 2017-04-20 | 1 | -14/+20 |
| | | | |||||
| * | | The rest of the library and backend changes to support client-side e2ee and ↵ | zotlabs | 2017-04-20 | 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-20 | 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-19 | 1 | -2/+9 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-19 | 1 | -1/+1 |
| |\| | |||||
| | * | order wiki pages by creation date | Mario Vavti | 2017-04-19 | 1 | -1/+1 |
| | | | |||||
| | * | typo | zotlabs | 2017-04-19 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-19 | 1 | -31/+29 |
| | |\ | |||||
| | | * | Merge pull request #722 from zotlabs/env_prv | git-marijus | 2017-04-19 | 1 | -31/+29 |
| | | |\ | | | | | | | | | envelope privacy | ||||
| | | | * | envelope privacy | zotlabs | 2017-04-18 | 1 | -31/+29 |
| | | |/ | |||||
| | * | | backend infrastructure for 'channel protection password'; which will be used ↵ | zotlabs | 2017-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes | ||||
| | * | | don't allow any null fields in notify creation | zotlabs | 2017-04-19 | 1 | -2/+3 |
| | | | | |||||
| | * | | webfinger cleanup | zotlabs | 2017-04-19 | 1 | -20/+23 |
| | |/ | |||||
| * | | follow_from_feed issue when called from push | zotlabs | 2017-04-19 | 2 | -2/+2 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |