aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into bs4Mario Vavti2017-03-1615-234/+758
|\
| * Merge pull request #569 from dawnbreak/QA_testingzotlabs2017-03-1615-234/+758
| |\ | | | | | | [FEATURE] Extend Travis CI integration.
| | * :construction_worker: Add Travis' GitHub deployment steps.Klaus Weidenbach2017-03-142-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 Weidenbach2017-03-148-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 Weidenbach2017-03-143-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.6Klaus Weidenbach2017-03-143-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 Weidenbach2017-03-143-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 Weidenbach2017-03-1410-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.
* | | re-add spaces between tagsMario Vavti2017-03-152-4/+7
| | |
* | | js fixesMario Vavti2017-03-152-15/+4
| | |
* | | style hashtags, mentions and categories. hide expand-aside button if not ↵Mario Vavti2017-03-1510-43/+35
| | | | | | | | | | | | needed. css and class fixes
* | | Merge branch 'dev' into bs4Mario Vavti2017-03-152-18/+6
|\| |
| * | better handling of mimetype securityMario Vavti2017-03-152-18/+6
| |/
* | various fixesMario Vavti2017-03-153-4/+8
| |
* | css fixesMario Vavti2017-03-143-15/+8
| |
* | hide nav search behind a button, css fixes and cleanupMario Vavti2017-03-1411-115/+47
| |
* | css fixesMario Vavti2017-03-144-21/+13
| |
* | many class fixes and revive shiny class for item titles in a new wayMario Vavti2017-03-1317-117/+85
| |
* | merge dev into bs4Mario Vavti2017-03-133-3/+27
|\|
| * Merge pull request #697 from anaqreon/devgit-marijus2017-03-131-1/+1
| |\ | | | | | | Add id to app-menu for JS access
| | * Add id to app-menu for JS accessAndrew Manning2017-03-121-1/+1
| | |
| * | we need to have this even if we are not the owner. otherwise we loose the ↵Mario Vavti2017-03-131-1/+1
| |/ | | | | | | acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
| * Login-box css-fix for Bluegrid schemejeroenpraat2017-03-111-1/+25
| |
* | fix help menuMario Vavti2017-03-122-37/+37
| |
* | many dropdown and class fixes. still a long way to go...Mario Vavti2017-03-1219-150/+148
| |
* | Merge branch 'dev' into bs4Mario Vavti2017-03-111-1/+1
|\|
| * Merge pull request #693 from anaqreon/devgit-marijus2017-03-111-1/+1
| |\ | | | | | | Take me home instead of get me home
| | * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
| |/
* | font size and post title adjustMario Vavti2017-03-116-135/+65
| |
* | fixing classesMario Vavti2017-03-1024-93/+73
| |
* | some sed magic on button class namesMario Vavti2017-03-1075-256/+256
| |
* | upgrade bs to latest git and some more progressMario Vavti2017-03-0912-406/+254
| |
* | remove navbar-toggler-left classMario Vavti2017-03-092-2/+1
| |
* | initial commit for the bootstrap version 4 branch - upgrade lib and make ↵Mario Vavti2017-03-0922-7872/+10668
|/ | | | nav.tpl kind of working again
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
|\
| * allow post_activity_item to be passed an empty ACL without resetting to ↵zotlabs2017-03-061-1/+2
| | | | | | | | channel default
| * add public_policy to the nwiki container also. This should not affect the ↵zotlabs2017-03-061-0/+2
| | | | | | | | recent bug as presented, but is being added for consistency.
| * correct fix for wiki anonymous read issue (items_permissions_sql checks ↵zotlabs2017-03-062-9/+6
| | | | | | | | item.public_policy which was set for posts, not wikis)
* | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
|/
* allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
|
* do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
|
* remove include/probe.php which has never completed development and has never ↵zotlabs2017-03-054-106/+1
| | | | been used
* move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-0522-4756/+5247
|\
| * Merge pull request #689 from mjfriaza/devzotlabs2017-03-052-2329/+2378
| |\ | | | | | | Translated the last strings into Spanish version
| | * Translated the last strings into Spanish versionManuel Jiménez Friaza2017-03-052-2329/+2378
| | |
| * | Merge pull request #688 from dawnbreak/markdownzotlabs2017-03-0520-2427/+2869
| |\ \ | | | | | | | | :arrow_up: :hammer: Upgrade Markdownify library.
| | * | :arrow_up: :hammer: Upgrade Markdownify library.Klaus Weidenbach2017-03-0520-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_mergezotlabs2017-03-042-1/+2
|\| |
| * | update changelogMario Vavti2017-03-041-0/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 14:35:45 +0000