aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-124-16/+42
|\
| * Merge pull request #770 from zotlabs/mast496git-marijus2017-05-123-14/+40
| |\
| | * consolidate and simplify the generation of activitystreams persons, add a cou...zotlabs2017-05-113-14/+40
| * | Merge pull request #771 from zotlabs/filesyncgit-marijus2017-05-121-2/+2
| |\ \
| | * | issue #769zotlabs2017-05-111-2/+2
| | |/
* | / Empty ACL should not result in no ACL when uploading a fileMario Vavti2017-05-111-4/+5
|/ /
* | Merge pull request #767 from zotlabs/realm_acgit-marijus2017-05-111-1/+3
|\ \ | |/ |/|
| * send directory realm_token for navbar autocomplete searches - if configuredzotlabs2017-05-101-1/+3
* | missing clearfixMario Vavti2017-05-103-3/+3
* | Merge pull request #766 from phellmes/devgit-marijus2017-05-102-11071/+10554
|\ \
| * | Update DE translation stringsphellmes2017-05-092-11071/+10554
| |/
* | don't allow html in plugin comment blockszotlabs2017-05-101-0/+1
* | use correct data typezotlabs2017-05-101-1/+1
* | zot protocol doco updateszotlabs2017-05-101-2/+2
* | handle mastodon urls in markdown/bbcode conversionzotlabs2017-05-102-3/+3
|/
* make all label boldMario Vavti2017-05-091-1/+1
* Merge pull request #763 from anaqreon/devgit-marijus2017-05-091-1/+43
|\
| * Implemented switch statement logic in Comanche layout parser.root2017-05-081-1/+43
* | Merge pull request #762 from mjfriaza/devgit-marijus2017-05-092-544/+564
|\ \ | |/ |/|
| * Updated the Spanish translationManuel Jiménez Friaza2017-05-082-544/+564
* | get rid of edit activitieszotlabs2017-05-081-1/+11
* | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-081-3/+4
* | Merge pull request #756 from dawnbreak/QA_testinggit-marijus2017-05-074-6/+22
|\ \
| * | :construction_worker::white_check_mark::bug: Import table structure in TravisCI.Klaus Weidenbach2017-05-064-6/+22
* | | Merge pull request #761 from anaqreon/devgit-marijus2017-05-071-1/+1
|\ \ \ | |/ / |/| |
| * | Mail subject bug fixAndrew Manning2017-05-071-1/+1
|/ /
* | collapse sysapps if viewing a remote channelMario Vavti2017-05-053-11/+38
* | css hack to make remote channel menu header look in line with the rest if in ...Mario Vavti2017-05-051-0/+6
* | css fixMario Vavti2017-05-051-1/+1
* | Merge pull request #751 from dawnbreak/docugit-marijus2017-05-057-87/+135
|\ \
| * | :bulb: correct some Doxygen syntax mistakes.Klaus Weidenbach2017-05-055-87/+114
| * | :bulb: Add Doxygen fix for @var member variable documentation.Klaus Weidenbach2017-05-042-0/+21
* | | Merge pull request #753 from zotlabs/mdautogit-marijus2017-05-051-5/+12
|\ \ \
| * | | markdown autolinks - hubzilla bug #752zotlabs2017-05-051-5/+12
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-05-04184-2689/+910
|\| |
| * | update sabredav to version 3.2.2Mario Vavti2017-05-04171-2623/+794
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-0417-67/+117
| |\ \
| | * \ Merge pull request #750 from zotlabs/abnotheregit-marijus2017-05-047-6/+19
| | |\ \
| | | * | one file hadn't yet been saved when doing pull requestzotlabs2017-05-031-0/+1
| | | * | abook_not_here flag created to indicate singleton connections which are conne...zotlabs2017-05-036-6/+18
| | * | | Merge pull request #749 from anaqreon/devgit-marijus2017-05-042-1/+18
| | |\ \ \
| | | * | | Add contributor to creditsAndrew Manning2017-05-031-1/+2
| | | * | | German translations for demohubAndrew Manning2017-05-032-483/+520
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-05-0320-624/+1175
| | | |\| |
| | | * | | Reformatted Webpages.php to clean up whitespace, where there was a mixture of...Andrew Manning2017-04-291-504/+483
| | * | | | Merge pull request #747 from dawnbreak/simplepiegit-marijus2017-05-048-60/+80
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | :arrow_up: Update SimplePie library to 1.5.Klaus Weidenbach2017-05-048-60/+80
| | |/ / /
| * / / / bump versionMario Vavti2017-05-031-1/+1
| |/ / /
* / / / typozotlabs2017-05-041-1/+1
|/ / /
* | | add check for php zip extensionMario Vavti2017-05-031-1/+6