| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of readme according to the last changes | einervonvielen | 2016-03-06 | 1 | -14/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | root | 2016-03-06 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://git... | root | 2016-03-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | . | Einer von Vielen | 2016-01-13 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #309 from tluther/master | Jeroen van Riet Paap | 2016-03-07 | 5 | -2/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Minor correction cloud URL in cloud.bb | Tobias Luther | 2016-03-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Link to TOS to EMail templates targeting members | Tobias Luther | 2016-03-06 | 3 | -0/+13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doco: corrected git URL in git for non-developers | www-data | 2016-03-06 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revup | redmatrix | 2016-03-06 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | Also make it clear with (mouse) hover text that you must click on the cover p... | jeroenpraat | 2016-03-06 | 2 | -1/+2 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / / | Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it... | jeroenpraat | 2016-03-06 | 1 | -0/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 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 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues #306 and #307 | redmatrix | 2016-03-04 | 3 | -494/+521 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the markdown feature. Do not re-enable unless you are willing to suppo... | redmatrix | 2016-03-03 | 4 | -13/+24 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 clea... | redmatrix | 2016-03-01 | 4 | -19/+138 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 |