aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * 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
| |/ /
* | | markdown autolinks - hubzilla bug #752zotlabs2017-05-051-5/+12
* | | do away with single delivery (delivery from clones to singleton networks atta...zotlabs2017-05-042-29/+3
* | | make service_plink pluggablezotlabs2017-05-041-0/+23
* | | oauth2 dynamic client registrationzotlabs2017-05-041-9/+19
* | | typozotlabs2017-05-041-1/+1
* | | oauth2/oidc testing (please do not port - this requires several extra DB tabl...zotlabs2017-05-033-0/+132
* | | cleanup fallback directory listzotlabs2017-05-031-1/+0
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-035-32/+296
|\| |
| * | add check for php zip extensionMario Vavti2017-05-031-1/+6
| * | Update INSTALL.txtAndrew Manning2017-05-031-1/+1
| * | Merge pull request #742 from dawnbreak/QA_testinggit-marijus2017-05-033-30/+289
| |\ \
| | * | :white_check_mark::bulb: Add Unit Tests for AccessList class.Klaus Weidenbach2017-05-013-30/+289
| |/ /
* | | more cleanupzotlabs2017-05-021-0/+3
* | | finish the red conversion of the markdown utilities considering their relatio...zotlabs2017-05-021-0/+52
* | | more code refactoring to put external protocol dependencies in plugins.zotlabs2017-05-022-31/+85
* | | profile_sidebar hook ignored the updated html contentzotlabs2017-05-022-70/+2
* | | Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+0
* | | typozotlabs2017-05-011-1/+1