Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-09 | 3 | -5/+50 |
|\ | |||||
| * | Merge pull request #318 from git-marijus/master | redmatrix | 2016-03-10 | 1 | -1/+1 |
| |\ | | | | | | | should have probably done that on tag release | ||||
| | * | should have probably done that on tag release | Mario Vavti | 2016-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #317 from git-marijus/master | redmatrix | 2016-03-09 | 2 | -4/+49 |
| |\| | | | | | | | Issue #316 make /display updates work. Basically copy and paste what … | ||||
| | * | Issue #316 make /display updates work. Basically copy and paste what we do ↵ | Mario Vavti | 2016-03-09 | 2 | -4/+49 |
| |/ | | | | | | | on load and add $simple_update to the query. | ||||
* | | issue #319 - make sure we have a local_channel() and an App::channel before ↵ | redmatrix | 2016-03-09 | 1 | -1/+1 |
| | | | | | | | | trying to change the default schema for a channel | ||||
* | | work on implementing account/channel move (as opposed to clone) | redmatrix | 2016-03-09 | 6 | -25/+30 |
|/ | |||||
* | isue #315 | redmatrix | 2016-03-08 | 1 | -0/+3 |
| | |||||
* | move "generator" to HttpMeta | redmatrix | 2016-03-08 | 2 | -2/+2 |
| | |||||
* | turn 'OpenGraph' into a more general purpose HTTP meta facility for setting ↵ | redmatrix | 2016-03-08 | 3 | -55/+71 |
| | | | | any meta header | ||||
* | revup | redmatrix | 2016-03-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #314 from wave72/master | Wave | 2016-03-08 | 2 | -1810/+1819 |
|\ | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2016-03-08 | 2 | -1810/+1819 |
| | | |||||
* | | removed id by mistake - add it again | Mario Vavti | 2016-03-08 | 1 | -1/+1 |
| | | |||||
* | | add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl | Mario Vavti | 2016-03-08 | 2 | -2/+4 |
| | | |||||
* | | add syslog loglevels to dba functions | redmatrix | 2016-03-07 | 2 | -8/+8 |
| | | |||||
* | | a bit of page cleanup for edit profiles | redmatrix | 2016-03-07 | 5 | -97/+105 |
| | | |||||
* | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |