aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'dev' into bs4Mario Vavti2017-03-111-1/+1
|\|
| * Merge pull request #693 from anaqreon/devgit-marijus2017-03-111-1/+1
| |\
| | * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
| |/
* | font size and post title adjustMario Vavti2017-03-116-135/+65
* | fixing classesMario Vavti2017-03-1024-93/+73
* | some sed magic on button class namesMario Vavti2017-03-1075-256/+256
* | upgrade bs to latest git and some more progressMario Vavti2017-03-0912-406/+254
* | remove navbar-toggler-left classMario Vavti2017-03-092-2/+1
* | initial commit for the bootstrap version 4 branch - upgrade lib and make nav....Mario Vavti2017-03-0922-7872/+10668
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
|\
| * allow post_activity_item to be passed an empty ACL without resetting to chann...zotlabs2017-03-061-1/+2
| * add public_policy to the nwiki container also. This should not affect the rec...zotlabs2017-03-061-0/+2
| * correct fix for wiki anonymous read issue (items_permissions_sql checks item....zotlabs2017-03-062-9/+6
* | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
|/
* allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
* do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
* remove include/probe.php which has never completed development and has never ...zotlabs2017-03-054-106/+1
* move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2