aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-042-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-0421-65/+335
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-0228-1505/+1764
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-285-1345/+1332
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-274-1355/+1344
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2725-1160/+1170
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2528-63/+576
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2477-14152/+14543
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-1855-11648/+14661
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-139-824/+1347
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-1211-87/+154
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-096-4040/+4178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0930-49/+246
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0629-1494/+1604
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0516-47/+278
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-047-25/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0222-1930/+2609
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-3112-1995/+2059
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-308-555/+598
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-281-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-283-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2735-517/+577
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2511-3177/+3198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-244-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-229-1297/+1329
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2217-8/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2112-83/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added auto_channel_create to config to ease registrationHaakon Meland Eriksen2016-01-191-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #310 from einervonvielen/updated_homeinstall_instructionsJeroen van Riet Paap2016-03-072-15/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of readme according to the last changeseinervonvielen2016-03-061-14/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaroot2016-03-062-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://git...root2016-03-061-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .Einer von Vielen2016-01-131-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #309 from tluther/masterJeroen van Riet Paap2016-03-075-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Minor correction cloud URL in cloud.bbTobias Luther2016-03-061-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Link to TOS to EMail templates targeting membersTobias Luther2016-03-063-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doco: corrected git URL in git for non-developerswww-data2016-03-061-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revupredmatrix2016-03-061-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Also make it clear with (mouse) hover text that you must click on the cover p...jeroenpraat2016-03-062-1/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / / Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it...jeroenpraat2016-03-061-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-042-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show cover-photo upload link only for the default profileMario Vavti2016-03-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add cover photo upload link to edit profileMario Vavti2016-03-042-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues #306 and #307redmatrix2016-03-043-494/+521
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the CHANGELOG for V1.3redmatrix2016-03-031-0/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge1.3redmatrix2016-03-035-37/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix jot formMario Vavti2016-03-031-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | slide up cover on clickMario Vavti2016-03-031-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-037-17/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move cover-photo to template, add the ability to define a title and subtitle ...Mario Vavti2016-03-034-26/+98