Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | css fixes | Mario Vavti | 2017-03-14 | 3 | -15/+8 |
| | | |||||
* | | hide nav search behind a button, css fixes and cleanup | Mario Vavti | 2017-03-14 | 11 | -115/+47 |
| | | |||||
* | | css fixes | Mario Vavti | 2017-03-14 | 4 | -21/+13 |
| | | |||||
* | | many class fixes and revive shiny class for item titles in a new way | Mario Vavti | 2017-03-13 | 17 | -117/+85 |
| | | |||||
* | | merge dev into bs4 | Mario Vavti | 2017-03-13 | 3 | -3/+27 |
|\| | |||||
| * | 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. | ||||
| * | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 |
| | | |||||
* | | fix help menu | Mario Vavti | 2017-03-12 | 2 | -37/+37 |
| | | |||||
* | | many dropdown and class fixes. still a long way to go... | Mario Vavti | 2017-03-12 | 19 | -150/+148 |
| | | |||||
* | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-11 | 1 | -1/+1 |
|\| | |||||
| * | 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 |
| |/ | |||||
* | | font size and post title adjust | Mario Vavti | 2017-03-11 | 6 | -135/+65 |
| | | |||||
* | | fixing classes | Mario Vavti | 2017-03-10 | 24 | -93/+73 |
| | | |||||
* | | some sed magic on button class names | Mario Vavti | 2017-03-10 | 75 | -256/+256 |
| | | |||||
* | | upgrade bs to latest git and some more progress | Mario Vavti | 2017-03-09 | 12 | -406/+254 |
| | | |||||
* | | remove navbar-toggler-left class | Mario Vavti | 2017-03-09 | 2 | -2/+1 |
| | | |||||
* | | initial commit for the bootstrap version 4 branch - upgrade lib and make ↵ | Mario Vavti | 2017-03-09 | 22 | -7872/+10668 |
|/ | | | | nav.tpl kind of working again | ||||
* | 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. |