aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| | * | | | :construction_worker: Add old MySQL 5.5 to Travis CI again.Klaus Weidenbach2017-03-143-4/+13
| | * | | | :construction_worker: use PHP7.1 and add PostgreSQL9.6Klaus Weidenbach2017-03-143-28/+39
| | * | | | :green_heart: Update Travis CI's Doxygen.Klaus Weidenbach2017-03-143-14/+42
| | * | | | [FEATURE] :construction_worker: Extend Travis CI integration.Klaus Weidenbach2017-03-1410-27/+378
| | | |_|/ | | |/| |
* | | | | re-add spaces between tagsMario Vavti2017-03-152-4/+7
* | | | | js fixesMario Vavti2017-03-152-15/+4
* | | | | style hashtags, mentions and categories. hide expand-aside button if not need...Mario Vavti2017-03-1510-43/+35
* | | | | Merge branch 'dev' into bs4Mario Vavti2017-03-152-18/+6
|\| | | |
| * | | | better handling of mimetype securityMario Vavti2017-03-152-18/+6
| |/ / /
* | | | various fixesMario Vavti2017-03-153-4/+8
* | | | css fixesMario Vavti2017-03-143-15/+8
* | | | hide nav search behind a button, css fixes and cleanupMario Vavti2017-03-1411-115/+47
* | | | css fixesMario Vavti2017-03-144-21/+13
* | | | many class fixes and revive shiny class for item titles in a new wayMario Vavti2017-03-1317-117/+85
* | | | merge dev into bs4Mario Vavti2017-03-133-3/+27
|\| | |
| * | | Merge pull request #697 from anaqreon/devgit-marijus2017-03-131-1/+1
| |\ \ \
| | * | | Add id to app-menu for JS accessAndrew Manning2017-03-121-1/+1
| | | |/ | | |/|
| * / | we need to have this even if we are not the owner. otherwise we loose the acl...Mario Vavti2017-03-131-1/+1
| |/ /
| * | Login-box css-fix for Bluegrid schemejeroenpraat2017-03-111-1/+25
* | | fix help menuMario Vavti2017-03-122-37/+37
* | | many dropdown and class fixes. still a long way to go...Mario Vavti2017-03-1219-150/+148