| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-12 | 4 | -16/+42 |
| |\ | |||||
| | * | Merge pull request #770 from zotlabs/mast496 | git-marijus | 2017-05-12 | 3 | -14/+40 |
| | |\ | | | | | | | consolidate and simplify the generation of activitystreams persons, a… | ||||
| | | * | consolidate and simplify the generation of activitystreams persons, add a ↵ | zotlabs | 2017-05-11 | 3 | -14/+40 |
| | | | | | | | | | | | | | couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also. | ||||
| | * | | Merge pull request #771 from zotlabs/filesync | git-marijus | 2017-05-12 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | issue #769 | ||||
| | | * | | issue #769 | zotlabs | 2017-05-11 | 1 | -2/+2 |
| | | |/ | |||||
| * | / | Empty ACL should not result in no ACL when uploading a file | Mario Vavti | 2017-05-11 | 1 | -4/+5 |
| |/ / | |||||
| * | | Merge pull request #767 from zotlabs/realm_ac | git-marijus | 2017-05-11 | 1 | -1/+3 |
| |\ \ | |/ |/| | send directory realm_token for navbar autocomplete searches - if conf… | ||||
| | * | send directory realm_token for navbar autocomplete searches - if configured | zotlabs | 2017-05-10 | 1 | -1/+3 |
| | | | |||||
| * | | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
| | | | |||||
| * | | Merge pull request #766 from phellmes/dev | git-marijus | 2017-05-10 | 2 | -11071/+10554 |
| |\ \ | | | | | | | Update DE translation strings (also for 2.4RC) | ||||
| | * | | Update DE translation strings | phellmes | 2017-05-09 | 2 | -11071/+10554 |
| | |/ | |||||
| * | | don't allow html in plugin comment blocks | zotlabs | 2017-05-10 | 1 | -0/+1 |
| | | | |||||
| * | | use correct data type | zotlabs | 2017-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | zot protocol doco updates | zotlabs | 2017-05-10 | 1 | -2/+2 |
| | | | |||||
| * | | handle mastodon urls in markdown/bbcode conversion | zotlabs | 2017-05-10 | 2 | -3/+3 |
| |/ | |||||
| * | make all label bold | Mario Vavti | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #763 from anaqreon/dev | git-marijus | 2017-05-09 | 1 | -1/+43 |
| |\ | | | | | Implemented switch statement logic in Comanche layout parser. | ||||
| | * | Implemented switch statement logic in Comanche layout parser. | root | 2017-05-08 | 1 | -1/+43 |
| | | | |||||
| * | | Merge pull request #762 from mjfriaza/dev | git-marijus | 2017-05-09 | 2 | -544/+564 |
| |\ \ | |/ |/| | Updated the Spanish translation | ||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-05-08 | 2 | -544/+564 |
| | | | |||||
| * | | get rid of edit activities | zotlabs | 2017-05-08 | 1 | -1/+11 |
| | | | |||||
| * | | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-08 | 1 | -3/+4 |
| | | | |||||
| * | | 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 |
| |/ / | |||||
| * | | 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 |
| |/ / / | |||||
| * | | | add check for php zip extension | Mario Vavti | 2017-05-03 | 1 | -1/+6 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |