Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-27 | 2 | -117/+115 |
|\ | |||||
| * | Merge pull request #704 from zotlabs/doppleclone | git-marijus | 2017-03-27 | 1 | -6/+0 |
| |\ | | | | | | | remove redundant and non-functional/broken check for successfully clo… | ||||
| | * | remove redundant and non-functional/broken check for successfully cloned ↵ | zotlabs | 2017-03-20 | 1 | -6/+0 |
| | | | | | | | | | | | | channel record which was left over from an earlier method of creating the table; which was deprecated a few months back. | ||||
| * | | Merge pull request #707 from dawnbreak/docu | git-marijus | 2017-03-27 | 1 | -111/+115 |
| |\ \ | | | | | | | | | Import Module documentation and @-sign replacement. | ||||
| | * | | Import Module documentation and @-sign replacement. | Klaus Weidenbach | 2017-03-25 | 1 | -111/+115 |
| | | | | | | | | | | | | | | | | | | | | If you copy the identity from your profile page the @-sign is invalid for the import and fails. Replace it for convenience. | ||||
* | | | | remove apps which we have access to from the leftside menu in nav | Mario Vavti | 2017-03-27 | 9 | -24/+0 |
|/ / / | |||||
* | | | unify css classes | Mario Vavti | 2017-03-27 | 3 | -44/+16 |
| | | | |||||
* | | | css fixes | Mario Vavti | 2017-03-27 | 3 | -31/+22 |
| | | | |||||
* | | | fix app-icon color and use bs class for w100 | Mario Vavti | 2017-03-26 | 3 | -6/+3 |
| | | | |||||
* | | | fix nav menu caret | Mario Vavti | 2017-03-26 | 2 | -5/+8 |
| | | | |||||
* | | | fix and cleanup custom theme settings | Mario Vavti | 2017-03-26 | 6 | -180/+20 |
| | | | |||||
* | | | minor css cleanup | Mario Vavti | 2017-03-26 | 1 | -19/+8 |
|/ / | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-25 | 2 | -3/+3 |
|\ \ | |||||
| * | | fix active state | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | | |||||
* | | | fix full template nav | Mario Vavti | 2017-03-25 | 1 | -1/+1 |
|/ / | |||||
* | | remove obsolete todo | Mario Vavti | 2017-03-24 | 1 | -2/+0 |
| | | |||||
* | | remove redundant css | Mario Vavti | 2017-03-24 | 1 | -13/+0 |
| | | |||||
* | | fix some active and hover colors | Mario Vavti | 2017-03-24 | 1 | -2/+15 |
| | | |||||
* | | missing badge-default class | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | |||||
* | | must be 1.35rem | Mario Vavti | 2017-03-24 | 1 | -1/+1 |
| | | |||||
* | | restrict height of images in #banner to 1.5 rem | Mario Vavti | 2017-03-24 | 1 | -0/+5 |
| | | |||||
* | | do not return false here. it can lead to unresponsive links under certain ↵ | Mario Vavti | 2017-03-24 | 1 | -1/+1 |
| | | | | | | | | situations. | ||||
* | | fix viewconnections | Mario Vavti | 2017-03-23 | 1 | -12/+10 |
| | | |||||
* | | fix spinner position | Mario Vavti | 2017-03-23 | 1 | -5/+0 |
| | | |||||
* | | update fullcalendar library to version 3.2.0 | Mario Vavti | 2017-03-23 | 10 | -388/+802 |
| | | |||||
* | | bs4 fixes for events | Mario Vavti | 2017-03-23 | 5 | -27/+34 |
| | | |||||
* | | bump versions | Mario Vavti | 2017-03-23 | 2 | -3/+3 |
| | | |||||
* | | fix embed image modals | Mario Vavti | 2017-03-22 | 4 | -29/+29 |
| | | |||||
* | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-22 | 1 | -8/+49 |
|\ \ | |||||
| * \ | Merge pull request #705 from dawnbreak/dev | Klaus | 2017-03-22 | 1 | -8/+49 |
| |\ \ | | |/ | |/| | :white_check_mark: Some more tests for purify_html(). | ||||
| | * | :white_check_mark: Some more tests for purify_html(). | Klaus Weidenbach | 2017-03-22 | 1 | -8/+49 |
| |/ | | | | | | | | | Add some generic HTML, JS, CSS expectations for purify_html(). Also cover our own configuration for HTMLPurifier. | ||||
* | | css fixes | Mario Vavti | 2017-03-22 | 3 | -54/+64 |
| | | |||||
* | | add generic-icons-nav class | Mario Vavti | 2017-03-21 | 1 | -1/+1 |
| | | |||||
* | | add icon, name and thumb to profile tabs. remove login app - we have login ↵ | Mario Vavti | 2017-03-21 | 3 | -19/+29 |
| | | | | | | | | in the panel now. | ||||
* | | missing template | Mario Vavti | 2017-03-21 | 1 | -0/+4 |
| | | |||||
* | | superfluos ; | Mario Vavti | 2017-03-20 | 1 | -1/+1 |
| | | |||||
* | | really fix fullscreen and fix some issues in chat | Mario Vavti | 2017-03-20 | 3 | -12/+19 |
| | | |||||
* | | fix webpages widgets | Mario Vavti | 2017-03-20 | 4 | -80/+57 |
| | | |||||
* | | fix fullscreen and bbco_autocomplete popup rendering | Mario Vavti | 2017-03-20 | 4 | -17/+13 |
| | | |||||
* | | minor fixes | Mario Vavti | 2017-03-20 | 1 | -2/+2 |
| | | |||||
* | | move profile tabs to app-tray | Mario Vavti | 2017-03-20 | 12 | -12/+22 |
| | | |||||
* | | since we have the app bin we do not actually need the profile tabs for ourself | Mario Vavti | 2017-03-20 | 1 | -0/+3 |
| | | |||||
* | | update to latest bs4 from git and change hidden-* classes to d-* | Mario Vavti | 2017-03-20 | 23 | -341/+295 |
| | | |||||
* | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-20 | 130 | -39/+15887 |
|\| | |||||
| * | Merge pull request #703 from dawnbreak/oauth2 | zotlabs | 2017-03-20 | 128 | -6/+15850 |
| |\ | | | | | | | :arrow_up: Update bshaffer/oauth2-server-php library. | ||||
| | * | :arrow_up: Update bshaffer/oauth2-server-php library. | Klaus Weidenbach | 2017-03-20 | 128 | -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/dev | zotlabs | 2017-03-20 | 2 | -33/+37 |
| |\ \ | | |/ | |/| | :white_check_mark: Add unit test for purify_html(). | ||||
| | * | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -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 sane | Mario Vavti | 2017-03-19 | 1 | -0/+4 |
| | | |||||
* | | Revert "update to bs-git" | Mario Vavti | 2017-03-19 | 4 | -163/+231 |
| | | | | | | | | This reverts commit 7b0f3d9e26b8c666440de09c5eb33dc6360472c6. |