Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-07 | 6 | -13/+146 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | start with nonactive state for the notifications button and display some text... | Mario Vavti | 2018-01-07 | 4 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog | Mario | 2017-12-23 | 1 | -0/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrutinizer issues: none worthy of including in 3.0, there will likely be a f... | zotlabs | 2018-01-08 | 4 | -8/+11 | |
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | hubzilla issue #946 | zotlabs | 2018-01-07 | 2 | -2/+128 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with feed parameters | zotlabs | 2018-01-02 | 4 | -11/+18 | |
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 co... | zotlabs | 2017-12-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup | zotlabs | 2017-12-28 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | a different (hopefully better) implementation of affinity presets, but not fo... | zotlabs | 2017-12-28 | 2 | -10/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Make affinity widget settings work. It's entirely possible they never did wor... | zotlabs | 2017-12-28 | 2 | -16/+16 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | 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 t... | zotlabs | 2017-12-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | more changelog | Mario | 2017-12-22 | 1 | -0/+16 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #939 from einervonvielen/Debian9 | git-marijus | 2017-12-22 | 3 | -99/+119 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #933 from dawnbreak/dev | git-marijus | 2017-12-19 | 1 | -77/+136 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Don't drop PHP7.0 compatibility for dev yet. | Klaus Weidenbach | 2017-12-18 | 1 | -77/+136 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / / / / / / / / / / / | changelog | Mario Vavti | 2017-12-19 | 1 | -0/+114 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | actually add the smarty lib | Mario Vavti | 2017-12-18 | 225 | -0/+37157 |