Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-21 | 9 | -69/+172 |
|\ | |||||
| * | use item_thread_top = 1 instead of mid = parent_mid and make sure ↵ | Mario Vavti | 2017-11-21 | 2 | -5/+5 |
| | | | | | | | | local_channel is intval | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-21 | 6 | -43/+130 |
| |\ | |||||
| | * | fix album cover thumb generator | zotlabs | 2017-11-20 | 1 | -2/+2 |
| | | | |||||
| | * | more work theming the tile view | zotlabs | 2017-11-20 | 3 | -7/+14 |
| | | | |||||
| | * | add mp3 audio thumbnail generator | zotlabs | 2017-11-20 | 1 | -0/+37 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-20 | 17 | -3/+5493 |
| | |\ | |||||
| | * | | set display_path for photo_upload from the DAV File interface | zotlabs | 2017-11-20 | 1 | -2/+6 |
| | | | | |||||
| | * | | provide a generalised interface for thumbnail generators to support various ↵ | zotlabs | 2017-11-20 | 2 | -35/+74 |
| | | | | | | | | | | | | | | | | content types | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-21 | 16 | -2/+5492 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | make browser history buttons work with ajax calls in /display and /hq | Mario Vavti | 2017-11-21 | 2 | -21/+37 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-20 | 28 | -58/+5653 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #913 from dawnbreak/dev | Mike Macgirvin | 2017-11-21 | 16 | -2/+5492 |
| |\ \ \ | | |/ / | |/| | | Add ID3Parser library. | ||||
| | * | | Add ID3Parser library. | Klaus Weidenbach | 2017-11-20 | 16 | -2/+5492 |
| |/ / | | | | | | | | | | https://github.com/LukasReschke/ID3Parser.git | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-20 | 11 | -55/+160 |
| |\| | |||||
| | * | cloud tiles: use folder-o for folders and set the icon colour to something a ↵ | zotlabs | 2017-11-19 | 4 | -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_merge | zotlabs | 2017-11-19 | 24 | -67/+566 |
| | |\ | |||||
| | * | | text thumbnails in cloud tile mode | zotlabs | 2017-11-19 | 7 | -50/+150 |
| | | | | |||||
| * | | | we need a mid also if there is no unseen items | Mario Vavti | 2017-11-20 | 1 | -1/+0 |
| | | | | |||||
| * | | | order by created instead of id | Mario Vavti | 2017-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | speed up initial query if no mid is provided | Mario Vavti | 2017-11-20 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-19 | 36 | -94/+690 |
|\| | | |||||
| * | | hq: $item_normal was defined to late | Mario Vavti | 2017-11-19 | 1 | -3/+3 |
| | | | |||||
| * | | fix issues with apporder related to recent pinned apps changes | Mario Vavti | 2017-11-19 | 3 | -11/+25 |
| | | | |||||
| * | | fix pinned apps not available in mobile view | Mario Vavti | 2017-11-19 | 3 | -1/+9 |
| | | | |||||
| * | | bump version to catch media breakpoint changes | Mario Vavti | 2017-11-19 | 1 | -1/+1 |
| | | | |||||
| * | | revisit media breakpoints - do not switch to mobile view to early. | Mario Vavti | 2017-11-19 | 8 | -24/+36 |
| | | | |||||
| * | | only provide notify id if otype == item | Mario Vavti | 2017-11-19 | 1 | -1/+1 |
| | | | |||||
| * | | do not double encode already encoded mid | Mario Vavti | 2017-11-19 | 1 | -1/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-19 | 3 | -3/+15 |
| |\| | |||||
| | * | don't include pending connections in poco | zotlabs | 2017-11-18 | 1 | -1/+1 |
| | | | |||||
| | * | svg thumbnails have security concerns. Added thumbnail security setting and ↵ | zotlabs | 2017-11-17 | 2 | -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 hq | Mario Vavti | 2017-11-18 | 1 | -1/+3 |
| | | | |||||
| * | | some more work on mod hq | Mario Vavti | 2017-11-18 | 6 | -83/+203 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-17 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Add French to help pages language dropdown selector | Andrew Manning | 2017-11-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | use substr() instead of str_replace() | Mario Vavti | 2017-11-17 | 1 | -2/+1 |
| |/ / | |||||
| * | | remove obsolete variable | Mario Vavti | 2017-11-17 | 1 | -1/+0 |
| | | | |||||
| * | | inroduce the HQ module - a module with the potential to become a nice ↵ | Mario Vavti | 2017-11-17 | 5 | -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 #911 | Mario Vavti | 2017-11-17 | 1 | -1/+8 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-17 | 7 | -10/+59 |
| |\| | |||||
| | * | improve the icon mappings for cloud tile view | zotlabs | 2017-11-16 | 2 | -4/+35 |
| | | | |||||
| | * | allow svg image previews in cloud browser when using tile mode. | zotlabs | 2017-11-16 | 2 | -2/+11 |
| | | | |||||
| | * | remove column item.diaspora_meta, action items 2 and 3 of hubzilla issue #828 | zotlabs | 2017-11-16 | 3 | -4/+13 |
| | | | |||||
| * | | add > pin and remove > unpin | Mario Vavti | 2017-11-16 | 1 | -2/+2 |
| | | | |||||
| * | | compare strpos result against false | Mario Vavti | 2017-11-16 | 2 | -3/+3 |
| | | | |||||
| * | | provide ability to pin apps to navbar from /apps. this removes the ability ↵ | Mario Vavti | 2017-11-16 | 5 | -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 ↵ | zotlabs | 2017-11-15 | 1 | -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_merge | zotlabs | 2017-11-15 | 3 | -32/+33 |
| |\ | |||||
| * | | This should sort out hubzilla issue #826 but requires a bit more testing. It ↵ | zotlabs | 2017-11-15 | 3 | -13/+23 |
| | | | | | | | | | | | | may also sort out some reported issues with commenting and liking items in the public stream. |