Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-24 | 5 | -57/+62 |
|\ | |||||
| * | some code cleanup and simplification in mod_like | zotlabs | 2018-01-23 | 1 | -40/+41 |
| | | |||||
| * | add units to css | zotlabs | 2018-01-23 | 1 | -1/+1 |
| | | |||||
| * | replace image cropping library | zotlabs | 2018-01-23 | 2 | -14/+19 |
| | | |||||
| * | siteinfo embellishments | zotlabs | 2018-01-22 | 1 | -1/+0 |
| | | |||||
| * | hubzilla issue #920 - unable to delete permission groups with space in name | zotlabs | 2018-01-22 | 1 | -2/+2 |
| | | |||||
* | | implement caching of notifications in browser session storage | Mario Vavti | 2018-01-24 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dev' | zotlabs | 2018-01-22 | 1 | -1/+15 |
|\ | |||||
| * | better notifications for edit post/comments which may have been originally ↵ | zotlabs | 2018-01-22 | 1 | -1/+15 |
| | | | | | | | | posted long ago | ||||
* | | preserve reverse date sort in mod_search after changes | zotlabs | 2018-01-21 | 1 | -1/+1 |
| | | |||||
* | | mod_search: fix the group by mess | zotlabs | 2018-01-21 | 2 | -13/+14 |
|/ | |||||
* | remove deprecated 'qcomment' feature; unused since 2012 | zotlabs | 2018-01-18 | 2 | -6/+0 |
| | |||||
* | simplify webserver logic flow, remove obsolete $a from router | zotlabs | 2018-01-18 | 2 | -34/+47 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-18 | 1 | -2/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-18 | 4 | -6/+20 |
| |\ | |||||
| * | | raise the queue threshold default from 300 to 3000 | Mario Vavti | 2018-01-18 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-16 | 2 | -1/+3 |
| |\ \ | |||||
* | | | | simplify interactions with the get_features hook by calling it before any ↵ | zotlabs | 2018-01-18 | 1 | -11/+11 |
| |_|/ |/| | | | | | | | | filtering takes place | ||||
* | | | provide local pubstream option (content from this site only). | zotlabs | 2018-01-17 | 2 | -4/+15 |
| | | | |||||
* | | | simplify dir_tagadelic dramatically | zotlabs | 2018-01-17 | 1 | -1/+4 |
| | | | |||||
* | | | use mid/parent_mid to trigger $top_level_post | zotlabs | 2018-01-17 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |