Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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) | |||||
| | * | | | | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 | |
| | |/ / / / | ||||||
| | * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-03 | 9 | -62/+101 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Revert "fr strings update (Monret)" | zotlabs | 2017-04-03 | 2 | -10559/+11080 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e. | |||||
| | * | | | | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 | |
| | | | | | | | ||||||
| * | | | | | | remove redundant string | Mario Vavti | 2017-04-07 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | the string was there but the template var was wrong | Mario Vavti | 2017-04-07 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | css fixes and missing string | Mario Vavti | 2017-04-07 | 2 | -15/+8 | |
| | | | | | | | ||||||
| * | | | | | | 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. | |||||
* | | | | | | photo size-0 issue | zotlabs | 2017-04-07 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | fix from downstream | zotlabs | 2017-04-07 | 2 | -1963/+1903 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-06 | 0 | -0/+0 | |
|\| | | | | | ||||||
| * | | | | | 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 | |||||
* | | | | | only log zot_refresh content if json decode was successful. | zotlabs | 2017-04-06 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | revisit the import_author_zot algorithm yet again. There was one bug that we ↵ | zotlabs | 2017-04-06 | 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. | |||||
* | | | | | revert grid and bars icon size change | zotlabs | 2017-04-05 | 1 | -1/+1 | |
| | | | | |