aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2018-01-0834-192/+338
|\
| * fix regression in app categoriesMario Vavti2018-01-082-4/+5
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-076-13/+146
| |\
| | * hubzilla issue #946zotlabs2018-01-072-2/+128
| | * issues with feed parameterszotlabs2018-01-024-11/+18
| * | start with nonactive state for the notifications button and display some text...Mario Vavti2018-01-074-0/+9
| * | make active notifications filter stickyMario Vavti2018-01-061-1/+1
| * | bump versionMario Vavti2018-01-041-1/+1
| * | fix nav update regressions - fixes issue #950Mario Vavti2018-01-042-6/+6
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-033-113/+41
| |\ \
| | * \ Merge pull request #949 from einervonvielen/dev-fix-homeinstallgit-marijus2018-01-033-113/+41
| | |\ \
| | | * | TypoEiner von Vielen2018-01-031-2/+2
| | | * | Fixed homeinstall for dev as in 3.0RCEiner von Vielen2018-01-033-114/+42
| | |/ /
| * / / update changelogMario Vavti2018-01-031-0/+6
| |/ /
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-0210-40/+71
| |\|
| | * hubzilla issue #947zotlabs2018-01-011-1/+2
| | * this should finish up hubzilla issue #113zotlabs2017-12-314-9/+30
| | * provide warning if ffmpeg not found and video thumbnail is requestedzotlabs2017-12-301-1/+7
| | * update file thumbnails when imported/syncedzotlabs2017-12-301-0/+3
| | * test of new affinity preset code (post 3.0)zotlabs2017-12-302-7/+7
| | * possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted co...zotlabs2017-12-301-1/+1
| | * cleanupzotlabs2017-12-281-3/+5
| | * a different (hopefully better) implementation of affinity presets, but not fo...zotlabs2017-12-282-10/+8
| | * Make affinity widget settings work. It's entirely possible they never did wor...zotlabs2017-12-282-16/+16
| * | changelogMario2017-12-281-0/+6
| * | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooksgit-marijus2017-12-271-3/+3
| |\ \
| | * | Fix whitespace formattingMatthew Dent2017-12-231-14/+14
| | * | fix dupe bug in content hooksM.Dent2017-12-231-15/+15
| * | | Merge remote-tracking branch 'mike/master' into devMario2017-12-275-11/+41
| |\ \ \ | | | |/ | | |/|
| | * | hubzilla issue #945 - directory keywords returned from twkn in standalone modezotlabs2017-12-261-6/+19
| | * | sort cloud directory by 1. is_dir and 2. name until we can figure out a way t...zotlabs2017-12-251-1/+1
| | * | document that imagick calls/execs ffmpeg for mp4 video thumbnailszotlabs2017-12-251-1/+7
| | * | util/dcp - argument warning when arguments are correctzotlabs2017-12-251-1/+1
| | * | cannot use file_get/put_contents in attach_store, must use pipe_streamszotlabs2017-12-251-2/+13
| | |/
| * / changelogMario2017-12-231-0/+2
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-226-108/+140
|\|
| * more changelogMario2017-12-221-0/+16
| * Merge pull request #939 from einervonvielen/Debian9git-marijus2017-12-223-99/+119
| |\
| | * Changes for Debian 9. Serveral fixes.Einer von Vielen2017-12-213-99/+119
| * | Merge pull request #940 from einervonvielen/Doku-homeinstall-Debian-9git-marijus2017-12-221-8/+4
| |\ \
| | * | Changes for homeinstall for Debian 9Einer von Vielen2017-12-211-8/+4
| | |/
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-21384-13370/+18872
| |\|
| * | hubzilla-addons issue #74 - delayed posts not honoured for GNU-Socialzotlabs2017-12-211-1/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-21388-13373/+18884
|\ \ \ | | |/ | |/|
| * | add url and headings to bbco_autocomplete()Mario Vavti2017-12-211-1/+1
| * | remove additional linebreaks after headingsMario Vavti2017-12-211-0/+7
| * | html2bbcode: use headings bbcode for headingsMario Vavti2017-12-201-6/+6
| * | Merge pull request #936 from phellmes/devgit-marijus2017-12-192-1439/+1599
| |\ \
| | * | Update DE translation stringsphellmes2017-12-192-1439/+1599
| |/ /
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-12-191-77/+136
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 09:15:59 +0000