| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | 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' into red | zotlabs | 2017-03-15 | 0 | -0/+0 | |
| |\| | | | ||||||
| | * | | | 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 | |
| | | |/ | ||||||
| * | | | ensure z_input_filter is called exactly once, since we now depend on the ↵ | zotlabs | 2017-03-15 | 2 | -22/+55 | |
| | | | | | | | | | | | | | | | | | | | number of htmlspecialchars operations for markdown content. Also ensure that the content is escaped the correct number of times on imported items. | |||||
| * | | | more work related to attach/photo and os_path, display_path and general code ↵ | zotlabs | 2017-03-15 | 2 | -36/+40 | |
| | | | | | | | | | | | | | cleanup | |||||
| * | | | add os_path and display_path to photos, fix some issues with multiple path ↵ | zotlabs | 2017-03-14 | 3 | -96/+12 | |
| | | | | | | | | | | | | | separators after cloud/nickname in the content field of attach and photos | |||||
| * | | | store os_path and display_path with files | zotlabs | 2017-03-14 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | use dim for the button border also | zotlabs | 2017-03-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | dim class was un-themed | zotlabs | 2017-03-14 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | input filter updates | zotlabs | 2017-03-14 | 6 | -103/+57 | |
| | | | | ||||||
| * | | | fix group by item query | zotlabs | 2017-03-14 | 1 | -17/+15 | |
| | | | | ||||||
| * | | | class MarkdownSoap to safely store markdown by purifying and preserving ↵ | zotlabs | 2017-03-14 | 1 | -0/+86 | |
| | | | | | | | | | | | | | (escaped) what may be unsafe code in codeblocks. The stored item needs to be unescaped just prior to calling the markdown-to-html processor | |||||
| * | | | get rid of some cruft in boot.php | zotlabs | 2017-03-14 | 1 | -62/+17 | |
| | | | | ||||||
| * | | | make redbasic compatible with red 5.x | zotlabs | 2017-03-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | remove the unimplemented upload limit site settings | zotlabs | 2017-03-13 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | code_allowed is a real mess. Start the cleanup by remving the account level ↵ | zotlabs | 2017-03-13 | 7 | -79/+28 | |
| | | | | | | | | | | | | | code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. | |||||
| * | | | Merge branch 'dev' into red | zotlabs | 2017-03-13 | 1 | -1/+1 | |
| |\| | | ||||||
| | * | | 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. | |||||
| * | | | move oauth2 to vendor | zotlabs | 2017-03-14 | 132 | -3612/+1324 | |
| | | | | ||||||
| * | | | better handling of mimetype security | zotlabs | 2017-03-12 | 3 | -20/+7 | |
| | | | | ||||||
| * | | | remove more hardwired branding | zotlabs | 2017-03-12 | 3 | -65/+67 | |
| | | | | ||||||
| * | | | update license | zotlabs | 2017-03-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | update readme | zotlabs | 2017-03-12 | 1 | -27/+3 | |
| | | | | ||||||
| * | | | grrr. stop making branding assumptions. | zotlabs | 2017-03-12 | 6 | -13/+8 | |
| | | | | ||||||
| * | | | more cleanup | zotlabs | 2017-03-12 | 1 | -29/+35 | |
| | | | | ||||||
| * | | | update std_version | zotlabs | 2017-03-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | db issues | zotlabs | 2017-03-12 | 4 | -90/+8 | |
| | | | | ||||||
| * | | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 3 | -3/+27 | |
| |\| | | ||||||
| | * | | 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). | |||||
| * | | strings | zotlabs | 2017-03-10 | 1 | -3838/+3824 | |
| | | | ||||||
| * | | one role. | zotlabs | 2017-03-09 | 4 | -61/+5 | |
| | | | ||||||
| * | | more cleanup | zotlabs | 2017-03-09 | 3 | -40/+5 | |
| | | | ||||||
| * | | Merge branch 'dspr' into red | zotlabs | 2017-03-09 | 11 | -7395/+7326 | |
| |\ \ | ||||||
| | * | | move all the diaspora content hacks to the diaspora plugin | zotlabs | 2017-03-08 | 1 | -408/+9 | |
| | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |