aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'dev' into bs4Mario Vavti2017-03-20130-39/+15887
|\|
| * Merge pull request #703 from dawnbreak/oauth2zotlabs2017-03-20128-6/+15850
| |\ | | | | | | :arrow_up: Update bshaffer/oauth2-server-php library.
| | * :arrow_up: Update bshaffer/oauth2-server-php library.Klaus Weidenbach2017-03-20128-6/+15850
| | | | | | | | | | | | | | | Manage oauth2-server-php library with composer. Folder ./library/oauth2/ can be removed and includes removed with autoloading.
| * | Merge pull request #702 from dawnbreak/devzotlabs2017-03-202-33/+37
| |\ \ | | |/ | |/| :white_check_mark: Add unit test for purify_html().
| | * :white_check_mark: Add unit test for purify_html().Klaus Weidenbach2017-03-192-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.
* | change the btn-outline-secondary:hover color to soething saneMario Vavti2017-03-191-0/+4
| |
* | Revert "update to bs-git"Mario Vavti2017-03-194-163/+231
| | | | | | | | This reverts commit 7b0f3d9e26b8c666440de09c5eb33dc6360472c6.
* | update to bs-gitMario Vavti2017-03-194-231/+163
| |
* | do not show the scrollbar before the animation has finishedMario Vavti2017-03-191-1/+1
| |
* | fix some wrapping issuesMario Vavti2017-03-193-6/+15
| |
* | reflect count in modalMario Vavti2017-03-192-2/+2
| |
* | open like-modal directly if more than 10 likesMario Vavti2017-03-193-22/+12
| |
* | typoMario Vavti2017-03-191-1/+1
| |
* | css fixesMario Vavti2017-03-193-4/+6
| |
* | a % example for font sizeMario Vavti2017-03-191-1/+1
| |
* | fix jgrowl position and remove some redundant cssMario Vavti2017-03-191-8/+1
| |
* | fix narrow navbar setting and contextual-help positionMario Vavti2017-03-192-49/+15
| |
* | Merge branch 'dev' into bs4Mario Vavti2017-03-1952-5493/+3826
|\|
| * fix php warning and remove loggingMario Vavti2017-03-191-4/+2
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-181-2/+1
| |\
| * | issue #699zotlabs2017-03-1849-1651/+0
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-1515-234/+758
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-152-18/+6
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-132-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-112-2/+26
| |\ \ \ \ \
| * | | | | | stringszotlabs2017-03-101-3838/+3824
| | | | | | |
| * | | | | | Monday is a proper name and should be capitalised (except in private ↵zotlabs2017-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | conversation amongst unix geeks).
* | | | | | | remove redundant cssMario Vavti2017-03-191-20/+0
| | | | | | |
* | | | | | | css fixesMario Vavti2017-03-191-1/+12
| | | | | | |
* | | | | | | fix custom fontsize for appMario Vavti2017-03-194-19/+11
| | | | | | |
* | | | | | | bs4 fixesMario Vavti2017-03-197-144/+93
| | | | | | |
* | | | | | | bs4 fixesMario Vavti2017-03-188-13/+23
| | | | | | |
* | | | | | | more abook_edit and some cssMario Vavti2017-03-183-6/+12
| | | | | | |
* | | | | | | more abook_editMario Vavti2017-03-181-3/+3
| | | | | | |
* | | | | | | fix abook_edit and private mailMario Vavti2017-03-184-46/+31
| | | | | | |
* | | | | | | Merge branch 'dev' into bs4Mario Vavti2017-03-181-2/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #698 from dawnbreak/devKlaus2017-03-181-2/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Missed one old Markdown()
| | * | | | | Missed one old Markdown()Klaus2017-03-181-2/+1
| |/ / / / /
* | | | | | bs4 fixesMario Vavti2017-03-189-290/+85
| | | | | |
* | | | | | fix usermenu radiusMario Vavti2017-03-171-1/+1
| | | | | |
* | | | | | css fixesMario Vavti2017-03-172-6/+10
| | | | | |
* | | | | | fix item_list and item_search templates. make item filer use a bootdtrap ↵Mario Vavti2017-03-1719-284/+276
| | | | | | | | | | | | | | | | | | | | | | | | modal and some css and class fixes
* | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:59:18 +0000