aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2324-19/+699
|\
| * fix typo in pipe_streams()Mario Vavti2017-11-231-1/+1
| * optional divider between item header and bodyzotlabs2017-11-225-14/+17
| * disable until completedzotlabs2017-11-221-1/+2
| * article featurezotlabs2017-11-2217-5/+481
| * initial articles featurezotlabs2017-11-224-0/+200
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2240-11/+2561
|\|
| * allow toggle to 'SMBC' scaling mode. 'SMBC' mode is named thusly for Saturday...zotlabs2017-11-211-3/+10
| * add thumbnail hook documentation pointerzotlabs2017-11-211-1/+3
| * add thumbnail hookzotlabs2017-11-211-1/+25
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-213-26/+42
| |\
| * | expose the security setting for SVG thumbnailszotlabs2017-11-212-1/+4
| * | Video thumbnail generatorzotlabs2017-11-213-7/+61
| * | pdf thumbnailszotlabs2017-11-212-1/+50
| * | thumbnail generator for epubszotlabs2017-11-2132-1/+2412
| * | after shrinking the tile icons they can be a bit darker. At the larger size t...zotlabs2017-11-211-1/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-219-69/+172
|\ \ \ | | |/ | |/|
| * | use item_thread_top = 1 instead of mid = parent_mid and make sure local_chann...Mario Vavti2017-11-212-5/+5
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-216-43/+130
| |\|
| | * fix album cover thumb generatorzotlabs2017-11-201-2/+2
| | * more work theming the tile viewzotlabs2017-11-203-7/+14
| | * add mp3 audio thumbnail generatorzotlabs2017-11-201-0/+37
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-2017-3/+5493
| | |\
| | * | set display_path for photo_upload from the DAV File interfacezotlabs2017-11-201-2/+6
| | * | provide a generalised interface for thumbnail generators to support various c...zotlabs2017-11-202-35/+74
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-2116-2/+5492
| |\ \ \ | | | |/ | | |/|
| * | | make browser history buttons work with ajax calls in /display and /hqMario Vavti2017-11-212-21/+37
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2028-58/+5653
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #913 from dawnbreak/devMike Macgirvin2017-11-2116-2/+5492
| |\ \ \ | | |/ / | |/| |
| | * | Add ID3Parser library.Klaus Weidenbach2017-11-2016-2/+5492
| |/ /
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-2011-55/+160
| |\|
| | * cloud tiles: use folder-o for folders and set the icon colour to something a ...zotlabs2017-11-194-5/+10
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-1924-67/+566
| | |\
| | * | text thumbnails in cloud tile modezotlabs2017-11-197-50/+150
| * | | we need a mid also if there is no unseen itemsMario Vavti2017-11-201-1/+0
| * | | order by created instead of idMario Vavti2017-11-201-1/+1
| * | | speed up initial query if no mid is providedMario Vavti2017-11-201-0/+1
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1936-94/+690
|\| |
| * | hq: $item_normal was defined to lateMario Vavti2017-11-191-3/+3
| * | fix issues with apporder related to recent pinned apps changesMario Vavti2017-11-193-11/+25
| * | fix pinned apps not available in mobile viewMario Vavti2017-11-193-1/+9
| * | bump version to catch media breakpoint changesMario Vavti2017-11-191-1/+1
| * | revisit media breakpoints - do not switch to mobile view to early.Mario Vavti2017-11-198-24/+36
| * | only provide notify id if otype == itemMario Vavti2017-11-191-1/+1
| * | do not double encode already encoded midMario Vavti2017-11-191-1/+6
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-193-3/+15
| |\|
| | * don't include pending connections in pocozotlabs2017-11-181-1/+1
| | * svg thumbnails have security concerns. Added thumbnail security setting and h...zotlabs2017-11-172-2/+14
| * | pubstream is not yet supported in mod hqMario Vavti2017-11-181-1/+3
| * | some more work on mod hqMario Vavti2017-11-186-83/+203