aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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 landing...Mario Vavti2017-11-175-2/+307
| * | 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 to...Mario Vavti2017-11-165-22/+49
| |/
| * Add private forums to forum widget. The link redirects to the remote channel ...zotlabs2017-11-151-3/+29
| * 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
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-159-48/+113
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-156-16/+80
| |\|
| | * sort out a few more large image upload issueszotlabs2017-11-146-16/+80
| * | typo - fixes issue #910Mario Vavti2017-11-151-1/+1
| * | move notifications style to widgets.cssMario Vavti2017-11-152-28/+28
| * | fix notifications again after recent changesMario Vavti2017-11-151-3/+4
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1421-261/+656
|\|
| * change button id to not interfere with the upload submit buttonMario Vavti2017-11-141-1/+1
| * move notifications full-screen handling to notifications widgetMario Vavti2017-11-142-14/+16
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-144-35/+388
| |\
| | * Merge pull request #907 from dawnbreak/QA_testinggit-marijus2017-11-144-35/+388
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:56:27 +0000