| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-07 | 5 | -7/+23 |
| |\ | |||||
| | * | Merge pull request #756 from dawnbreak/QA_testing | git-marijus | 2017-05-07 | 4 | -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 Weidenbach | 2017-05-06 | 4 | -6/+22 |
| | | | | | | | | | | | | | | | | Fix a syntax error in schema_postres.sql which was discovered while working on this. | ||||
| | * | | Merge pull request #761 from anaqreon/dev | git-marijus | 2017-05-07 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | Mail subject bug fix | ||||
| | | * | Mail subject bug fix | Andrew Manning | 2017-05-07 | 1 | -1/+1 |
| | |/ | |||||
| * | | get rid of edit activities | zotlabs | 2017-05-07 | 1 | -1/+11 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 29 | -2502/+669 |
| |\| | |||||
| | * | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 3 | -11/+38 |
| | | | |||||
| | * | css hack to make remote channel menu header look in line with the rest if in ↵ | Mario Vavti | 2017-05-05 | 1 | -0/+6 |
| | | | | | | | | | collapsed state | ||||
| | * | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #751 from dawnbreak/docu | git-marijus | 2017-05-05 | 7 | -87/+135 |
| | |\ | | | | | | | :bulb: Add Doxygen fix for @var member variable documentation. | ||||
| | | * | :bulb: correct some Doxygen syntax mistakes. | Klaus Weidenbach | 2017-05-05 | 5 | -87/+114 |
| | | | | |||||
| | | * | :bulb: Add Doxygen fix for @var member variable documentation. | Klaus Weidenbach | 2017-05-04 | 2 | -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/mdauto | git-marijus | 2017-05-05 | 1 | -5/+12 |
| | |\ \ | | | | | | | | | markdown autolinks - hubzilla bug #752 | ||||
| | | * | | markdown autolinks - hubzilla bug #752 | zotlabs | 2017-05-05 | 1 | -5/+12 |
| | |/ / | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-05-04 | 184 | -2689/+910 |
| | |\| | |||||
| | | * | update sabredav to version 3.2.2 | Mario Vavti | 2017-05-04 | 171 | -2623/+794 |
| | | | | |||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-04 | 17 | -67/+117 |
| | | |\ | |||||
| | | | * | Merge pull request #750 from zotlabs/abnothere | git-marijus | 2017-05-04 | 7 | -6/+19 |
| | | | |\ | | | | | | | | | | | abook_not_here flag created to indicate singleton connections which a… | ||||
| | | | | * | one file hadn't yet been saved when doing pull request | zotlabs | 2017-05-03 | 1 | -0/+1 |
| | | | | | | |||||
| | | | | * | abook_not_here flag created to indicate singleton connections which are ↵ | zotlabs | 2017-05-03 | 6 | -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/dev | git-marijus | 2017-05-04 | 2 | -1/+18 |
| | | | |\ \ | | | | | | | | | | | | | German translations for demohub | ||||
| | | | | * | | Add contributor to credits | Andrew Manning | 2017-05-03 | 1 | -1/+2 |
| | | | | | | | |||||
| | | | | * | | German translations for demohub | Andrew Manning | 2017-05-03 | 2 | -483/+520 |
| | | | | | | | |||||
| | | | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-05-03 | 20 | -624/+1175 |
| | | | | |\| | |||||
| | | | | * | | Reformatted Webpages.php to clean up whitespace, where there was a mixture ↵ | Andrew Manning | 2017-04-29 | 1 | -504/+483 |
| | | | | | | | | | | | | | | | | | | | | | | | | | of spaces and tabs for indentation. No other changes made. | ||||
| | | | * | | | Merge pull request #747 from dawnbreak/simplepie | git-marijus | 2017-05-04 | 8 | -60/+80 |
| | | | |\ \ \ | | | | |_|/ | | | |/| | | :arrow_up: Update SimplePie library to 1.5. | ||||
| | | | | * | | :arrow_up: Update SimplePie library to 1.5. | Klaus Weidenbach | 2017-05-04 | 8 | -60/+80 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | There is a new stable release, so upgrade from the dev branch to the new 1.5 release. | ||||
| | | * / / | bump version | Mario Vavti | 2017-05-03 | 1 | -1/+1 |
| | | |/ / | |||||
| | * / / | typo | zotlabs | 2017-05-04 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | markdown autolinks - hubzilla bug #752 | zotlabs | 2017-05-05 | 1 | -5/+12 |
| | | | | |||||
| * | | | do away with single delivery (delivery from clones to singleton networks ↵ | zotlabs | 2017-05-04 | 2 | -29/+3 |
| | | | | | | | | | | | | | attached to other clones) | ||||
| * | | | make service_plink pluggable | zotlabs | 2017-05-04 | 1 | -0/+23 |
| | | | | |||||
| * | | | oauth2 dynamic client registration | zotlabs | 2017-05-04 | 1 | -9/+19 |
| | | | | |||||
| * | | | typo | zotlabs | 2017-05-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | oauth2/oidc testing (please do not port - this requires several extra DB ↵ | zotlabs | 2017-05-03 | 3 | -0/+132 |
| | | | | | | | | | | | | | tables to work) | ||||
| * | | | cleanup fallback directory list | zotlabs | 2017-05-03 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-03 | 5 | -32/+296 |
| |\| | | |||||
| | * | | add check for php zip extension | Mario Vavti | 2017-05-03 | 1 | -1/+6 |
| | | | | |||||
| | * | | Update INSTALL.txt | Andrew Manning | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | | | | The webpage element portation tools need the zip extension, such as the `php7.0-zip` package on Debian. | ||||
| | * | | Merge pull request #742 from dawnbreak/QA_testing | git-marijus | 2017-05-03 | 3 | -30/+289 |
| | |\ \ | | | | | | | | | :white_check_mark::bulb: Add Unit Tests for AccessList class. | ||||
| | | * | | :white_check_mark::bulb: Add Unit Tests for AccessList class. | Klaus Weidenbach | 2017-05-01 | 3 | -30/+289 |
| | |/ / | | | | | | | | | | Also some Doxygen docu for this class. | ||||
| * | | | more cleanup | zotlabs | 2017-05-02 | 1 | -0/+3 |
| | | | | |||||
| * | | | finish the red conversion of the markdown utilities considering their ↵ | zotlabs | 2017-05-02 | 1 | -0/+52 |
| | | | | | | | | | | | | | relation to protocol plugins. | ||||
| * | | | more code refactoring to put external protocol dependencies in plugins. | zotlabs | 2017-05-02 | 2 | -31/+85 |
| | | | | |||||
| * | | | profile_sidebar hook ignored the updated html content | zotlabs | 2017-05-02 | 2 | -70/+2 |
| | | | | |||||
| * | | | Revert "move theme specific files to theme dir" | zotlabs | 2017-05-02 | 277 | -0/+0 |
| | | | | | | | | | | | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c. | ||||
| * | | | typo | zotlabs | 2017-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -0/+0 |
| | | | | |||||
| * | | | add cdav files | zotlabs | 2017-05-01 | 4 | -0/+998 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |