Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | Merge pull request #308 from HaakonME/master | Jeroen van Riet Paap | 2016-03-07 | 2 | -6981/+7203 |
|\ \ \ | | | | | | | | | | | | | | | | | 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-06 | 2 | -1/+2 |
| |\| | | |||||
| * | | | Updated Norwegian strings for Hubzilla | Haakon Meland Eriksen | 2016-03-05 | 2 | -6981/+7203 |
| | | | | |||||
* | | | | Merge pull request #310 from einervonvielen/updated_homeinstall_instructions | Jeroen van Riet Paap | 2016-03-07 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Updated readme.md for homeinstall script | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | root | 2016-03-06 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of ↵ | root | 2016-03-06 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/einervonvielen/hubzilla | ||||
| | * | | | | . | Einer von Vielen | 2016-01-13 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Added Link to TOS to EMail templates targeting members | Tobias Luther | 2016-03-06 | 3 | -0/+13 |
| |_|/ / / |/| | | | | |||||
* | | | | | Also make it clear with (mouse) hover text that you must click on the cover ↵ | jeroenpraat | 2016-03-06 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | photo to show the channel/more | ||||
* | / / | Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else ↵ | jeroenpraat | 2016-03-06 | 1 | -0/+1 |
| |/ / |/| | | | | | | | | it's not clear that you can click on it to show something (the channel in this case). | ||||
* | | | show cover-photo upload link only for the default profile | Mario Vavti | 2016-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | add cover photo upload link to edit profile | Mario Vavti | 2016-03-04 | 1 | -0/+1 |
| | | | |||||
* | | | fix jot form | Mario Vavti | 2016-03-03 | 1 | -11/+11 |
| | | | |||||
* | | | slide up cover on click | Mario Vavti | 2016-03-03 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-03 | 2 | -10/+17 |
|\ \ \ | |||||
| * | | | UI cleanup for admin profile field management page | redmatrix | 2016-03-02 | 1 | -9/+16 |
| | | | | |||||
| * | | | little nl string fix | Jeroen van Riet Paap | 2016-03-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | move cover-photo to template, add the ability to define a title and subtitle ↵ | Mario Vavti | 2016-03-03 | 3 | -24/+76 |
|/ / / | | | | | | | | | | (defaults to channel name and addres), move js from redbasic.js to template. | ||||
* | | | small fix to simple cover-photo | Mario Vavti | 2016-03-02 | 2 | -6/+4 |
| | | | |||||
* | | | add a fade in effect to main while scrolling up cover photo | Mario Vavti | 2016-03-02 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-02 | 3 | -10/+97 |
|\ \ \ |