| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-25 | 28 | -63/+576 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 1 | -6/+6 |
| | |\ | |||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-25 | 9 | -9/+46 |
| | | |\ | |||||
| | | * | | another dutch update | jeroenpraat | 2016-02-25 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | issue #216 - calendar sharing | redmatrix | 2016-02-24 | 8 | -10/+425 |
| | | |/ | |/| | |||||
| | * | | schema change to support channel move (a completely different operation than ↵ | redmatrix | 2016-02-24 | 5 | -4/+23 |
| | | | | | | | | | | | | | channel clone) | ||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 4 | -9/+6 |
| | |\| | |||||
| | | * | interim dutch string update | jeroenpraat | 2016-02-25 | 1 | -3/+3 |
| | | | | |||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-25 | 1 | -5/+1 |
| | | |\ | |||||
| | | | * | fix boxy scheme | Mario Vavti | 2016-02-25 | 1 | -5/+1 |
| | | | | | |||||
| | | * | | fix TOS | jeroenpraat | 2016-02-25 | 1 | -0/+1 |
| | | |/ | |||||
| | | * | give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to ↵ | Mario Vavti | 2016-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | much of the text in some situations | ||||
| | * | | add 'requires' field to plugin info to list other dependent plugins/addons ↵ | redmatrix | 2016-02-24 | 4 | -5/+23 |
| | |/ | | | | | | | and disable if dependencies are not installed/enabled | ||||
| | * | missing function | redmatrix | 2016-02-24 | 6 | -24/+26 |
| | | | |||||
| | * | function to process atom stream without actually storing anything | redmatrix | 2016-02-23 | 2 | -6/+68 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-24 | 77 | -14152/+14543 |
| |\| | |||||
| | * | Merge pull request #297 from bashrc/bashrc/comma | git-marijus | 2016-02-23 | 1 | -1/+1 |
| | |\ | | | | | | | Remove stray comma | ||||
| | | * | Remove stray comma | Bob Mottram | 2016-02-23 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #296 from wave72/master | Wave | 2016-02-23 | 2 | -1564/+1641 |
| | |\ | | | | | | | Updated Italian strings | ||||
| | | * | Updated Italian strings | Paolo Tacconi | 2016-02-23 | 2 | -1564/+1641 |
| | | | | |||||
| | * | | change wording in case where registration is by apprval only | Mario Vavti | 2016-02-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | add salmon key param | redmatrix | 2016-02-22 | 2 | -1/+6 |
| | | | | |||||
| | * | | pubsites: network column is not needed anymore (mentioned in intro text). ↵ | jeroenpraat | 2016-02-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | Because of more vertical space Access and Register columnis separate again. | ||||
| | * | | only hubs from local configured project on pubsites (hubzilla by default). ↵ | jeroenpraat | 2016-02-22 | 1 | -5/+2 |
| | | | | | | | | | | | | | as agreed with Mike. | ||||
| | * | | change wording | Mario Vavti | 2016-02-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | some work on mod/register | Mario Vavti | 2016-02-22 | 8 | -226/+115 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-21 | 5 | -7193/+7480 |
| | |\ \ | |||||
| | | * | | I don't think we need redmatrix hubs (or hubs without no project name) in ↵ | jeroenpraat | 2016-02-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | this list. The other way around (hubzilla in redmatrix pubsites) is no problem I think. If not agreed, please revert. | ||||
| | | * | | Merge pull request #290 from anaqreon/homeinstall | redmatrix | 2016-02-22 | 2 | -8/+26 |
| | | |\ \ | | | | | | | | | | | Added sendmail installation to .homeinstall script so that hub can se… | ||||
| | | | * | | Renamed homeinstall config file and added check for required config ↵ | Andrew Manning | 2016-02-20 | 2 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | | parameters. Spelling corrections. | ||||
| | | | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into homeinstall | Andrew Manning | 2016-02-20 | 5 | -1337/+1411 |
| | | | |\ \ | |||||
| | | | * | | | Added sendmail installation to .homeinstall script so that hub can send ↵ | Andrew Manning | 2016-02-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | email notifications | ||||
| | | * | | | | Merge pull request #291 from phellmes/de201602201300 | redmatrix | 2016-02-22 | 2 | -7184/+7448 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Update DE strings | ||||
| | | | * | | | | Update DE strings | phellmes | 2016-02-20 | 2 | -7184/+7448 |
| | | | | | | | | |||||
| | * | | | | | | remove bookmark identifier from embedded links since they aren't ↵ | redmatrix | 2016-02-21 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | bookmarkable without an associated taxonomy entry. | ||||
| | * | | | | | retry the move of AccessList to composer format (one or more third-party ↵ | redmatrix | 2016-02-21 | 16 | -80/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | plugins will likely break as a result) | ||||
| | * | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-21 | 11 | -3169/+3348 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | There was nothing wrong with my pimped pubsites (was another problem). Took ↵ | jeroenpraat | 2016-02-21 | 8 | -3152/+3342 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the opportunity to update schemas. Plus updated spanish and dutch strings. | ||||
| | | * | | | | | Revert pubsites.php. There seems something wrong. Let me troubleshoot that ↵ | jeroenpraat | 2016-02-21 | 1 | -12/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first. | ||||
| | | * | | | | | Pimped the pubsites page. I tried to get this into a .tpl-file, but it was ↵ | jeroenpraat | 2016-02-21 | 2 | -10/+14 |
| | | | |_|/ / | | |/| | | | | | | | | | | | | | | | to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page. | ||||
| | | * | | | | grid->network, whitespace and bootstrapify create button | Mario Vavti | 2016-02-20 | 2 | -12/+4 |
| | | |/ / / | |||||
| | * / / / | fix double encoding | redmatrix | 2016-02-21 | 2 | -4/+5 |
| | |/ / / | |||||
| | * | | | Revert "move accesslist class to namespace" | redmatrix | 2016-02-20 | 15 | -22/+22 |
| | | | | | | | | | | | | | | | | | This reverts commit a9711895cf254a0ca34b1e3f7c8e75bb832e6973. | ||||
| | * | | | move accesslist class to namespace | redmatrix | 2016-02-20 | 15 | -22/+22 |
| | | | | | |||||
| | * | | | ensure auto_channel_create() is executed for all workflows when UNO is set. | redmatrix | 2016-02-19 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | string update | redmatrix | 2016-02-19 | 1 | -1315/+1364 |
| | | | | | |||||
| | * | | | issue #288 allow relative_date() to be translated into languages with more ↵ | redmatrix | 2016-02-19 | 1 | -8/+41 |
| | |/ / | | | | | | | | | | than two plural forms, such as pl. | ||||
| | * | | add router class | redmatrix | 2016-02-19 | 3 | -188/+205 |
| | | | | |||||
| | * | | move dreport to zotlabs\zot namespace | redmatrix | 2016-02-19 | 2 | -8/+5 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-19 | 8 | -239/+68 |
| | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |