| Commit message (Expand) | 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 | 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. Eventua... | zotlabs | 2017-04-17 | 1 | -0/+1 |
* | | 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 |
| |\ |
|
| | * | We do not parse the body in discover_by_url(), so no need to preserve iframes... | Klaus Weidenbach | 2017-04-15 | 1 | -7/+1 |
| | * | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 59 | -15886/+21036 |
| |/ |
|
| * | Merge pull request #716 from dawnbreak/docu | git-marijus | 2017-04-14 | 1 | -260/+293 |
| |\ |
|
| | * | Some documentation for include/network.php and some fixes. | Klaus Weidenbach | 2017-04-14 | 1 | -260/+293 |
| * | | 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 |
| |\ |
|
| | * | typo | zotlabs | 2017-04-12 | 1 | -1/+1 |
| | * | make sure the new fields don't leak through sync packets and break older vers... | zotlabs | 2017-04-12 | 1 | -0/+2 |
| | * | backend infrastructure for 'channel protection password'; which will be used ... | zotlabs | 2017-04-12 | 6 | -5/+24 |
| * | | correct the mastodon "boost" (aka 'share') author attribution by checking for... | zotlabs | 2017-04-12 | 2 | -54/+86 |
| * | | 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() chan... | zotlabs | 2017-04-12 | 1 | -7/+25 |
| * | | Merge pull request #714 from mjfriaza/dev | git-marijus | 2017-04-11 | 2 | -11218/+10642 |
| |\ \
| | |/
| |/| |
|
| | * | 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 vers... | zotlabs | 2017-04-12 | 1 | -0/+2 |
* | | | backend infrastructure for 'channel protection password'; which will be used ... | zotlabs | 2017-04-12 | 6 | -5/+25 |
* | | | 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 for... | zotlabs | 2017-04-11 | 2 | -54/+86 |
* | | | 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 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() chan... | zotlabs | 2017-04-09 | 1 | -7/+25 |
* | | | | | | 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 |
| |\ \ \ \ \ |
|