aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'patch-20190125a' into 'dev'Mario2019-01-271-12/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Remove extraneous sync logic See merge request hubzilla/core!1490
| | * | | | Remove extraneous sync logicM. Dent2019-01-271-12/+2
| |/ / / /
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-271-0/+60
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-261-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | return false if http signatue is not valid See merge request hubzilla/core!1489
| | * | | | return false if http signatue is not validMario Vavti2019-01-251-2/+1
| | | | | |
| * | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-01-252-701/+862
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1491
| | * | | | Update hstrings.phpMax Kostikov2019-01-251-8/+37
| | | | | |
| | * | | | Update hmessages.poMax Kostikov2019-01-251-693/+825
| | | | | |
| * | | | | bump versionMario Vavti2019-01-251-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'apidocpublishing' into 'dev'Mario2019-01-252-1/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Suggestion: Publish doxygen API documentation at gitlab pages. See merge request hubzilla/core!1488
| | * | | | Publish doxygen API documentation at gitlab pages.Klaus Weidenbach2019-01-242-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the API documentation with Doxygen and publish it through gitlab-ci as a Gitlab page at: https://hubzilla.frama.io/core This should only happen when master gets updated. Update Doxyfile configuration. Correct image usage. Replace RedMatrix with Hubzilla icon.
| * | | | | Merge branch 'doku' into 'dev'Mario2019-01-2512-273/+351
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485
| | * | | | | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-2312-273/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME.
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-252-1/+37
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js_fixes' into 'dev'Max Kostikov2019-01-241-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possibly more page jumping fixes See merge request hubzilla/core!1486
| | * | | | | | | possibly more page jumping fixesMario Vavti2019-01-241-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'zot6_fixes' into 'dev'Max Kostikov2019-01-241-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | macke mod chanview aware of zot6 See merge request hubzilla/core!1487
| | * | | | | | | macke mod chanview aware of zot6Mario Vavti2019-01-241-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'js_fixes' into 'dev'Max Kostikov2019-01-241-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | fix page jumping when liking a collapsed/expanded post See merge request hubzilla/core!1484
| | * | | | | | fix page jumping when liking a collapsed/expanded postMario Vavti2019-01-231-2/+2
| | |/ / / / /
| * | | | | | Merge branch 'prepare_text' into 'dev'Mario2019-01-231-27/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct parameter in include/text.php prepare_text() See merge request hubzilla/core!1483
| | * | | | | | Correct parameter in include/text.php prepare_text()Klaus Weidenbach2019-01-221-27/+34
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Also extend documentation.
| * | | | | | Merge branch 'dev' into 'dev'Mario2019-01-231-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | Skip tags detection in URL See merge request hubzilla/core!1482
| | * | | | Skip tags detection in URLMax Kostikov2019-01-221-0/+3
| | | | | |
| * | | | | Merge branch 'embedphotos' into 'dev'Mario2019-01-221-53/+69
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to fix some warnings in Zotlabs\Module\Embedphotos. See merge request hubzilla/core!1481
| | * | | | | Try to fix some warnings in Zotlabs\Module\Embedphotos.Klaus Weidenbach2019-01-221-53/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $phototypes was undefined, hope this is correct selection to fix it. Correct Doxygen and clean up some variables and refactoring.
| * | | | | | Merge branch 'patch-20190114a' into 'dev'Mario2019-01-222-2/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add remaining hook insertions See merge request hubzilla/core!1471
| | * | | | | | Add remaining hook insertionsM. Dent2019-01-222-2/+10
| |/ / / / / /
| * | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
| |\| | | | |
| | * | | | | Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fixes in include/help.php. See merge request hubzilla/core!1479
| | | * | | | | Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variables and a wrong function name.
| | * | | | | | Merge branch 'bugfix-plugin' into 'dev'M. Dent2019-01-191-36/+36
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Fix wrong variable name in include/plugin.php. See merge request hubzilla/core!1480
| | | * | | | | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| | |/ / / / /
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-211-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-182-15/+26
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'QA' into 'dev'Mario2019-01-182-22/+58
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PostgreSQL to gitlab-ci setup. See merge request hubzilla/core!1478
| | * | | | | | | Add PostgreSQL to gitlab-ci setup.Klaus Weidenbach2019-01-172-22/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run our tests against a PostgreSQL again.
| * | | | | | | | Merge branch 'dreport_fixes' into 'dev'M. Dent2019-01-183-2/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix delivery report for zot6 connections See merge request hubzilla/core!1476
| | * | | | | | | | add spaceMario Vavti2019-01-171-1/+1
| | | | | | | | | |
| | * | | | | | | | fix delivery report for zot6 connectionsMario Vavti2019-01-173-2/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-181-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | possible fix for #1326 See merge request hubzilla/core!1477
| | * | | | | | | | possible fix for #1326Mario Vavti2019-01-171-0/+3
| |/ / / / / / / /
* | | | | | | | / block private reshares from zot6 due to different parentszotlabs2019-01-281-0/+11
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | share fixeszotlabs2019-01-272-0/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | cleanup of cli admin toolzotlabs2019-01-261-5/+1
| | | | | | |
* | | | | | | command line tool for managing site adminszotlabs2019-01-261-0/+64
| |_|_|_|_|/ |/| | | | |
* | | | | | support photo items between zot and zot6zotlabs2019-01-242-1/+37
| |_|_|/ / |/| | | |
* | | | | comment permission fixzotlabs2019-01-201-1/+1
| |_|/ / |/| | |
* | | | more specific network checking in several places and remove some old ↵zotlabs2019-01-171-11/+13
| | | | | | | | | | | | | | | | debugging crud
* | | | this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 06:08:32 +0000