Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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(). | Klaus Weidenbach | 2017-03-22 | 1 | -8/+49 |
| |/ | |||||
* | | 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 in... | Mario Vavti | 2017-03-21 | 3 | -19/+29 |
* | | 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. | Klaus Weidenbach | 2017-03-20 | 128 | -6/+15850 |
| * | | Merge pull request #702 from dawnbreak/dev | zotlabs | 2017-03-20 | 2 | -33/+37 |
| |\ \ | | |/ | |/| | |||||
| | * | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -33/+37 |
| |/ | |||||
* | | 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 |
* | | 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 conversa... | zotlabs | 2017-03-08 | 1 | -1/+1 |
* | | | | | | | 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 |