aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #716 from dawnbreak/docugit-marijus2017-04-141-260/+293
| |\ | | | | | | Some documentation for include/network.php and some fixes.
| | * Some documentation for include/network.php and some fixes.Klaus Weidenbach2017-04-141-260/+293
| | | | | | | | | | | | Some variables had wrong names and have never been used.
| * | missing includesMario Vavti2017-04-133-1/+3
| |/
| * bs font set might work better for win and macMario Vavti2017-04-131-1/+0
| |
| * bump versionMario Vavti2017-04-131-1/+1
| |
| * update bs-devMario Vavti2017-04-1314-803/+334
| |
| * Merge pull request #715 from zotlabs/cppgit-marijus2017-04-137-4/+25
| |\ | | | | | | backend infrastructure for 'channel protection password'; which will …
| | * typozotlabs2017-04-121-1/+1
| | |
| | * make sure the new fields don't leak through sync packets and break older ↵zotlabs2017-04-121-0/+2
| | | | | | | | | | | | versions
| | * backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-126-5/+24
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
| * | correct the mastodon "boost" (aka 'share') author attribution by checking ↵zotlabs2017-04-122-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.zotlabs2017-04-121-3/+10
| | |
| * | some signatures showing as invalid because of recent import_author_zot() ↵zotlabs2017-04-121-7/+25
| | | | | | | | | | | | changes.
| * | Merge pull request #714 from mjfriaza/devgit-marijus2017-04-112-11218/+10642
| |\ \ | | |/ | |/| Updated the Spanish translation
| | * Updated the Spanish translationManuel Jiménez Friaza2017-04-102-11218/+10642
| | |
* | | remove fulltext indexes for innodbzotlabs2017-04-121-7/+1
| | |
* | | change default database settingszotlabs2017-04-121-62/+62
| | |
* | | whitespacezotlabs2017-04-121-2/+2
| | |
* | | typozotlabs2017-04-121-1/+1
| | |
* | | make sure the new fields don't leak through sync packets and break older ↵zotlabs2017-04-121-0/+2
| | | | | | | | | | | | versions
* | | backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-126-5/+25
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
* | | don't allow any null fields in notify creationzotlabs2017-04-111-2/+3
| | |
* | | webfinger cleanupzotlabs2017-04-111-20/+23
| | |
* | | correct the mastodon "boost" (aka 'share') author attribution by checking ↵zotlabs2017-04-112-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.zotlabs2017-04-101-3/+10
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-090-0/+0
|\| |
| * | Merge pull request #713 from zotlabs/photo-zerogit-marijus2017-04-081-0/+1
| |\ \ | | | | | | | | Photo zero
| | * | photo size-0 issuezotlabs2017-04-071-0/+1
| | | |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-075-11099/+10602
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-061-1/+1
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-0515-102/+130
| | |\ \ \
* | | | | | some signatures showing as invalid because of recent import_author_zot() ↵zotlabs2017-04-091-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | changes.
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-073-11094/+10565
|\| | | | |
| * | | | | Merge pull request #712 from zotlabs/fr_updategit-marijus2017-04-072-11080/+10559
| |\ \ \ \ \ | | | | | | | | | | | | | | Fr update (Monret)
| | * | | | | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | |/ / / /
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-039-62/+101
| | |\ \ \ \
| | * | | | | Revert "fr strings update (Monret)"zotlabs2017-04-032-10559/+11080
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e.
| | * | | | | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | | | | | |
| * | | | | | remove redundant stringMario Vavti2017-04-071-2/+1
| | | | | | |
| * | | | | | the string was there but the template var was wrongMario Vavti2017-04-071-1/+1
| | | | | | |
| * | | | | | css fixes and missing stringMario Vavti2017-04-072-15/+8
| | | | | | |
| * | | | | | only log zot_refresh content if json decode was successful.zotlabs2017-04-071-2/+2
| | | | | | |
| * | | | | | revisit the import_author_zot algorithm yet again. There was one bug that we ↵zotlabs2017-04-071-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 issuezotlabs2017-04-071-0/+1
| | | | | |
* | | | | | fix from downstreamzotlabs2017-04-072-1963/+1903
| | | | | |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-060-0/+0
|\| | | | |
| * | | | | import_author_xchan - since we rarely refresh zot-info for non-connections, ↵zotlabs2017-04-061-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.zotlabs2017-04-061-2/+2
| | | | |
* | | | | revisit the import_author_zot algorithm yet again. There was one bug that we ↵zotlabs2017-04-061-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 changezotlabs2017-04-051-1/+1
| | | | |