aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-0718-8056/+8385
|\
| * Spanish and Dutch strings + fix es>es-es linkjeroenpraat2016-03-075-1057/+1110
| |
| * Merge pull request #312 from jeroenpraat/masterredmatrix2016-03-084-1/+33
| |\ | | | | | | Redbasic: Fix the issue with derived themes and schemas
| | * Update DerivedTheme1.mdJeroen van Riet Paap2016-03-071-1/+25
| | |
| | * Show only schema selector when Redbasic (so not a derived theme)Jeroen van Riet Paap2016-03-071-0/+2
| | |
| | * Set the schema to the default schema in derived themes.Jeroen van Riet Paap2016-03-071-0/+5
| | | | | | | | | See the documentation for creating derived themes how to override this.
| | * Update config.phpJeroen van Riet Paap2016-03-071-0/+1
| | |
| * | Merge pull request #308 from HaakonME/masterJeroen van Riet Paap2016-03-073-6981/+7204
| |\ \ | | | | | | | | | | | | | | | | 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 Eriksen2016-03-071-1/+1
| | |\|
| | * | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-063-1/+3
| | |\ \
| | * | | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2016-03-052-6981/+7203
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-053-494/+521
| | |\ \ \
| | * \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated readme.md for homeinstall script
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of readme according to the last changeseinervonvielen2016-03-061-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The homeinstall script was changed recently. To reflect these changes the readme.md was updated to.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaroot2016-03-062-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of ↵root2016-03-061-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/einervonvielen/hubzilla
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .Einer von Vielen2016-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #309 from tluther/masterJeroen van Riet Paap2016-03-075-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doco / EMail templates
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent page jumping if the narrow navbar setting is usedMario Vavti2016-03-071-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /