Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #702 from dawnbreak/dev | zotlabs | 2017-03-20 | 2 | -33/+37 |
|\ | | | | | :white_check_mark: Add unit test for purify_html(). | ||||
| * | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -33/+37 |
|/ | | | | | | In preparation to update HTMLPurifier library add a unit test. Please add more HTML that you need to have working and we can check against regressions. | ||||
* | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
|\ | |||||
| * | Merge pull request #698 from dawnbreak/dev | Klaus | 2017-03-18 | 1 | -2/+1 |
| |\ | | | | | | | Missed one old Markdown() | ||||
| | * | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| |/ | |||||
* | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 15 | -234/+758 |
|\| | |||||
| * | Merge pull request #569 from dawnbreak/QA_testing | zotlabs | 2017-03-16 | 15 | -234/+758 |
| |\ | | | | | | | [FEATURE] Extend Travis CI integration. | ||||
| | * | :construction_worker: Add Travis' GitHub deployment steps. | Klaus Weidenbach | 2017-03-14 | 2 | -50/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed API documentation deployment to gh_pages to Travis's GitHub Pages deployment. Also add Travis GitHub Release Deployment step to offer API documentation. Both steps are optional and need to be activated in Travis by setting GH_TOKEN. | ||||
| | * | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ↵ | Klaus Weidenbach | 2017-03-14 | 8 | -224/+372 |
| | | | | | | | | | | | | | | | | | | | | | stable 6. Update requirements to PHP7 for dev. Add php-mock-phpunit to mock and stub global functions in a better way. | ||||
| | * | :construction_worker: Add old MySQL 5.5 to Travis CI again. | Klaus Weidenbach | 2017-03-14 | 3 | -4/+13 |
| | | | | | | | | | | | | | | | | | | The trusty distro contains MySQL 5.6. Add a precise distro with MySQL 5.5. Unfortunately 5.7 is not yet provided, which would be interesting because of the enabled strict SQL mode. | ||||
| | * | :construction_worker: use PHP7.1 and add PostgreSQL9.6 | Klaus Weidenbach | 2017-03-14 | 3 | -28/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | Use newer distro for Travis CI runs. New environment provides PostgreSQL9.6. Also no need to install custom Doxygen, made it optional. Changed default PHP environment from PHP7.0 to current PHP7.1. Changed codecoverage reporting. | ||||
| | * | :green_heart: Update Travis CI's Doxygen. | Klaus Weidenbach | 2017-03-14 | 3 | -14/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | Travis CI has Doxygen 1.7. We need 1.8 to generate our API documentation. Get a static version and use it. Always build API Documentation, but changed Doxygen configuration to only print out errors in the documentation generation, so these can be reviewed. | ||||
| | * | [FEATURE] :construction_worker: Extend Travis CI integration. | Klaus Weidenbach | 2017-03-14 | 10 | -27/+378 |
| | | | | | | | | | | | | | | | | | | | | | Testing several Travis CI features. Add DBs to travis execution matrix. Doxygen API docu generation and deployment to gh-pages. Update phpunit to 5.7. | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
|\| | | |||||
| * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| |/ | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-13 | 2 | -2/+2 |
|\| | |||||
| * | Merge pull request #697 from anaqreon/dev | git-marijus | 2017-03-13 | 1 | -1/+1 |
| |\ | | | | | | | Add id to app-menu for JS access | ||||
| | * | Add id to app-menu for JS access | Andrew Manning | 2017-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | we need to have this even if we are not the owner. otherwise we loose the ↵ | Mario Vavti | 2017-03-13 | 1 | -1/+1 |
| |/ | | | | | | | acl if e.g. not-owner edits a webpage. should probably find a better solution for this though. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-11 | 2 | -2/+26 |
|\| | |||||
| * | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 |
| | | |||||
| * | Merge pull request #693 from anaqreon/dev | git-marijus | 2017-03-11 | 1 | -1/+1 |
| |\ | | | | | | | Take me home instead of get me home | ||||
| | * | Take me home instead of get me home | Andrew Manning | 2017-03-09 | 1 | -1/+1 |
| |/ | |||||
* | | strings | zotlabs | 2017-03-10 | 1 | -3838/+3824 |
| | | |||||
* | | Monday is a proper name and should be capitalised (except in private ↵ | zotlabs | 2017-03-08 | 1 | -1/+1 |
|/ | | | | conversation amongst unix geeks). | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-07 | 3 | -10/+10 |
|\ | |||||
| * | allow post_activity_item to be passed an empty ACL without resetting to ↵ | zotlabs | 2017-03-06 | 1 | -1/+2 |
| | | | | | | | | channel default | ||||
| * | add public_policy to the nwiki container also. This should not affect the ↵ | zotlabs | 2017-03-06 | 1 | -0/+2 |
| | | | | | | | | recent bug as presented, but is being added for consistency. | ||||
| * | correct fix for wiki anonymous read issue (items_permissions_sql checks ↵ | zotlabs | 2017-03-06 | 2 | -9/+6 |
| | | | | | | | | item.public_policy which was set for posts, not wikis) | ||||
* | | Big 2.2 string update Dutch | jeroenpraat | 2017-03-07 | 2 | -6864/+7305 |
|/ | |||||
* | allow unauthenticated access to public wiki pages | Mario Vavti | 2017-03-06 | 1 | -2/+10 |
| | |||||
* | do not collapse long nsfw content | Mario Vavti | 2017-03-06 | 1 | -1/+1 |
| | |||||
* | remove include/probe.php which has never completed development and has never ↵ | zotlabs | 2017-03-05 | 4 | -106/+1 |
| | | | | been used | ||||
* | move emoji emoticons (not reactions) to plugin | zotlabs | 2017-03-05 | 1824 | -18/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-05 | 22 | -4756/+5247 |
|\ | |||||
| * | Merge pull request #689 from mjfriaza/dev | zotlabs | 2017-03-05 | 2 | -2329/+2378 |
| |\ | | | | | | | Translated the last strings into Spanish version | ||||
| | * | Translated the last strings into Spanish version | Manuel Jiménez Friaza | 2017-03-05 | 2 | -2329/+2378 |
| | | | |||||
| * | | Merge pull request #688 from dawnbreak/markdown | zotlabs | 2017-03-05 | 20 | -2427/+2869 |
| |\ \ | | | | | | | | | :arrow_up: :hammer: Upgrade Markdownify library. | ||||
| | * | | :arrow_up: :hammer: Upgrade Markdownify library. | Klaus Weidenbach | 2017-03-05 | 20 | -2427/+2869 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | The current version 2.0.0 (alpha) throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the HTML to Markdown converter for PHP to the current Markdownify 2.2.1. Used composer to manage this library. | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-04 | 2 | -1/+2 |
|\| | | |||||
| * | | update changelog | Mario Vavti | 2017-03-04 | 1 | -0/+1 |
| | | | |||||
| * | | we need item edited for wiki page history, not item created | Mario Vavti | 2017-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | minor feed issue | zotlabs | 2017-03-04 | 1 | -0/+8 |
|/ / | |||||
* | | string update | zotlabs | 2017-03-03 | 1 | -887/+910 |
| | | |||||
* | | fix badge position for narrow navbar | Mario Vavti | 2017-03-03 | 1 | -4/+0 |
| | | |||||
* | | reverse sort order | zotlabs | 2017-03-02 | 1 | -1/+1 |
| | | |||||
* | | activity widget - turns out the owner is not relevant. | zotlabs | 2017-03-02 | 1 | -9/+5 |
| | | |||||
* | | document the activity widget | zotlabs | 2017-03-02 | 1 | -0/+1 |
| | |