Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "update to bs-git" | Mario Vavti | 2017-03-19 | 4 | -163/+231 |
| | | | | This reverts commit 7b0f3d9e26b8c666440de09c5eb33dc6360472c6. | ||||
* | update to bs-git | Mario Vavti | 2017-03-19 | 4 | -231/+163 |
| | |||||
* | do not show the scrollbar before the animation has finished | Mario Vavti | 2017-03-19 | 1 | -1/+1 |
| | |||||
* | fix some wrapping issues | Mario Vavti | 2017-03-19 | 3 | -6/+15 |
| | |||||
* | reflect count in modal | Mario Vavti | 2017-03-19 | 2 | -2/+2 |
| | |||||
* | open like-modal directly if more than 10 likes | Mario Vavti | 2017-03-19 | 3 | -22/+12 |
| | |||||
* | typo | Mario Vavti | 2017-03-19 | 1 | -1/+1 |
| | |||||
* | css fixes | Mario Vavti | 2017-03-19 | 3 | -4/+6 |
| | |||||
* | a % example for font size | Mario Vavti | 2017-03-19 | 1 | -1/+1 |
| | |||||
* | fix jgrowl position and remove some redundant css | Mario Vavti | 2017-03-19 | 1 | -8/+1 |
| | |||||
* | fix narrow navbar setting and contextual-help position | Mario Vavti | 2017-03-19 | 2 | -49/+15 |
| | |||||
* | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-19 | 52 | -5493/+3826 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * | | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-11 | 2 | -2/+26 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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). | ||||
* | | | | | | | remove redundant css | Mario Vavti | 2017-03-19 | 1 | -20/+0 |
| | | | | | | | |||||
* | | | | | | | css fixes | Mario Vavti | 2017-03-19 | 1 | -1/+12 |
| | | | | | | | |||||
* | | | | | | | fix custom fontsize for app | Mario Vavti | 2017-03-19 | 4 | -19/+11 |
| | | | | | | | |||||
* | | | | | | | bs4 fixes | Mario Vavti | 2017-03-19 | 7 | -144/+93 |
| | | | | | | | |||||
* | | | | | | | bs4 fixes | Mario Vavti | 2017-03-18 | 8 | -13/+23 |
| | | | | | | | |||||
* | | | | | | | more abook_edit and some css | Mario Vavti | 2017-03-18 | 3 | -6/+12 |
| | | | | | | | |||||
* | | | | | | | more abook_edit | Mario Vavti | 2017-03-18 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | fix abook_edit and private mail | Mario Vavti | 2017-03-18 | 4 | -46/+31 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 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 |
| |/ / / / / | |||||
* | | | | | | bs4 fixes | Mario Vavti | 2017-03-18 | 9 | -290/+85 |
| | | | | | | |||||
* | | | | | | fix usermenu radius | Mario Vavti | 2017-03-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | css fixes | Mario Vavti | 2017-03-17 | 2 | -6/+10 |
| | | | | | | |||||
* | | | | | | fix item_list and item_search templates. make item filer use a bootdtrap ↵ | Mario Vavti | 2017-03-17 | 19 | -284/+276 |
| | | | | | | | | | | | | | | | | | | | | | | | | modal and some css and class fixes | ||||
* | | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-16 | 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. | ||||
* | | | | | re-add spaces between tags | Mario Vavti | 2017-03-15 | 2 | -4/+7 |
| | | | | | |||||
* | | | | | js fixes | Mario Vavti | 2017-03-15 | 2 | -15/+4 |
| | | | | | |||||
* | | | | | style hashtags, mentions and categories. hide expand-aside button if not ↵ | Mario Vavti | 2017-03-15 | 10 | -43/+35 |
| | | | | | | | | | | | | | | | | | | | | needed. css and class fixes | ||||
* | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
|\| | | | | |||||
| * | | | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| |/ / / | |||||
* | | | | various fixes | Mario Vavti | 2017-03-15 | 3 | -4/+8 |
| | | | |