Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-18 | 3 | -5/+19 |
|\ | |||||
| * | 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 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-15 | 3 | -3/+5 |
| |\ | |||||
* | | | 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 | 1 | -1/+2 |
|\| | | |/ |/| | |||||
| * | surface the article feature | zotlabs | 2018-01-15 | 1 | -1/+2 |
| | | |||||
* | | 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 | 1 | -1/+6 |
| |\ | |||||
* | | | 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 | 1 | -21/+22 |
| |\ | |||||
| * | | 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 | 1 | -1/+1 |
| | | | |||||
* | | | unexpected openssl result | zotlabs | 2018-01-13 | 1 | -0/+1 |
| | | | |||||
* | | | improve owa logging | zotlabs | 2018-01-13 | 1 | -1/+5 |
| |/ |/| | |||||
* | | Merge pull request #951 from dawnbreak/docu | git-marijus | 2018-01-12 | 1 | -21/+22 |
|\ \ | |/ |/| | :bulb: Add source documentation from recent conversations. | ||||
| * | :bulb: Add source documentation from recent conversations. | Klaus Weidenbach | 2018-01-05 | 1 | -21/+22 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-08 | 1 | -2/+3 |
|\ \ | |||||
| * | | fix regression in app categories | Mario Vavti | 2018-01-08 | 1 | -2/+3 |
| | | | |||||
* | | | 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. | ||||
* / | 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 |
| | |||||
* | test of new affinity preset code (post 3.0) | zotlabs | 2017-12-30 | 1 | -5/+3 |
| | |||||
* | 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 | 1 | -7/+13 |
| | | | | 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. | ||||
* | 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. | ||||
* | auto promote beginner (techlevel 0) accounts to level 1 after they show ↵ | zotlabs | 2017-12-10 | 1 | -1/+23 |
| | | | | signs of active participation. | ||||
* | strip acct: from OWA auth to API endpoints | zotlabs | 2017-12-07 | 2 | -2/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-06 | 1 | -25/+38 |
|\ | |||||
| * | missed a spot while resolving merge conflict | Mario Vavti | 2017-12-06 | 1 | -1/+1 |
| | | |||||
| * | resolve merge conflict | Mario Vavti | 2017-12-06 | 1 | -25/+38 |
| | | |||||
* | | synchronise an attach_move operation to clones | zotlabs | 2017-12-06 | 1 | -0/+5 |
|/ | |||||
* | mod_cloud: provide a themed page with an error notification on errors ↵ | zotlabs | 2017-12-05 | 1 | -0/+24 |
| | | | | instead of an obtuse XML error structure | ||||
* | disallow backslashes in wiki and wiki-page names | zotlabs | 2017-12-05 | 1 | -6/+14 |
| | |||||
* | explain what happened here | zotlabs | 2017-12-04 | 1 | -0/+3 |
| |