aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* this looks like a slightly cleaner solution to the unicode dl issuezotlabs2017-05-141-1/+1
* hubzilla issue #777zotlabs2017-05-141-1/+1
* Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ...zotlabs2017-05-141-5/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-111-1/+3
|\
| * 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
* | | consolidate email validation checkszotlabs2017-05-115-28/+3
* | | issue #769zotlabs2017-05-111-2/+2
* | | disable oauth2 until I can get back to it - it's throwing typoszotlabs2017-05-102-2/+4
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-105-11074/+10557
|\| |
| * | 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
| |/
* | don't allow html in plugin comment blockszotlabs2017-05-091-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-094-546/+608
|\|
| * 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
* | | use correct data typezotlabs2017-05-091-1/+1
* | | zot protocol doco updateszotlabs2017-05-091-2/+2
* | | handle mastodon urls in markdown/bbcode conversionzotlabs2017-05-082-3/+3
* | | errorzotlabs2017-05-083-115/+2
* | | cleanup of last checkinzotlabs2017-05-071-2/+4
* | | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-071-3/+4
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-075-7/+23
|\| |
| * | 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
| |/ /
* | | get rid of edit activitieszotlabs2017-05-071-1/+11
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-0529-2502/+669
|\| |
| * | 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
| | |\ \