aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
|\|
| * 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
| |\
| | * Merge pull request #933 from dawnbreak/devgit-marijus2017-12-191-77/+136
| | |\
| | | * Don't drop PHP7.0 compatibility for dev yet.Klaus Weidenbach2017-12-181-77/+136
| | |/
| * / changelogMario Vavti2017-12-191-0/+114
| |/
| * actually add the smarty libMario Vavti2017-12-18225-0/+37157
| * install smarty via composer and update other php libsMario Vavti2017-12-18316-34992/+2763
| * do not use text-muted class for $sitelocationMario Vavti2017-12-181-1/+1
| * notifications: only handle item otype notify_idsMario Vavti2017-12-182-2/+5
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-181-0/+4
| |\
| * \ Merge pull request #932 from dawnbreak/devgit-marijus2017-12-185-582/+646
| |\ \
| | * | Update classmap caches and add phpunit/dbunit.Klaus Weidenbach2017-12-175-582/+646
| |/ /
| * | Merge pull request #930 from mjfriaza/devgit-marijus2017-12-172-1411/+1572
| |\ \
| | * | Updated Spanish translation.Manuel Jiménez Friaza2017-12-162-1411/+1572
| * | | merge red master into devMario Vavti2017-12-171-1/+6
| |\ \ \
| * | | | silence PHP7.2 warningMario Vavti2017-12-161-1/+1
| * | | | fix undefined constant warningMario Vavti2017-12-161-1/+1
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-151-1/+1
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:59:52 +0000