Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | initial z6 delivery | zotlabs | 2018-01-16 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | z6 deliver | zotlabs | 2018-01-16 | 1 | -0/+15 | |
|/ / / | ||||||
* | / | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-15 | 3 | -3/+5 | |
|\| | | |/ |/| | ||||||
| * | fix some regressions with permission roles | Mario Vavti | 2018-01-15 | 2 | -2/+2 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-15 | 1 | -1/+3 | |
| |\ | ||||||
| | * | Added minimum registration age to /admin/site settings page | Andrew Manning | 2018-01-14 | 1 | -1/+3 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-14 | 2 | -2/+7 | |
| | |\ | ||||||
* | | | | surface the article feature | zotlabs | 2018-01-15 | 2 | -1/+3 | |
|/ / / | ||||||
* | | | move markdown-in-posts/comments feature to plugin | zotlabs | 2018-01-14 | 1 | -8/+6 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-13 | 1 | -3/+3 | |
|\| | | |/ |/| | ||||||
| * | update to bootstrap 4 beta3 | Mario Vavti | 2018-01-12 | 1 | -2/+2 | |
| | | ||||||
| * | typo | Mario Vavti | 2018-01-12 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-12 | 6 | -85/+232 | |
| |\ | ||||||
| * | | mod hq: stick to show latest unseen toplevel post on load | Mario Vavti | 2018-01-12 | 1 | -2/+2 | |
| | | | ||||||
* | | | cleanup of last fix | zotlabs | 2018-01-13 | 2 | -2/+2 | |
| | | | ||||||
* | | | unexpected openssl result | zotlabs | 2018-01-13 | 2 | -1/+2 | |
| | | | ||||||
* | | | improve owa logging | zotlabs | 2018-01-13 | 1 | -1/+5 | |
| |/ |/| | ||||||
* | | Merge pull request #951 from dawnbreak/docu | git-marijus | 2018-01-12 | 6 | -85/+232 | |
|\ \ | |/ |/| | :bulb: Add source documentation from recent conversations. | |||||
| * | :bulb: Add source documentation from recent conversations. | Klaus Weidenbach | 2018-01-05 | 6 | -85/+232 | |
| | | | | | | | | | | | | There have been some conversations in the last weeks which explained several parts of the code, so add it to the source code documentation. Also some other small source code documentation improvements. | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 2 | -10/+22 | |
|\ \ | ||||||
| * | | expose settings for site sellpage and site location | zotlabs | 2018-01-11 | 1 | -0/+10 | |
| | | | ||||||
| * | | OpenWebAuth: can fail after site re-installs; this may need to be pushed ↵ | zotlabs | 2018-01-11 | 1 | -10/+12 | |
| | | | | | | | | | | | | forward to master | |||||
* | | | continue working on hq | Mario Vavti | 2018-01-11 | 1 | -19/+14 | |
|/ / | ||||||
* | | hubzilla issue #945 continued: We previously blocked directory keywords when ↵ | zotlabs | 2018-01-10 | 1 | -1/+1 | |
| | | | | | | | | searching the local directory as it produced errant results and included results from the entire directory space (an issue that was resolved satisfactorily by that fix sometime in the past). As a result of issue #945 this was reworked so that we should return correct results for keywords when searching either the local directory or a standalone directory. | |||||
* | | scrutinizer mods | zotlabs | 2018-01-09 | 3 | -4/+6 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-08 | 3 | -5/+7 | |
|\ \ | ||||||
| * | | fix regression in app categories | Mario Vavti | 2018-01-08 | 1 | -2/+3 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-07 | 3 | -6/+133 | |
| |\ \ | ||||||
| * | | | start with nonactive state for the notifications button and display some ↵ | Mario Vavti | 2018-01-07 | 1 | -0/+1 | |
| | |/ | |/| | | | | | | | text if there are no notifications on small screens only | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-02 | 6 | -32/+41 | |
| |\ \ | ||||||
| * \ \ | 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 | |
| | | | | | ||||||
* | | | | | scrutinizer issues: none worthy of including in 3.0, there will likely be a ↵ | zotlabs | 2018-01-08 | 1 | -4/+6 | |
| |_|_|/ |/| | | | | | | | | | | | few hundred more before all is said and done. | |||||
* | | | | hubzilla issue #946 | zotlabs | 2018-01-07 | 1 | -0/+121 | |
| | | | | ||||||
* | | | | issues with feed parameters | zotlabs | 2018-01-02 | 2 | -6/+12 | |
| |_|/ |/| | | ||||||
* | | | this should finish up hubzilla issue #113 | zotlabs | 2017-12-31 | 1 | -2/+5 | |
| | | | ||||||
* | | | provide warning if ffmpeg not found and video thumbnail is requested | zotlabs | 2017-12-30 | 1 | -1/+7 | |
| | | | ||||||
* | | | 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. | |||||
* | | 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 | |
|/ | ||||||
* | install smarty via composer and update other php libs | Mario Vavti | 2017-12-18 | 1 | -2/+0 | |
| | ||||||
* | notifications: only handle item otype notify_ids | Mario Vavti | 2017-12-18 | 1 | -2/+2 | |
| | ||||||
* | only use effective uid if we deal with sys channel content | Mario Vavti | 2017-12-15 | 1 | -1/+7 | |
| | ||||||
* | fix another PHP7.2 warningg | Mario Vavti | 2017-12-14 | 1 | -1/+1 | |
| | ||||||
* | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix ↵ | zotlabs | 2017-12-12 | 1 | -1/+1 | |
| | | | | for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check. |