Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-27 | 21 | -91/+261 |
|\ | |||||
| * | Merge pull request #918 from albigro/dev | git-marijus | 2017-11-27 | 1 | -1/+8 |
| |\ | | | | | | | Update dark.css | ||||
| | * | Update dark.css | albigro | 2017-11-27 | 1 | -1/+8 |
| |/ | |||||
| * | do not stop click propagation | Mario Vavti | 2017-11-27 | 1 | -1/+0 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-27 | 1 | -0/+3 |
| |\ | |||||
| | * | unset item_wall and item_origin on pubstream to channel copy | zotlabs | 2017-11-27 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #916 from dawnbreak/QA_testing | git-marijus | 2017-11-27 | 6 | -11/+41 |
| |\ \ | | | | | | | | | Improve Travis CI | ||||
| | * | | Fix a PHP error in a unit test for PHP7.2. | Klaus Weidenbach | 2017-11-25 | 1 | -4/+4 |
| | | | | |||||
| | * | | :construction_worker:Improve Travis, add PHP7.2. | Klaus Weidenbach | 2017-11-25 | 5 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | Improve Travis CI configuration a bit and add PHP7.2 to the test matrix. Add PHPUnit Testdox output and optionally deploy test results on release tags. Add a configuration file for infection (Mutation Testing Framework). | ||||
| * | | | Merge pull request #917 from anaqreon/minimum-age | git-marijus | 2017-11-27 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | | | Provide system config option for minimum registration age. | ||||
| | * | | | Provide system config option for minimum registration age. | Andrew Manning | 2017-11-24 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | fix mod like after recent changes | Mario Vavti | 2017-11-27 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | pubstream comments and a few other bugfixes that were discovered along the way | zotlabs | 2017-11-26 | 12 | -77/+204 |
| | |/ | |/| | |||||
* | | | 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 |
| | | | | | | | | | | | | | | | | also some extra checking of server headers in upload functions | ||||
| | * | | 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 ↵ | zotlabs | 2017-11-22 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | eventually support this on the client side | ||||
| * | | | | 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 ↵ | zotlabs | 2017-11-21 | 1 | -3/+10 |
| | | | | | | | | Saturday Morning Breakfast Cereal cartoons which are very tall. If you scale the image to constrain both dimensions, the cartoon text is illegible. So we allow the height to float and only constrain the width. The new flag allows you to overide this mode and force both dimensions to always be evaluated and constrained to the provided limit. | ||||
| * | 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 ↵ | zotlabs | 2017-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | the darkness was harsh. | ||||
* | | | 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 |