| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2018-01-08 | 34 | -192/+338 |
| |\ | |||||
| | * | fix regression in app categories | Mario Vavti | 2018-01-08 | 2 | -4/+5 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-07 | 6 | -13/+146 |
| | |\ | |||||
| | | * | hubzilla issue #946 | zotlabs | 2018-01-07 | 2 | -2/+128 |
| | | | | |||||
| | | * | issues with feed parameters | zotlabs | 2018-01-02 | 4 | -11/+18 |
| | | | | |||||
| | * | | start with nonactive state for the notifications button and display some ↵ | Mario Vavti | 2018-01-07 | 4 | -0/+9 |
| | | | | | | | | | | | | | text if there are no notifications on small screens only | ||||
| | * | | make active notifications filter sticky | Mario Vavti | 2018-01-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | bump version | Mario Vavti | 2018-01-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix nav update regressions - fixes issue #950 | Mario Vavti | 2018-01-04 | 2 | -6/+6 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-03 | 3 | -113/+41 |
| | |\ \ | |||||
| | | * \ | Merge pull request #949 from einervonvielen/dev-fix-homeinstall | git-marijus | 2018-01-03 | 3 | -113/+41 |
| | | |\ \ | | | | | | | | | | | Dev fix homeinstall | ||||
| | | | * | | Typo | Einer von Vielen | 2018-01-03 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | Fixed homeinstall for dev as in 3.0RC | Einer von Vielen | 2018-01-03 | 3 | -114/+42 |
| | | |/ / | |||||
| | * / / | update changelog | Mario Vavti | 2018-01-03 | 1 | -0/+6 |
| | |/ / | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-02 | 10 | -40/+71 |
| | |\| | |||||
| | | * | hubzilla issue #947 | zotlabs | 2018-01-01 | 1 | -1/+2 |
| | | | | |||||
| | | * | this should finish up hubzilla issue #113 | zotlabs | 2017-12-31 | 4 | -9/+30 |
| | | | | |||||
| | | * | provide warning if ffmpeg not found and video thumbnail is requested | zotlabs | 2017-12-30 | 1 | -1/+7 |
| | | | | |||||
| | | * | update file thumbnails when imported/synced | zotlabs | 2017-12-30 | 1 | -0/+3 |
| | | | | |||||
| | | * | test of new affinity preset code (post 3.0) | zotlabs | 2017-12-30 | 2 | -7/+7 |
| | | | | |||||
| | | * | possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted ↵ | zotlabs | 2017-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | connections). We cannot actually determine that a connection has been deleted (this is typically accomplished by removing the abook record), but we can determine if the corresponding xchan has been deleted. | ||||
| | | * | cleanup | zotlabs | 2017-12-28 | 1 | -3/+5 |
| | | | | |||||
| | | * | a different (hopefully better) implementation of affinity presets, but not ↵ | zotlabs | 2017-12-28 | 2 | -10/+8 |
| | | | | | | | | | | | | | for 3.0 because strings have changed. | ||||
| | | * | Make affinity widget settings work. It's entirely possible they never did ↵ | zotlabs | 2017-12-28 | 2 | -16/+16 |
| | | | | | | | | | | | | | work correctly. I'm not comfortable over-riding the network_page_default config in this way but this is the way I've always set the affinity and it has worked just fine for me for several years and there haven't been any other requests to extend the network page default options. | ||||
| | * | | changelog | Mario | 2017-12-28 | 1 | -0/+6 |
| | | | | |||||
| | * | | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooks | git-marijus | 2017-12-27 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | Fix dupe bug in content hooks | ||||
| | | * | | Fix whitespace formatting | Matthew Dent | 2017-12-23 | 1 | -14/+14 |
| | | | | | |||||
| | | * | | fix dupe bug in content hooks | M.Dent | 2017-12-23 | 1 | -15/+15 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2017-12-27 | 5 | -11/+41 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | hubzilla issue #945 - directory keywords returned from twkn in standalone mode | zotlabs | 2017-12-26 | 1 | -6/+19 |
| | | | | | |||||
| | | * | | sort cloud directory by 1. is_dir and 2. name until we can figure out a way ↵ | zotlabs | 2017-12-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | to request different sort orders | ||||
| | | * | | document that imagick calls/execs ffmpeg for mp4 video thumbnails | zotlabs | 2017-12-25 | 1 | -1/+7 |
| | | | | | |||||
| | | * | | util/dcp - argument warning when arguments are correct | zotlabs | 2017-12-25 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | cannot use file_get/put_contents in attach_store, must use pipe_streams | zotlabs | 2017-12-25 | 1 | -2/+13 |
| | | |/ | |||||
| | * / | changelog | Mario | 2017-12-23 | 1 | -0/+2 |
| | |/ | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-22 | 6 | -108/+140 |
| |\| | |||||
| | * | more changelog | Mario | 2017-12-22 | 1 | -0/+16 |
| | | | |||||
| | * | Merge pull request #939 from einervonvielen/Debian9 | git-marijus | 2017-12-22 | 3 | -99/+119 |
| | |\ | | | | | | | Debian9 - Changes for Debian 9 and several fixes | ||||
| | | * | Changes for Debian 9. Serveral fixes. | Einer von Vielen | 2017-12-21 | 3 | -99/+119 |
| | | | | |||||
| | * | | Merge pull request #940 from einervonvielen/Doku-homeinstall-Debian-9 | git-marijus | 2017-12-22 | 1 | -8/+4 |
| | |\ \ | | | | | | | | | Changes for homeinstall for Debian 9 | ||||
| | | * | | Changes for homeinstall for Debian 9 | Einer von Vielen | 2017-12-21 | 1 | -8/+4 |
| | | |/ | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-21 | 384 | -13370/+18872 |
| | |\| | |||||
| | * | | hubzilla-addons issue #74 - delayed posts not honoured for GNU-Social | zotlabs | 2017-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | There is a very high probability this will also fix hubzilla-addons issue #75 | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-21 | 388 | -13373/+18884 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | add url and headings to bbco_autocomplete() | Mario Vavti | 2017-12-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | remove additional linebreaks after headings | Mario Vavti | 2017-12-21 | 1 | -0/+7 |
| | | | | |||||
| | * | | html2bbcode: use headings bbcode for headings | Mario Vavti | 2017-12-20 | 1 | -6/+6 |
| | | | | |||||
| | * | | Merge pull request #936 from phellmes/dev | git-marijus | 2017-12-19 | 2 | -1439/+1599 |
| | |\ \ | | | | | | | | | Update DE translation strings (for 3.0RC too) | ||||
| | | * | | Update DE translation strings | phellmes | 2017-12-19 | 2 | -1439/+1599 |
| | |/ / | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-12-19 | 1 | -77/+136 |
| | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |