aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
|\|
| * Merge pull request #703 from dawnbreak/oauth2zotlabs2017-03-20128-6/+15850
| |\
| | * :arrow_up: Update bshaffer/oauth2-server-php library.Klaus Weidenbach2017-03-20128-6/+15850
| * | Merge pull request #702 from dawnbreak/devzotlabs2017-03-202-33/+37
| |\ \ | | |/ | |/|
| | * :white_check_mark: Add unit test for purify_html().Klaus Weidenbach2017-03-192-33/+37
| |/
* | 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
|\|
| * fix php warning and remove loggingMario Vavti2017-03-191-4/+2
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-181-2/+1
| |\
| * | issue #699zotlabs2017-03-1849-1651/+0
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-1515-234/+758
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-152-18/+6
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-132-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-112-2/+26
| |\ \ \ \ \
| * | | | | | stringszotlabs2017-03-101-3838/+3824
| * | | | | | Monday is a proper name and should be capitalised (except in private conversa...zotlabs2017-03-081-1/+1
* | | | | | | 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
* | | | | | | more abook_editMario Vavti2017-03-181-3/+3
* | | | | | | fix abook_edit and private mailMario Vavti2017-03-184-46/+31
* | | | | | | Merge branch 'dev' into bs4Mario Vavti2017-03-181-2/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #698 from dawnbreak/devKlaus2017-03-181-2/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Missed one old Markdown()Klaus2017-03-181-2/+1
| |/ / / / /
* | | | | | bs4 fixesMario Vavti2017-03-189-290/+85
* | | | | | fix usermenu radiusMario Vavti2017-03-171-1/+1
* | | | | | css fixesMario Vavti2017-03-172-6/+10
* | | | | | fix item_list and item_search templates. make item filer use a bootdtrap moda...Mario Vavti2017-03-1719-284/+276
* | | | | | Merge branch 'dev' into bs4Mario Vavti2017-03-1615-234/+758
|\| | | | |
| * | | | | Merge pull request #569 from dawnbreak/QA_testingzotlabs2017-03-1615-234/+758
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | :construction_worker: Add Travis' GitHub deployment steps.Klaus Weidenbach2017-03-142-50/+27
| | * | | | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ...Klaus Weidenbach2017-03-148-224/+372