aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Mario Vavti2017-11-212-5/+5
| | | | | | | | local_channel is intval
| * 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 ↵zotlabs2017-11-202-35/+74
| | | | | | | | | | | | | | | | content types
| * | | 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.
| | * | Add ID3Parser library.Klaus Weidenbach2017-11-2016-2/+5492
| |/ / | | | | | | | | | https://github.com/LukasReschke/ID3Parser.git
| * | 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
| | | | | | | | | | | | bit less harsh than the link colour for system icons. Dark solid blue folders are a bit overwhelming, as is the default text_colour (black)
| | * 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 ↵zotlabs2017-11-172-2/+14
| | | | | | | | | | | | hook to generate other thumbnails - a plugin for text file thumbnails isn't too difficult (using imagemagick lib), however it's a tossup whether we do this at file submission time or at render time for performance reasons. Perhaps both options should be available.
| * | pubstream is not yet supported in mod hqMario Vavti2017-11-181-1/+3
| | |
| * | some more work on mod hqMario Vavti2017-11-186-83/+203
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-171-0/+1
| |\ \
| | * | Add French to help pages language dropdown selectorAndrew Manning2017-11-171-0/+1
| | | |
| * | | use substr() instead of str_replace()Mario Vavti2017-11-171-2/+1
| |/ /
| * | remove obsolete variableMario Vavti2017-11-171-1/+0
| | |
| * | inroduce the HQ module - a module with the potential to become a nice ↵Mario Vavti2017-11-175-2/+307
| | | | | | | | | | | | landing page for hubzilla. It is nothing more than a downgraded mod display atm.
| * | strip author name from notify messages in notifications - fix issue #911Mario Vavti2017-11-171-1/+8
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-177-10/+59
| |\|
| | * improve the icon mappings for cloud tile viewzotlabs2017-11-162-4/+35
| | |
| | * allow svg image previews in cloud browser when using tile mode.zotlabs2017-11-162-2/+11
| | |
| | * remove column item.diaspora_meta, action items 2 and 3 of hubzilla issue #828zotlabs2017-11-163-4/+13
| | |
| * | add > pin and remove > unpinMario Vavti2017-11-161-2/+2
| | |
| * | compare strpos result against falseMario Vavti2017-11-162-3/+3
| | |
| * | provide ability to pin apps to navbar from /apps. this removes the ability ↵Mario Vavti2017-11-165-22/+49
| |/ | | | | | | to have per custom navbar pinned apps - this can be added later if desired
| * Add private forums to forum widget. The link redirects to the remote channel ↵zotlabs2017-11-151-3/+29
| | | | | | | | page rather than a filtered view of your network page because you cannot post to a private forum from your own site.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-153-32/+33
| |\
| * | This should sort out hubzilla issue #826 but requires a bit more testing. It ↵zotlabs2017-11-153-13/+23
| | | | | | | | | | | | may also sort out some reported issues with commenting and liking items in the public stream.