| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-05 | 3 | -494/+521 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-04 | 2 | -0/+2 |
| | |\ | |||||
| | * | | issues #306 and #307 | redmatrix | 2016-03-04 | 3 | -494/+521 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-04 | 2 | -0/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | 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 | 2 | -0/+2 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-04 | 21 | -65/+335 |
| |\| | |||||
| | * | Update the CHANGELOG for V1.3 | redmatrix | 2016-03-03 | 1 | -0/+43 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge1.3 | redmatrix | 2016-03-03 | 5 | -37/+113 |
| | |\ | |||||
| | | * | 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 | 7 | -17/+22 |
| | | |\ | |||||
| | | * | | move cover-photo to template, add the ability to define a title and subtitle ↵ | Mario Vavti | 2016-03-03 | 4 | -26/+98 |
| | | | | | | | | | | | | | | | | | (defaults to channel name and addres), move js from redbasic.js to template. | ||||
| | * | | | remove the markdown feature. Do not re-enable unless you are willing to ↵ | redmatrix | 2016-03-03 | 4 | -13/+24 |
| | | |/ | |/| | | | | | | | support it. | ||||
| | * | | rename the menu entry and page to 'Profile Fields' to maintain consistency | redmatrix | 2016-03-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | UI cleanup for admin profile field management page | redmatrix | 2016-03-02 | 2 | -11/+18 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-02 | 7 | -19/+35 |
| | |\ \ | |||||
| | | * | | little nl string fix | Jeroen van Riet Paap | 2016-03-02 | 1 | -1/+1 |
| | | |/ | |||||
| | | * | 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 | 7 | -29/+222 |
| | | |\ | |||||
| | | * | | a simple cover-photo implementation for redbasic default template | Mario Vavti | 2016-03-02 | 6 | -18/+31 |
| | | | | | |||||
| | * | | | issue #305 | redmatrix | 2016-03-02 | 3 | -3/+1 |
| | | |/ | |/| | |||||
| | * | | sort out the with and howlong dependencies | redmatrix | 2016-03-01 | 2 | -3/+3 |
| | | | | |||||
| | * | | profile field admin page (functional only: still needs a lot of HTML/CSS ↵ | redmatrix | 2016-03-01 | 4 | -19/+138 |
| | | | | | | | | | | | | | cleanup) | ||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-02 | 28 | -1505/+1764 |
| |\| | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-01 | 12 | -52/+57 |
| | |\ \ | |||||
| | | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-03-01 | 21 | -62/+244 |
| | | |\| | |||||
| | | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | Merge pull request #304 from phormanns/master | redmatrix | 2016-03-02 | 1 | -1/+1 |
| | | | | |\ | | | | | | | | | | | | | fix typo in postgres schema | ||||
| | | | | | * | fix typo in postgres schema | Peter Hormanns | 2016-03-01 | 1 | -1/+1 |
| | | | | |/ | |||||
| | | | * / | fix js error and add id to field input block | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| | | | |/ | |||||
| | | | * | fix padding | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | do not show empty buttons if not logged in | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| | | | | | |||||
| | | | * | another resize issue | Mario Vavti | 2016-03-01 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | fix resize issue | Mario Vavti | 2016-03-01 | 1 | -1/+6 |
| | | | | | |||||
| | | | * | move preview content outside of editor space | Mario Vavti | 2016-03-01 | 1 | -1/+2 |
| | | | | | |||||
| | | | * | adjust padding | Mario Vavti | 2016-03-01 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | set line-height to initial | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | another css fix | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | css fixes to make jot look better with background colors or images | Mario Vavti | 2016-03-01 | 5 | -44/+42 |
| | | | | | |||||
| | | * | | Small fix for deleted forum channels showing in the forum widget (had this ↵ | jeroenpraat | 2016-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | after migration from RM on 1 or 2 channels) | ||||
| | * | | | Allow configuration of the display order of profile fields. This is an ↵ | redmatrix | 2016-03-01 | 2 | -9/+83 |
| | | | | | | | | | | | | | | | | | important piece of a more general profile configuration framework which will eventually be accessible via the admin page. | ||||
| | * | | | revup | redmatrix | 2016-03-01 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-29 | 9 | -92/+9774 |
| | |\| | |||||
| | | * | provide footer bbcode | Mario Vavti | 2016-02-29 | 3 | -5/+14 |
| | | | | |||||
| | | * | remove unused variable | Mario Vavti | 2016-02-29 | 1 | -4/+0 |
| | | | | |||||
| | | * | simplify profile edit button(s) and make it useful for multiple profiles | Mario Vavti | 2016-02-29 | 3 | -53/+72 |
| | | | | |||||
| | | * | update es-es. tested it and it works now. Don't know what happened earlier. | jeroenpraat | 2016-02-29 | 2 | -1342/+1326 |
| | | | | |||||
| | | * | fix deletion of files from filesystem | Mario Vavti | 2016-02-29 | 1 | -1/+1 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |