Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-07 | 2 | -2/+2 |
|\ | |||||
| * | Small, but important fix for Dutch | jeroenpraat | 2016-03-08 | 2 | -2/+2 |
| | | |||||
* | | issue #313 | redmatrix | 2016-03-07 | 1 | -1/+13 |
|/ | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-07 | 10 | -1060/+1145 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-07 | 18 | -8056/+8385 |
| |\ | |||||
| | * | Spanish and Dutch strings + fix es>es-es link | jeroenpraat | 2016-03-07 | 5 | -1057/+1110 |
| | | | |||||
| | * | Merge pull request #312 from jeroenpraat/master | redmatrix | 2016-03-08 | 4 | -1/+33 |
| | |\ | | | | | | | | | Redbasic: Fix the issue with derived themes and schemas | ||||
| | | * | Update DerivedTheme1.md | Jeroen van Riet Paap | 2016-03-07 | 1 | -1/+25 |
| | | | | |||||
| | | * | Show only schema selector when Redbasic (so not a derived theme) | Jeroen van Riet Paap | 2016-03-07 | 1 | -0/+2 |
| | | | | |||||
| | | * | Set the schema to the default schema in derived themes. | Jeroen van Riet Paap | 2016-03-07 | 1 | -0/+5 |
| | | | | | | | | | | | | See the documentation for creating derived themes how to override this. | ||||
| | | * | Update config.php | Jeroen van Riet Paap | 2016-03-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | prevent page jumping if the narrow navbar setting is used | Mario Vavti | 2016-03-07 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | allow modules/addons to override the og:title field | redmatrix | 2016-03-07 | 2 | -3/+10 |
| | | | |||||
* | | | Facebook scraper "OpenGraph" support; modules will need to set the required ↵ | redmatrix | 2016-03-07 | 10 | -8/+58 |
| |/ |/| | | | | | fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild. | ||||
* | | Merge pull request #308 from HaakonME/master | Jeroen van Riet Paap | 2016-03-07 | 3 | -6981/+7204 |
|\ \ | | | | | | | | | | | | | Updated Norwegian strings for Hubzilla. @HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96 | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-07 | 1 | -1/+1 |
| |\| | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-06 | 3 | -1/+3 |
| |\ \ | |||||
| * | | | Updated Norwegian strings for Hubzilla | Haakon Meland Eriksen | 2016-03-05 | 2 | -6981/+7203 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-05 | 3 | -494/+521 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-04 | 2 | -0/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-04 | 21 | -65/+335 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-02 | 28 | -1505/+1764 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-28 | 5 | -1345/+1332 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-27 | 4 | -1355/+1344 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-27 | 25 | -1160/+1170 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-25 | 28 | -63/+576 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-24 | 77 | -14152/+14543 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-18 | 55 | -11648/+14661 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-13 | 9 | -824/+1347 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-12 | 11 | -87/+154 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-09 | 6 | -4040/+4178 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-09 | 30 | -49/+246 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-06 | 29 | -1494/+1604 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-05 | 16 | -47/+278 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-04 | 7 | -25/+139 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-02 | 22 | -1930/+2609 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-31 | 12 | -1995/+2059 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-30 | 8 | -555/+598 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-28 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-28 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-27 | 35 | -517/+577 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-25 | 11 | -3177/+3198 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-24 | 4 | -4/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-22 | 9 | -1297/+1329 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-22 | 17 | -8/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-21 | 12 | -83/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added auto_channel_create to config to ease registration | Haakon Meland Eriksen | 2016-01-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #310 from einervonvielen/updated_homeinstall_instructions | Jeroen van Riet Paap | 2016-03-07 | 2 | -15/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated readme.md for homeinstall script | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of readme according to the last changes | einervonvielen | 2016-03-06 | 1 | -14/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The homeinstall script was changed recently. To reflect these changes the readme.md was updated to. | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | root | 2016-03-06 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |