aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* fix regression in app categoriesMario Vavti2018-01-081-2/+3
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-073-6/+133
|\
| * hubzilla issue #946zotlabs2018-01-071-0/+121
| * issues with feed parameterszotlabs2018-01-022-6/+12
* | start with nonactive state for the notifications button and display some text...Mario Vavti2018-01-071-0/+1
* | 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 co...zotlabs2017-12-301-1/+1
| * cleanupzotlabs2017-12-281-3/+5
| * a different (hopefully better) implementation of affinity presets, but not fo...zotlabs2017-12-282-10/+8
| * Make affinity widget settings work. It's entirely possible they never did wor...zotlabs2017-12-282-16/+16
* | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooksgit-marijus2017-12-271-3/+3
|\ \ | |/ |/|
| * 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 t...zotlabs2017-12-251-1/+1
* | 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 fo...zotlabs2017-12-121-1/+1
* notification: slight animation for loading... and do not remove public stream...Mario Vavti2017-12-111-1/+1
* auto promote beginner (techlevel 0) accounts to level 1 after they show signs...zotlabs2017-12-101-1/+23
* 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)M.Dent2017-12-061-1/+1
* | hubzilla issue #680, implement IMoveTarget and recursive file/directory move/...zotlabs2017-12-061-1/+17
* | 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 instead...zotlabs2017-12-052-1/+25
* 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
| |/ |/|