Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 17 | -169/+238 |
|\ | |||||
| * | minor bs4 fixes | Mario Vavti | 2017-03-28 | 4 | -12/+12 |
| | | |||||
| * | some fixes for latest bs-dev | Mario Vavti | 2017-03-28 | 4 | -2/+12 |
| | | |||||
| * | fixes for latest bootstrap | Mario Vavti | 2017-03-28 | 4 | -24/+30 |
| | | |||||
| * | update to latest bs-dev | Mario Vavti | 2017-03-28 | 10 | -135/+184 |
| | | |||||
| * | links in wall-item-title must have white colour if the background is bg-primary | Mario Vavti | 2017-03-28 | 1 | -0/+4 |
| | | |||||
* | | add 'author_is_pmable()' function with plugin hooks to control whether or ↵ | zotlabs | 2017-03-27 | 3 | -3/+42 |
| | | | | | | | | not to display a 'send mail' link in the thread author menu. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 467 | -620/+9413 |
|\| | |||||
| * | Merge pull request #701 from dawnbreak/HTMLpurifier | Klaus | 2017-03-27 | 448 | -407/+9258 |
| |\ | | | | | | | HTMLPurifier library update | ||||
| | * | :arrow_up: Update HTML Purifier library. | Klaus Weidenbach | 2017-03-26 | 448 | -407/+9258 |
| | | | | | | | | | | | | | | | Updated HTML Purifier from 4.6.0 to 4.9.2 with better PHP7 compatibility. Used composer to manage this library. | ||||
| * | | adjust comment box | Mario Vavti | 2017-03-27 | 1 | -2/+3 |
| | | | |||||
| * | | fix app rendering | Mario Vavti | 2017-03-27 | 4 | -8/+6 |
| | | | |||||
| * | | 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 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-26 | 8 | -204/+33 |
|\| | | | |||||
| * | | | 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 |
| |/ / | |||||
* | | | use the long form legal text. | zotlabs | 2017-03-25 | 1 | -1/+2 |
| | | | |||||
* | | | update license | zotlabs | 2017-03-25 | 1 | -2/+2 |
| | | | |||||
* | | | widget file update | zotlabs | 2017-03-25 | 1 | -2/+2 |
| | | | |||||
* | | | rm widgets again | zotlabs | 2017-03-25 | 1 | -1778/+0 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 178 | -10355/+14634 |
|\| | | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | 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. |