Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-21 | 4 | -37/+117 |
|\ | |||||
| * | fix album cover thumb generator | zotlabs | 2017-11-20 | 1 | -2/+2 |
| | | |||||
| * | more work theming the tile view | zotlabs | 2017-11-20 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -1/+1 |
| |\ | |||||
| * | | 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 | ||||
* | | | make browser history buttons work with ajax calls in /display and /hq | Mario Vavti | 2017-11-21 | 1 | -8/+8 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-20 | 5 | -3/+80 |
|\| | |||||
| * | cloud tiles: use folder-o for folders and set the icon colour to something a ↵ | zotlabs | 2017-11-19 | 1 | -1/+2 |
| | | | | | | | | 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 | 7 | -22/+322 |
| |\ | |||||
| * | | text thumbnails in cloud tile mode | zotlabs | 2017-11-19 | 4 | -2/+78 |
| | | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | 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 | 2 | -7/+13 |
| | | |||||
* | | 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 | 1 | -2/+11 |
|\| | |||||
| * | svg thumbnails have security concerns. Added thumbnail security setting and ↵ | zotlabs | 2017-11-17 | 1 | -2/+11 |
| | | | | | | | | 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. | ||||
* | | some more work on mod hq | Mario Vavti | 2017-11-18 | 3 | -79/+42 |
| | | |||||
* | | 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 | 2 | -1/+300 |
| | | | | | | | | 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 | 1 | -1/+10 |
|\| | |||||
| * | allow svg image previews in cloud browser when using tile mode. | zotlabs | 2017-11-16 | 1 | -1/+10 |
| | | |||||
* | | add > pin and remove > unpin | Mario Vavti | 2017-11-16 | 1 | -2/+2 |
| | | |||||
* | | provide ability to pin apps to navbar from /apps. this removes the ability ↵ | Mario Vavti | 2017-11-16 | 3 | -13/+35 |
|/ | | | | 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. | ||||
* | This should sort out hubzilla issue #826 but requires a bit more testing. It ↵ | zotlabs | 2017-11-15 | 2 | -5/+15 |
| | | | | may also sort out some reported issues with commenting and liking items in the public stream. | ||||
* | sort out a few more large image upload issues | zotlabs | 2017-11-14 | 3 | -2/+22 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-14 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #907 from dawnbreak/QA_testing | git-marijus | 2017-11-14 | 1 | -0/+1 |
| |\ | | | | | | | Unit tests for Zotlabs\Access classes. | ||||
| | * | :ok_hand: Fix a PHP warning in Permissions::FilledPerms(). | Klaus Weidenbach | 2017-11-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | When NULL is passed as parameter there is a PHP warning when testing against it in the function in_array(). | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-14 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | move mailhost settings from plugin to core | zotlabs | 2017-11-13 | 1 | -0/+4 |
| | | | |||||
* | | | sort combined private mail conversations by latest updated conversation ↵ | Mario Vavti | 2017-11-13 | 1 | -5/+7 |
| | | | | | | | | | | | | instead of created parent | ||||
* | | | also filter atokens on acl search | Mario Vavti | 2017-11-13 | 1 | -2/+9 |
|/ / | |||||
* | | allow a site to block (public) the directory separately from other resources. | zotlabs | 2017-11-12 | 1 | -0/+5 |
| | | |||||
* | | improve removed_channel final cleanup. Hubzilla issue #386 | zotlabs | 2017-11-12 | 2 | -1/+16 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-12 | 2 | -2/+3 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-11 | 1 | -3/+6 |
| |\ \ | |||||
| * | | | fix wiki pages not updating after creating new page | Mario Vavti | 2017-11-11 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | revert back to get the mid from enotify - otherwise we can not distinct ↵ | Mario Vavti | 2017-11-10 | 1 | -1/+2 |
| | | | | | | | | | | | | between posts and likes | ||||
* | | | cleanup of upload_to_comments test; we actually don't care about the profile ↵ | zotlabs | 2017-11-12 | 1 | -9/+0 |
| |/ |/| | | | | | owner. We only care that we're logged in locally and our storage is public by default. | ||||
* | | set os_syspath in DAV file put operation so that photos will scale correctly. | zotlabs | 2017-11-10 | 1 | -3/+6 |
|/ | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-09 | 2 | -1/+5 |
|\ | |||||
| * | unable to change permissions on wiki with space in name | zotlabs | 2017-11-08 | 1 | -1/+1 |
| | |