aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | since we have the app bin we do not actually need the profile tabs for ourselfMario Vavti2017-03-201-0/+3
| * | update to latest bs4 from git and change hidden-* classes to d-*Mario Vavti2017-03-2023-341/+295
| * | Merge branch 'dev' into bs4Mario Vavti2017-03-20130-39/+15887
| |\ \
| * | | change the btn-outline-secondary:hover color to soething saneMario Vavti2017-03-191-0/+4
| * | | Revert "update to bs-git"Mario Vavti2017-03-194-163/+231
| * | | update to bs-gitMario Vavti2017-03-194-231/+163
| * | | do not show the scrollbar before the animation has finishedMario Vavti2017-03-191-1/+1
| * | | fix some wrapping issuesMario Vavti2017-03-193-6/+15
| * | | reflect count in modalMario Vavti2017-03-192-2/+2
| * | | open like-modal directly if more than 10 likesMario Vavti2017-03-193-22/+12
| * | | typoMario Vavti2017-03-191-1/+1
| * | | css fixesMario Vavti2017-03-193-4/+6
| * | | a % example for font sizeMario Vavti2017-03-191-1/+1
| * | | fix jgrowl position and remove some redundant cssMario Vavti2017-03-191-8/+1
| * | | fix narrow navbar setting and contextual-help positionMario Vavti2017-03-192-49/+15
| * | | Merge branch 'dev' into bs4Mario Vavti2017-03-1952-5493/+3826
| |\ \ \
| * | | | remove redundant cssMario Vavti2017-03-191-20/+0
| * | | | css fixesMario Vavti2017-03-191-1/+12
| * | | | fix custom fontsize for appMario Vavti2017-03-194-19/+11
| * | | | bs4 fixesMario Vavti2017-03-197-144/+93
| * | | | bs4 fixesMario Vavti2017-03-188-13/+23
| * | | | more abook_edit and some cssMario Vavti2017-03-183-6/+12