aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-026-32/+41
|\
| * this should finish up hubzilla issue #113zotlabs2017-12-311-2/+5
| |
| * provide warning if ffmpeg not found and video thumbnail is requestedzotlabs2017-12-301-1/+7
| |
| * test of new affinity preset code (post 3.0)zotlabs2017-12-302-7/+7
| |
| * possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted ↵zotlabs2017-12-301-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.
| * cleanupzotlabs2017-12-281-3/+5
| |
| * a different (hopefully better) implementation of affinity presets, but not ↵zotlabs2017-12-282-10/+8
| | | | | | | | for 3.0 because strings have changed.
| * Make affinity widget settings work. It's entirely possible they never did ↵zotlabs2017-12-282-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-hooksgit-marijus2017-12-271-3/+3
|\ \ | |/ |/| Fix dupe bug in content hooks
| * Fix whitespace formattingMatthew Dent2017-12-231-14/+14
| |
| * fix dupe bug in content hooksM.Dent2017-12-231-15/+15
| |
* | sort cloud directory by 1. is_dir and 2. name until we can figure out a way ↵zotlabs2017-12-251-1/+1
| | | | | | | | to request different sort orders
* | document that imagick calls/execs ffmpeg for mp4 video thumbnailszotlabs2017-12-251-1/+7
|/
* install smarty via composer and update other php libsMario Vavti2017-12-181-2/+0
|
* notifications: only handle item otype notify_idsMario Vavti2017-12-181-2/+2
|
* only use effective uid if we deal with sys channel contentMario Vavti2017-12-151-1/+7
|
* fix another PHP7.2 warninggMario Vavti2017-12-141-1/+1
|
* hubzilla #475 continued - show photos in root folder. Part of Andrew's fix ↵zotlabs2017-12-121-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 Vavti2017-12-111-1/+1
| | | | stream items on click (we can not mark them read)
* auto promote beginner (techlevel 0) accounts to level 1 after they show ↵zotlabs2017-12-101-1/+23
| | | | signs of active participation.
* strip acct: from OWA auth to API endpointszotlabs2017-12-072-2/+2
|
* fix loading of theme-specific widgetszotlabs2017-12-071-6/+13
|
* Merge pull request #924 from dentm42/bugfix-pr922git-marijus2017-12-071-1/+1
|\ | | | | Fix 'unable to add pages with spaces' (pr 922)
| * Fix 'unable to add pages with spaces' (pr 922)M.Dent2017-12-061-1/+1
| |
* | hubzilla issue #680, implement IMoveTarget and recursive file/directory ↵zotlabs2017-12-061-1/+17
| | | | | | | | move/rename
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-062-25/+74
|\|
| * missed a spot while resolving merge conflictMario Vavti2017-12-061-1/+1
| |
| * resolve merge conflictMario Vavti2017-12-062-25/+74
| |
* | synchronise an attach_move operation to cloneszotlabs2017-12-061-0/+5
|/
* mod_cloud: provide a themed page with an error notification on errors ↵zotlabs2017-12-052-1/+25
| | | | instead of an obtuse XML error structure
* disallow backslashes in wiki and wiki-page nameszotlabs2017-12-052-6/+18
|
* explain what happened herezotlabs2017-12-041-0/+3
|
* fix mod display and others that require a non-zero profile_uid for updateszotlabs2017-12-042-4/+9
|
* We only require one Update module. The rest are superfluous.zotlabs2017-12-0410-392/+34
|
* fix another PHP 7.2 warningMario Vavti2017-12-041-1/+1
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-044-8/+55
|\
| * pagetitle lost importing a pdl element from conversationzotlabs2017-12-032-2/+4
| |
| * rename buttonzotlabs2017-12-031-1/+1
| |
| * chunked uploads for photos pagezotlabs2017-12-031-2/+50
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-022-6/+11
| |\
| * | remove warning for large files on cloud uploadzotlabs2017-12-021-3/+0
| | |
* | | fix typo in HTTPSigMario Vavti2017-12-041-1/+1
| | |
* | | PHP 7.2 silence some warningsMario Vavti2017-12-041-3/+3
| | |
* | | mod hq: do not 404 if we have no itemMario Vavti2017-12-041-49/+59
| | |
* | | fix some pubstream on/off weirdnessMario2017-12-034-4/+7
| |/ |/|
* | add a filter for notification to show new posts onlyMario Vavti2017-12-012-6/+11
|/
* remove logging linezotlabs2017-11-301-1/+0
|
* Merge branch 'chunk'zotlabs2017-11-301-2/+5
|\
| * more or less working chunked uploads on /cloud now.zotlabs2017-11-301-0/+2
| |
| * more chunk workzotlabs2017-11-281-2/+3
| |