| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-25 | 29 | -83/+281 |
|\ |
|
| * | fix double html ids in caldav widget if more than one sharee | Mario Vavti | 2017-11-25 | 1 | -2/+2 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario | 2017-11-25 | 1 | -1/+1 |
| |\ |
|
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-25 | 1 | -1/+1 |
| | |\ |
|
| | | * | blah is not author or owner | zotlabs | 2017-11-25 | 1 | -1/+1 |
| * | | | fix regression in cdav calendar widget | Mario | 2017-11-25 | 1 | -2/+3 |
| |/ / |
|
| * | | implement pubstream items in mod hq | Mario | 2017-11-25 | 2 | -12/+37 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-25 | 15 | -49/+137 |
| |\| |
|
| | * | this may fix pubstream comments/likes | zotlabs | 2017-11-24 | 1 | -0/+16 |
| | * | don't include invisible "update activities" in category widget | zotlabs | 2017-11-24 | 2 | -34/+37 |
| | * | default profile assign | zotlabs | 2017-11-24 | 4 | -1/+17 |
| | * | sync packet not generated when deleting a file using the web browser interface | zotlabs | 2017-11-24 | 1 | -0/+5 |
| | * | remove deprecated $a argument from advanced_profile() | zotlabs | 2017-11-23 | 2 | -2/+2 |
| | * | change to bbcode calling parameters: important: will require pulling addons; | zotlabs | 2017-11-23 | 5 | -16/+24 |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-23 | 1 | -1/+1 |
| | |\ |
|
| | * | | mod_file_upload: provide a handler for chunked uploads for when we eventually... | zotlabs | 2017-11-22 | 1 | -0/+40 |
| * | | | mod hq: minor query change | Mario Vavti | 2017-11-24 | 1 | -10/+2 |
| * | | | missing files | Mario Vavti | 2017-11-24 | 3 | -0/+65 |
| * | | | some more work on mod hq | Mario Vavti | 2017-11-24 | 7 | -10/+37 |
| | |/
| |/| |
|
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-23 | 24 | -19/+699 |
|\| | |
|
| * | | fix typo in pipe_streams() | Mario Vavti | 2017-11-23 | 1 | -1/+1 |
| |/ |
|
| * | optional divider between item header and body | zotlabs | 2017-11-22 | 5 | -14/+17 |
| * | disable until completed | zotlabs | 2017-11-22 | 1 | -1/+2 |
| * | article feature | zotlabs | 2017-11-22 | 17 | -5/+481 |
| * | initial articles feature | zotlabs | 2017-11-22 | 4 | -0/+200 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-22 | 40 | -11/+2561 |
|\| |
|
| * | allow toggle to 'SMBC' scaling mode. 'SMBC' mode is named thusly for Saturday... | zotlabs | 2017-11-21 | 1 | -3/+10 |
| * | add thumbnail hook documentation pointer | zotlabs | 2017-11-21 | 1 | -1/+3 |
| * | add thumbnail hook | zotlabs | 2017-11-21 | 1 | -1/+25 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-21 | 3 | -26/+42 |
| |\ |
|
| * | | expose the security setting for SVG thumbnails | zotlabs | 2017-11-21 | 2 | -1/+4 |
| * | | Video thumbnail generator | zotlabs | 2017-11-21 | 3 | -7/+61 |
| * | | pdf thumbnails | zotlabs | 2017-11-21 | 2 | -1/+50 |
| * | | thumbnail generator for epubs | zotlabs | 2017-11-21 | 32 | -1/+2412 |
| * | | after shrinking the tile icons they can be a bit darker. At the larger size t... | zotlabs | 2017-11-21 | 1 | -1/+1 |
* | | | 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 local_chann... | Mario Vavti | 2017-11-21 | 2 | -5/+5 |
| * | | 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 c... | zotlabs | 2017-11-20 | 2 | -35/+74 |
| * | | | 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. | Klaus Weidenbach | 2017-11-20 | 16 | -2/+5492 |
| |/ / |
|
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-20 | 11 | -55/+160 |
| |\| |
|