aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* oembed cache: don't store the url (which may need to be truncated), store a h...zotlabs2017-04-181-6/+6
* 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 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. Eventua...zotlabs2017-04-171-0/+1
* | 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
| |\
| | * We do not parse the body in discover_by_url(), so no need to preserve iframes...Klaus Weidenbach2017-04-151-7/+1
| | * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-1559-15886/+21036
| |/
| * Merge pull request #716 from dawnbreak/docugit-marijus2017-04-141-260/+293
| |\
| | * Some documentation for include/network.php and some fixes.Klaus Weidenbach2017-04-141-260/+293
| * | 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
| |\
| | * typozotlabs2017-04-121-1/+1
| | * make sure the new fields don't leak through sync packets and break older vers...zotlabs2017-04-121-0/+2
| | * backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-126-5/+24
| * | correct the mastodon "boost" (aka 'share') author attribution by checking for...zotlabs2017-04-122-54/+86
| * | 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() chan...zotlabs2017-04-121-7/+25
| * | Merge pull request #714 from mjfriaza/devgit-marijus2017-04-112-11218/+10642
| |\ \ | | |/ | |/|
| | * 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 vers...zotlabs2017-04-121-0/+2
* | | backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-126-5/+25
* | | 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 for...zotlabs2017-04-112-54/+86
* | | 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 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() chan...zotlabs2017-04-091-7/+25
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-073-11094/+10565
|\| | | | |