Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-02 | 6 | -32/+41 |
|\ | |||||
| * | 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. | ||||
* | | 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 |
| | | |||||
* | | 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. | ||||
* | notification: slight animation for loading... and do not remove public ↵ | Mario Vavti | 2017-12-11 | 1 | -1/+1 |
| | | | | stream items on click (we can not mark them read) | ||||
* | 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 |
| | |||||
* | fix loading of theme-specific widgets | zotlabs | 2017-12-07 | 1 | -6/+13 |
| | |||||
* | Merge pull request #924 from dentm42/bugfix-pr922 | git-marijus | 2017-12-07 | 1 | -1/+1 |
|\ | | | | | Fix 'unable to add pages with spaces' (pr 922) | ||||
| * | Fix 'unable to add pages with spaces' (pr 922) | M.Dent | 2017-12-06 | 1 | -1/+1 |
| | | |||||
* | | hubzilla issue #680, implement IMoveTarget and recursive file/directory ↵ | zotlabs | 2017-12-06 | 1 | -1/+17 |
| | | | | | | | | move/rename | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-06 | 2 | -25/+74 |
|\| | |||||
| * | missed a spot while resolving merge conflict | Mario Vavti | 2017-12-06 | 1 | -1/+1 |
| | | |||||
| * | resolve merge conflict | Mario Vavti | 2017-12-06 | 2 | -25/+74 |
| | | |||||
* | | 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 | 2 | -1/+25 |
| | | | | instead of an obtuse XML error structure | ||||
* | disallow backslashes in wiki and wiki-page names | zotlabs | 2017-12-05 | 2 | -6/+18 |
| | |||||
* | explain what happened here | zotlabs | 2017-12-04 | 1 | -0/+3 |
| | |||||
* | fix mod display and others that require a non-zero profile_uid for updates | zotlabs | 2017-12-04 | 2 | -4/+9 |
| | |||||
* | We only require one Update module. The rest are superfluous. | zotlabs | 2017-12-04 | 10 | -392/+34 |
| | |||||
* | fix another PHP 7.2 warning | Mario Vavti | 2017-12-04 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-04 | 4 | -8/+55 |
|\ | |||||
| * | pagetitle lost importing a pdl element from conversation | zotlabs | 2017-12-03 | 2 | -2/+4 |
| | | |||||
| * | rename button | zotlabs | 2017-12-03 | 1 | -1/+1 |
| | | |||||
| * | chunked uploads for photos page | zotlabs | 2017-12-03 | 1 | -2/+50 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-02 | 2 | -6/+11 |
| |\ | |||||
| * | | remove warning for large files on cloud upload | zotlabs | 2017-12-02 | 1 | -3/+0 |
| | | | |||||
* | | | fix typo in HTTPSig | Mario Vavti | 2017-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | PHP 7.2 silence some warnings | Mario Vavti | 2017-12-04 | 1 | -3/+3 |
| | | | |||||
* | | | mod hq: do not 404 if we have no item | Mario Vavti | 2017-12-04 | 1 | -49/+59 |
| | | | |||||
* | | | fix some pubstream on/off weirdness | Mario | 2017-12-03 | 4 | -4/+7 |
| |/ |/| | |||||
* | | add a filter for notification to show new posts only | Mario Vavti | 2017-12-01 | 2 | -6/+11 |
|/ | |||||
* | remove logging line | zotlabs | 2017-11-30 | 1 | -1/+0 |
| | |||||
* | Merge branch 'chunk' | zotlabs | 2017-11-30 | 1 | -2/+5 |
|\ | |||||
| * | more or less working chunked uploads on /cloud now. | zotlabs | 2017-11-30 | 1 | -0/+2 |
| | | |||||
| * | more chunk work | zotlabs | 2017-11-28 | 1 | -2/+3 |
| | |