Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed link to connected apps by accident | Mario Vavti | 2016-03-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-26 | 3 | -575/+584 |
|\ | |||||
| * | Update DE translation strings | phellmes | 2016-03-24 | 2 | -574/+580 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-22 | 4 | -837/+846 |
| |\ | |||||
| * | | rewrite the webfinger discovery logic | redmatrix | 2016-03-22 | 1 | -1/+4 |
| | | | |||||
* | | | move link to /locs to settings menu if we have more than one location and ↵ | Mario Vavti | 2016-03-26 | 5 | -43/+79 |
| |/ |/| | | | | | some template work on locs | ||||
* | | Merge pull request #332 from wave72/master | Wave | 2016-03-22 | 2 | -836/+841 |
|\ \ | | | | | | | Updated Italian strings | ||||
| * | | Updated Italian strings | Paolo Tacconi | 2016-03-22 | 2 | -836/+841 |
| | | | |||||
* | | | Add a link to /locs to channel manager | Mario Vavti | 2016-03-22 | 2 | -1/+5 |
| |/ |/| | |||||
* | | whip mod manage into shape | Mario Vavti | 2016-03-22 | 3 | -92/+92 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 1 | -4/+9 |
|\ \ | |||||
| * | | an attempt to visualize the supremacy of dont show over show in the acl selector | Mario Vavti | 2016-03-20 | 1 | -4/+9 |
| | | | |||||
* | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 1 | -9/+0 |
|/ / | |||||
* | | Update NL + es_ES strings. | jeroenpraat | 2016-03-20 | 4 | -1151/+1163 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 1 | -14/+7 |
|\ \ | |||||
| * | | make the admin side menu extensible and provide a hook for a channel "move" ↵ | redmatrix | 2016-03-19 | 1 | -14/+7 |
| | | | | | | | | | | | | operation that federation plugins might use to re-establish connections after a channel move. | ||||
* | | | make >>indicate group members<< in acl selector work again on group > show ↵ | Mario Vavti | 2016-03-20 | 3 | -9/+15 |
|/ / | | | | | | | or group > dont show is selected | ||||
* | | missing return false for map link | Mario Vavti | 2016-03-19 | 1 | -1/+1 |
| | | |||||
* | | add use as cover photo link to photos view | Mario Vavti | 2016-03-18 | 1 | -14/+33 |
| | | |||||
* | | some work on profile listing | Mario Vavti | 2016-03-17 | 5 | -58/+53 |
| | | |||||
* | | bring more structure to profiles edit | Mario Vavti | 2016-03-17 | 6 | -173/+230 |
| | | |||||
* | | move buttons to dropdown menu and some cleanup | Mario Vavti | 2016-03-16 | 3 | -231/+240 |
| | | |||||
* | | still more janitor work on profiles | Mario Vavti | 2016-03-16 | 1 | -149/+25 |
| | | |||||
* | | even more janitor work on profiles | Mario Vavti | 2016-03-15 | 1 | -12/+5 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-15 | 4 | -766/+764 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-03-14 | 5 | -1095/+908 |
| |\ \ | |||||
| * | | | update nl + es-es strings | jeroenpraat | 2016-03-14 | 4 | -766/+764 |
| | | | | |||||
* | | | | some heavy lifting porting the old salmon code | redmatrix | 2016-03-15 | 1 | -0/+9 |
| |/ / |/| | | |||||
* | | | Merge pull request #323 from phellmes/de20160313 | redmatrix | 2016-03-14 | 2 | -859/+883 |
|\ \ \ | | | | | | | | | Update DE translation strings | ||||
| * | | | Update DE translation strings | phellmes | 2016-03-13 | 2 | -859/+883 |
| | | | | |||||
* | | | | fix spacing | Mario Vavti | 2016-03-13 | 1 | -1/+6 |
| | | | | |||||
* | | | | more janitor work on profiles | Mario Vavti | 2016-03-13 | 2 | -191/+14 |
|/ / / | |||||
* / / | some janitor work on profiles | Mario Vavti | 2016-03-12 | 2 | -45/+6 |
|/ / | |||||
* | | 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 | ||||
* | | move "generator" to HttpMeta | redmatrix | 2016-03-08 | 1 | -1/+0 |
| | | |||||
* | | 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 |
| | | |||||
* | | a bit of page cleanup for edit profiles | redmatrix | 2016-03-07 | 2 | -69/+77 |
| | | |||||
* | | Small, but important fix for Dutch | jeroenpraat | 2016-03-08 | 2 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-07 | 9 | -1059/+1120 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-07 | 13 | -8039/+8334 |
| |\ \ | |||||
| | * | | 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 | 3 | -0/+8 |
| | |\ \ | | | | | | | | | | | Redbasic: Fix the issue with derived themes and schemas | ||||
| | | * | | 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 |
| | |/ / | |/| | | |||||
* | | | | Facebook scraper "OpenGraph" support; modules will need to set the required ↵ | redmatrix | 2016-03-07 | 7 | -7/+7 |
| |/ / |/| | | | | | | | | fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild. |