aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* issues from hubzilla:#737zotlabs2017-04-264-7/+18
|
* provide a broken feed for services which require a broken feedzotlabs2017-04-256-70/+83
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-250-0/+0
|\
| * 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
| | * typo - this time the correct repozotlabs2017-04-201-1/+1
| | |
| | * Revert "typo" - wrong repozotlabs2017-04-201-1/+1
| | | | | | | | | | | | This reverts commit d9a48092e690f582585d939f5b193aedd4bcebfb.
| | * typozotlabs2017-04-201-1/+1
| |/
| * Merge pull request #723 from zotlabs/followfeedgit-marijus2017-04-202-2/+2
| |\ | | | | | | follow_from_feed issue when called from push
| | * follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
| |/
* | mostly text formatting changeszotlabs2017-04-251-64/+66
| |
* | smilies - add param to only list default emoticonszotlabs2017-04-251-1/+6
| |
* | database upgradezotlabs2017-04-233-216/+214
| |
* | 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.
* | make it easier to hook into feed headers in the futurezotlabs2017-04-201-14/+20
| |
* | The rest of the library and backend changes to support client-side e2ee and ↵zotlabs2017-04-206-59/+20
| | | | | | | | deprecate previous uses of item_obscured.
* | In the rare case where a default channel is not selected but channels ↵zotlabs2017-04-201-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-191-2/+9
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-191-1/+1
|\|
| * order wiki pages by creation dateMario Vavti2017-04-191-1/+1
| |
| * typozotlabs2017-04-191-1/+1
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-191-31/+29
| |\
| | * Merge pull request #722 from zotlabs/env_prvgit-marijus2017-04-191-31/+29
| | |\ | | | | | | | | envelope privacy
| | | * envelope privacyzotlabs2017-04-181-31/+29
| | |/
| * | backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-191-1/+1
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
| * | don't allow any null fields in notify creationzotlabs2017-04-191-2/+3
| | |
| * | webfinger cleanupzotlabs2017-04-191-20/+23
| |/
* | follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
| |
* | give the item_obscured flag a new lease on life by using it to designate ↵zotlabs2017-04-183-9/+20
| | | | | | | | 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.
* | oembed cache: don't store the url (which may need to be truncated), store a ↵zotlabs2017-04-181-6/+6
| | | | | | | | hash instead. This will allow us to convert the table to utf8mb4 without running into mysql key length restrictions as well as dealing with the potential ambiguity of truncated urls.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-1817-77/+42
|\|
| * more lock caretsMario Vavti2017-04-184-4/+4
| |
| * update to bs-gitMario Vavti2017-04-1810-70/+35
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-181-1/+10
| |\
| | * Merge pull request #721 from zotlabs/client_e2eegit-marijus2017-04-181-1/+10
| | |\ | | | | | | | | allow downloading via viewsrc to support client side e2ee
| | | * allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
| | |/
| * / the caret beside the lock seems a little overkillMario Vavti2017-04-183-3/+3
| |/
* | envelope privacyzotlabs2017-04-181-31/+29
| |
* | allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
| |
* | include attach.php here (boot.php) instead of each file that uses it. ↵zotlabs2017-04-171-0/+1
| | | | | | | | Eventually this needs to move to an autoloader.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-1782-28317/+32300
|\|
| * missing clearfixMario Vavti2017-04-161-1/+1
| |
| * css fixesMario Vavti2017-04-161-4/+4
| |
| * Merge pull request #717 from dawnbreak/simplepiegit-marijus2017-04-1559-15887/+21031
| |\ | | | | | | :arrow_up: Update SimplePie library.
| | * We do not parse the body in discover_by_url(), so no need to preserve ↵Klaus Weidenbach2017-04-151-7/+1
| | | | | | | | | | | | iframes in SimplePie.