aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-27467-620/+9413
|\
| * Merge pull request #701 from dawnbreak/HTMLpurifierKlaus2017-03-27448-407/+9258
| |\
| | * :arrow_up: Update HTML Purifier library.Klaus Weidenbach2017-03-26448-407/+9258
| * | adjust comment boxMario Vavti2017-03-271-2/+3
| * | fix app renderingMario Vavti2017-03-274-8/+6
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-272-117/+115
| |\ \
| | * \ Merge pull request #704 from zotlabs/doppleclonegit-marijus2017-03-271-6/+0
| | |\ \
| | | * | remove redundant and non-functional/broken check for successfully cloned chan...zotlabs2017-03-201-6/+0
| | * | | Merge pull request #707 from dawnbreak/docugit-marijus2017-03-271-111/+115
| | |\ \ \
| | | * | | Import Module documentation and @-sign replacement.Klaus Weidenbach2017-03-251-111/+115
| | | | |/ | | | |/|
| * | / | remove apps which we have access to from the leftside menu in navMario Vavti2017-03-279-24/+0
| |/ / /
| * | | unify css classesMario Vavti2017-03-273-44/+16
| * | | css fixesMario Vavti2017-03-273-31/+22
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-268-204/+33
|\| | |
| * | | fix app-icon color and use bs class for w100Mario Vavti2017-03-263-6/+3
| * | | fix nav menu caretMario Vavti2017-03-262-5/+8
| * | | fix and cleanup custom theme settingsMario Vavti2017-03-266-180/+20
| * | | minor css cleanupMario Vavti2017-03-261-19/+8
| |/ /
* | | use the long form legal text.zotlabs2017-03-251-1/+2
* | | update licensezotlabs2017-03-251-2/+2
* | | widget file updatezotlabs2017-03-251-2/+2
* | | rm widgets againzotlabs2017-03-251-1778/+0
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-25178-10355/+14634
|\| |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-252-3/+3
| |\ \
| | * | fix active stateMario Vavti2017-03-242-3/+3
| * | | fix full template navMario Vavti2017-03-251-1/+1
| |/ /
| * | remove obsolete todoMario Vavti2017-03-241-2/+0
| * | remove redundant cssMario Vavti2017-03-241-13/+0
| * | fix some active and hover colorsMario Vavti2017-03-241-2/+15
| * | missing badge-default classMario Vavti2017-03-242-3/+3
| * | must be 1.35remMario Vavti2017-03-241-1/+1
| * | restrict height of images in #banner to 1.5 remMario Vavti2017-03-241-0/+5
| * | do not return false here. it can lead to unresponsive links under certain sit...Mario Vavti2017-03-241-1/+1
| * | fix viewconnectionsMario Vavti2017-03-231-12/+10
| * | fix spinner positionMario Vavti2017-03-231-5/+0
| * | update fullcalendar library to version 3.2.0Mario Vavti2017-03-2310-388/+802
| * | bs4 fixes for eventsMario Vavti2017-03-235-27/+34
| * | bump versionsMario Vavti2017-03-232-3/+3
| * | fix embed image modalsMario Vavti2017-03-224-29/+29
| * | Merge branch 'dev' into bs4Mario Vavti2017-03-221-8/+49
| |\ \
| * | | css fixesMario Vavti2017-03-223-54/+64
| * | | add generic-icons-nav classMario Vavti2017-03-211-1/+1
| * | | add icon, name and thumb to profile tabs. remove login app - we have login in...Mario Vavti2017-03-213-19/+29
| * | | missing templateMario Vavti2017-03-211-0/+4
| * | | superfluos ;Mario Vavti2017-03-201-1/+1
| * | | really fix fullscreen and fix some issues in chatMario Vavti2017-03-203-12/+19
| * | | fix webpages widgetsMario Vavti2017-03-204-80/+57
| * | | fix fullscreen and bbco_autocomplete popup renderingMario Vavti2017-03-204-17/+13
| * | | minor fixesMario Vavti2017-03-201-2/+2
| * | | move profile tabs to app-trayMario Vavti2017-03-2012-12/+22