| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-18 | 17 | -77/+42 |
| |\ | |||||
| | * | more lock carets | Mario Vavti | 2017-04-18 | 4 | -4/+4 |
| | | | |||||
| | * | update to bs-git | Mario Vavti | 2017-04-18 | 10 | -70/+35 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-18 | 1 | -1/+10 |
| | |\ | |||||
| | | * | Merge pull request #721 from zotlabs/client_e2ee | git-marijus | 2017-04-18 | 1 | -1/+10 |
| | | |\ | | | | | | | | | allow downloading via viewsrc to support client side e2ee | ||||
| | | | * | allow downloading via viewsrc to support client side e2ee | zotlabs | 2017-04-17 | 1 | -1/+10 |
| | | |/ | |||||
| | * / | the caret beside the lock seems a little overkill | Mario Vavti | 2017-04-18 | 3 | -3/+3 |
| | |/ | |||||
| * | | envelope privacy | zotlabs | 2017-04-18 | 1 | -31/+29 |
| | | | |||||
| * | | allow downloading via viewsrc to support client side e2ee | zotlabs | 2017-04-17 | 1 | -1/+10 |
| | | | |||||
| * | | include attach.php here (boot.php) instead of each file that uses it. ↵ | zotlabs | 2017-04-17 | 1 | -0/+1 |
| | | | | | | | | | Eventually this needs to move to an autoloader. | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 82 | -28317/+32300 |
| |\| | |||||
| | * | missing clearfix | Mario Vavti | 2017-04-16 | 1 | -1/+1 |
| | | | |||||
| | * | css fixes | Mario Vavti | 2017-04-16 | 1 | -4/+4 |
| | | | |||||
| | * | Merge pull request #717 from dawnbreak/simplepie | git-marijus | 2017-04-15 | 59 | -15887/+21031 |
| | |\ | | | | | | | :arrow_up: Update SimplePie library. | ||||
| | | * | 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 | 59 | -15886/+21036 |
| | |/ | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+3 |
| | |/ | |||||
| | * | bs font set might work better for win and mac | Mario Vavti | 2017-04-13 | 1 | -1/+0 |
| | | | |||||
| | * | bump version | Mario Vavti | 2017-04-13 | 1 | -1/+1 |
| | | | |||||
| | * | update bs-dev | Mario Vavti | 2017-04-13 | 14 | -803/+334 |
| | | | |||||
| | * | Merge pull request #715 from zotlabs/cpp | git-marijus | 2017-04-13 | 7 | -4/+25 |
| | |\ | | | | | | | backend infrastructure for 'channel protection password'; which will … | ||||
| | | * | typo | zotlabs | 2017-04-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | 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 | 6 | -5/+24 |
| | | | | | | | | | | | | | 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 | 2 | -54/+86 |
| | | | | | | | | | | | | | 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. | ||||
| | * | | Merge pull request #714 from mjfriaza/dev | git-marijus | 2017-04-11 | 2 | -11218/+10642 |
| | |\ \ | | |/ | |/| | Updated the Spanish translation | ||||
| | | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-04-10 | 2 | -11218/+10642 |
| | | | | |||||
| * | | | remove fulltext indexes for innodb | zotlabs | 2017-04-12 | 1 | -7/+1 |
| | | | | |||||
| * | | | change default database settings | zotlabs | 2017-04-12 | 1 | -62/+62 |
| | | | | |||||
| * | | | whitespace | zotlabs | 2017-04-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | typo | zotlabs | 2017-04-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 6 | -5/+25 |
| | | | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes | ||||
| * | | | don't allow any null fields in notify creation | zotlabs | 2017-04-11 | 1 | -2/+3 |
| | | | | |||||
| * | | | webfinger cleanup | zotlabs | 2017-04-11 | 1 | -20/+23 |
| | | | | |||||
| * | | | correct the mastodon "boost" (aka 'share') author attribution by checking ↵ | zotlabs | 2017-04-11 | 2 | -54/+86 |
| | | | | | | | | | | | | | 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-10 | 1 | -3/+10 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-09 | 0 | -0/+0 |
| |\| | | |||||
| | * | | Merge pull request #713 from zotlabs/photo-zero | git-marijus | 2017-04-08 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | Photo zero | ||||
| | | * | | photo size-0 issue | zotlabs | 2017-04-07 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-07 | 5 | -11099/+10602 |
| | | |\ \ | | |/ / | |/| | | |||||
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-06 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-05 | 15 | -102/+130 |
| | | |\ \ \ | |||||
| * | | | | | | some signatures showing as invalid because of recent import_author_zot() ↵ | zotlabs | 2017-04-09 | 1 | -7/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | changes. | ||||
| * | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 3 | -11094/+10565 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #712 from zotlabs/fr_update | git-marijus | 2017-04-07 | 2 | -11080/+10559 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fr update (Monret) | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |