aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.6RC'2.6Mario Vavti2017-08-16770-60246/+23829
|\
| * Release Hubzilla 2.6Mario Vavti2017-08-161-1/+1
| * update changelogMario Vavti2017-08-161-1/+1
| * typoMario Vavti2017-08-141-1/+1
| * changelogMario Vavti2017-08-141-1/+98
| * contact_slider.tpl didn't get updated with one of the bootstrap changes where...zotlabs2017-08-141-3/+3
| * add parent item (if applicable) to notifier plugin infozotlabs2017-08-141-0/+2
| * Update composer autload cacheMario Vavti2017-08-142-2/+4
| * minor js and css changesgit-marijus2017-08-123-10/+16
| * RC1git-marijus2017-08-121-1/+1
| * update to bootstrap betaMario Vavti2017-08-1215-147/+134
| * create cdav principal also on client access and remove redundant pconfig chec...Mario Vavti2017-08-102-6/+12
| * do not show channel manager and nav channel select if we are in a delegate se...git-marijus2017-08-101-4/+8
| * libxml errorszotlabs2017-08-104-6/+7
| * App::get_channel() does not return the right channel if we are not looking at...git-marijus2017-08-091-7/+1
| * ostatus feed was missing commentszotlabs2017-08-072-9/+5
| * Update DE translation stringsphellmes2017-08-062-2361/+2411
| * Merge pull request #835 from anaqreon/2.6RCgit-marijus2017-08-062-0/+9
| |\
| | * Fix styling on help page content list in sidebar.Andrew Manning2017-08-032-0/+9
| * | consolidate disable_discover_tab config if it was not yet set to either 1 or ...git-marijus2017-08-065-10/+12
| * | some bb-to-markdown issueszotlabs2017-08-031-5/+2
| * | minor activitypub rendering stuffzotlabs2017-08-032-2/+2
| * | missing observer hashgit-marijus2017-08-031-1/+1
| * | fix issue #836 - missing opening form taggit-marijus2017-08-031-0/+1
| * | fix attachment upload for private mailgit-marijus2017-08-032-28/+26
| * | return preview also if we have no attachmentgit-marijus2017-08-031-1/+1
| |/
| * Updated the Spanish translationManuel Jiménez Friaza2017-08-022-2291/+2341
| * css fixgit-marijus2017-08-021-0/+1
| * finally fix recursive attachments permissionsgit-marijus2017-08-011-54/+79
| * use small line-height only for larger screensgit-marijus2017-08-011-1/+1
| * remove blugrid schema until somebody cares to fix itMario Vavti2017-08-012-543/+0
| * less badge more iconMario Vavti2017-08-011-0/+1
| * stringsMario Vavti2017-08-011-6817/+6697
| * ensure we can work around the $is_http var in include/follow - this is left o...zotlabs2017-07-311-14/+13
| * improve file_activity() a littlegit-marijus2017-07-313-29/+9
| * db update to add index for item.obj_typegit-marijus2017-07-314-2/+16
| * provide a better "is_commentable" default for OStatus conversations that were...zotlabs2017-07-311-1/+12
| * add options flag to bb_to_markdown so we can distinguish between diaspora use...zotlabs2017-07-311-2/+4
| * fix a bug where if multiple channels uploaded the same file to the same folde...git-marijus2017-07-311-2/+4
| * close the apps-menu if the notifications-menu is open and vice versagit-marijus2017-07-313-2/+14
| * no need for jquery heregit-marijus2017-07-302-2/+8
| * version 2.6RCgit-marijus2017-07-281-1/+1
| * remove borders from navbar togglergit-marijus2017-07-271-1/+1
| * improve the formatting of shares when converting from bbcode to markdownzotlabs2017-07-271-0/+69
| * suppress fopen errors from davzotlabs2017-07-271-1/+1
| * remove activitypub components from corezotlabs2017-07-271-182/+0
| * issue with OStatus comments being propagated downstreamzotlabs2017-07-271-0/+15
| * move the active app code to include/nav.php - it is only relevant theregit-marijus2017-07-262-3/+3
| * version 2.5.10git-marijus2017-07-251-1/+1
| * make local channel (not our own) nav menus appear similar to what we are used...git-marijus2017-07-252-14/+14