aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 strings (also for 2.4RC)
| | * 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.
| | * 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 translation
| | * 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.
| | * | :construction_worker::white_check_mark::bug: Import table structure in TravisCI.Klaus Weidenbach2017-05-064-6/+22
| | | | | | | | | | | | | | | | | | | | Fix a syntax error in schema_postres.sql which was discovered while working on this.
| * | | Merge pull request #761 from anaqreon/devgit-marijus2017-05-071-1/+1
| |\ \ \ | | |/ / | |/| | Mail subject bug fix
| | * | 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
| | | | | | | | | | | | collapsed state
| * | css fixMario Vavti2017-05-051-1/+1
| | |
| * | Merge pull request #751 from dawnbreak/docugit-marijus2017-05-057-87/+135
| |\ \ | | | | | | | | :bulb: Add Doxygen fix for @var member variable documentation.
| | * | :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
| | | | | | | | | | | | | | | | | | | | | | | | Add an input filter to Doxygen to parse @var class member variable documentation, so it is bit more compatible how anybody else interpretes it.
| * | | Merge pull request #753 from zotlabs/mdautogit-marijus2017-05-051-5/+12
| |\ \ \ | | | | | | | | | | markdown autolinks - hubzilla bug #752
| | * | | 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
| | | |\ \ | | | | | | | | | | | | abook_not_here flag created to indicate singleton connections which a…
| | | | * | 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 ↵zotlabs2017-05-036-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented.
| | | * | | Merge pull request #749 from anaqreon/devgit-marijus2017-05-042-1/+18
| | | |\ \ \ | | | | | | | | | | | | | | German translations for demohub
| | | | * | | 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
| | | | |\| |