aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-1559-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/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)