Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-30 | 1 | -8/+16 |
|\ | |||||
| * | update feedutils with as:author changes, also update tests | zotlabs | 2017-04-27 | 1 | -8/+16 |
| | | |||||
* | | ugly postgres fixes | zotlabs | 2017-04-30 | 1 | -22/+34 |
| | | |||||
* | | more work on client side e2ee | zotlabs | 2017-04-29 | 1 | -5/+0 |
| | | |||||
* | | profile_tabs is now channel_apps (except the original was left behind as the ↵ | zotlabs | 2017-04-27 | 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-04-27 | 1 | -5/+15 |
| | | |||||
* | | make mail_store() safe for postgres or mysql5.7 - although this interface ↵ | zotlabs | 2017-04-27 | 1 | -2/+9 |
| | | | | | | | | needs to be refactored in the future | ||||
* | | more client-side mail privacy work | zotlabs | 2017-04-26 | 2 | -6/+28 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 3 | -3/+14 |
|\| | |||||
| * | make mastodon happy args | Mario Vavti | 2017-04-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 2 | -2/+13 |
| |\ | |||||
| | * | Merge pull request #733 from zotlabs/etwoeemail | git-marijus | 2017-04-26 | 1 | -2/+4 |
| | |\ | | | | | | | | | Etwoeemail | ||||
| | | * | database support for client side e2ee for private mail | zotlabs | 2017-04-25 | 1 | -2/+4 |
| | | | | |||||
| | * | | When template "none" is used in a webpage layout, then the contents of the ↵ | Andrew Manning | 2017-04-23 | 1 | -0/+9 |
| | |/ | | | | | | | | | | page should be the sole output, with no other code before or after the page element content. | ||||
| * | | The rest of the library and backend changes to support client-side e2ee and ↵ | zotlabs | 2017-04-26 | 2 | -40/+10 |
| | | | | | | | | | | | | deprecate previous uses of item_obscured. | ||||
| * | | 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 | 2 | -33/+44 |
| | | | |||||
| * | | 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 |
| |/ | |||||
| * | 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 |
| | | |||||
| * | follow_from_feed issue when called from push | zotlabs | 2017-04-19 | 2 | -2/+2 |
| | | |||||
* | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 2 | -33/+44 |
| | | |||||
* | | smilies - add param to only list default emoticons | zotlabs | 2017-04-25 | 1 | -1/+6 |
| | | |||||
* | | database upgrade | zotlabs | 2017-04-23 | 2 | -5/+2 |
| | | |||||
* | | 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 | 2 | -40/+10 |
| | | | | | | | | deprecate previous uses of item_obscured. | ||||
* | | support reverse magic-auth in oembed requests. | zotlabs | 2017-04-19 | 1 | -2/+9 |
| | | |||||
* | | follow_from_feed issue when called from push | zotlabs | 2017-04-19 | 2 | -2/+2 |
| | | |||||
* | | give the item_obscured flag a new lease on life by using it to designate ↵ | zotlabs | 2017-04-18 | 2 | -9/+17 |
| | | | | | | | | third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 3 | -311/+436 |
|\| | |||||
| * | We do not parse the body in discover_by_url(), so no need to preserve ↵ | Klaus Weidenbach | 2017-04-15 | 1 | -7/+1 |
| | | | | | | | | iframes in SimplePie. | ||||
| * | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 2 | -153/+241 |
| | | | | | | | | | | | | | | | | | | | | | | As a follow up to issue #699 update SimplePie from 1.2.1-dev (around 6years old) to current git master (1.4.4-dev). We use the master branch until the next release because it contains our patch for enclosure titles already. The other patches in the library from us can be done by configuring the SimplePie object in our code instead. Used composer to manage this library and use class autoloading. Add some unit tests for include/feedutils.php, but the interesting parts are unfortunately not testable with the current code. | ||||
| * | Merge pull request #716 from dawnbreak/docu | git-marijus | 2017-04-14 | 1 | -260/+293 |
| |\ | | | | | | | Some documentation for include/network.php and some fixes. | ||||
| | * | Some documentation for include/network.php and some fixes. | Klaus Weidenbach | 2017-04-14 | 1 | -260/+293 |
| | | | | | | | | | | | | Some variables had wrong names and have never been used. | ||||
| * | | missing includes | Mario Vavti | 2017-04-13 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #715 from zotlabs/cpp | git-marijus | 2017-04-13 | 3 | -2/+8 |
| |\ | | | | | | | backend infrastructure for 'channel protection password'; which will … | ||||
| | * | make sure the new fields don't leak through sync packets and break older ↵ | zotlabs | 2017-04-12 | 1 | -0/+2 |
| | | | | | | | | | | | | versions | ||||
| | * | backend infrastructure for 'channel protection password'; which will be used ↵ | zotlabs | 2017-04-12 | 2 | -2/+6 |
| | | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes | ||||
| * | | correct the mastodon "boost" (aka 'share') author attribution by checking ↵ | zotlabs | 2017-04-12 | 1 | -54/+85 |
| | | | | | | | | | | | | for share activities and pulling the original author info from the activity:object | ||||
| * | | ugly hack to webfinger to allow connections to be made to mastodon servers. | zotlabs | 2017-04-12 | 1 | -3/+10 |
| | | | |||||
| * | | some signatures showing as invalid because of recent import_author_zot() ↵ | zotlabs | 2017-04-12 | 1 | -7/+25 |
| |/ | | | | | | | changes. | ||||
| * | photo size-0 issue | zotlabs | 2017-04-07 | 1 | -0/+1 |
| | | |||||
| * | remove redundant string | Mario Vavti | 2017-04-07 | 1 | -2/+1 |
| | | |||||
| * | css fixes and missing string | Mario Vavti | 2017-04-07 | 1 | -1/+2 |
| | | |||||
| * | only log zot_refresh content if json decode was successful. | zotlabs | 2017-04-07 | 1 | -2/+2 |
| | | |||||
| * | revisit the import_author_zot algorithm yet again. There was one bug that we ↵ | zotlabs | 2017-04-07 | 1 | -2/+34 |
| | | | | | | | | weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. | ||||
| * | import_author_xchan - since we rarely refresh zot-info for non-connections, ↵ | zotlabs | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | | force a cache reload once a week to catch things like profile photo updates and location changes | ||||
* | | make sure the new fields don't leak through sync packets and break older ↵ | zotlabs | 2017-04-12 | 1 | -0/+2 |
| | | | | | | | | versions |