aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-051-0/+12
|\
| * Merge pull request #249 from chris1315/patch-5ken restivo2016-01-041-0/+12
| |\
| | * main.bbchris13152016-01-041-0/+12
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-045-175/+204
|\|
| * Merge pull request #248 from wave72/masterWave2016-01-042-111/+111
| |\
| | * Updated Italian stringsPaolo Tacconi2016-01-042-111/+111
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-046-16/+57
| |\ \
| * | | version script was all screwed upredmatrix2016-01-041-1/+1
| * | | Provide a mechanism for a hub admin to lock features in the on or off state. ...redmatrix2016-01-042-63/+92
* | | | Fixed deployHaakon Meland Eriksen2016-01-041-4/+0
* | | | Removed deploy to get from upstreamHaakon Meland Eriksen2016-01-036-16/+56
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #246 from HaakonME/HaakonME-Hubzilla-on-OpenShift-Hubzilla...redmatrix2016-01-041-0/+5
| |\ \ \
| | * | | Hubzilla Chess - single file commit to upstreamHaakon Meland Eriksen2016-01-031-1/+1
| * | | | Merge pull request #247 from chris1315/patch-3redmatrix2016-01-041-0/+25
| |\ \ \ \
| | * | | | Create about.bbchris13152016-01-031-0/+25
| | | |/ / | | |/| |
| * | | | forgot to add this to the docujeroenpraat2016-01-031-2/+2
| * | | | added some real examples for the default-permission-role in de docu. also upd...jeroenpraat2016-01-033-14/+25
| |/ / /
* | / / Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-1/+1
| |/ / |/| |
* | | Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-0/+5
|/ /
* | Provide the ability for a hub admin to specify a default permissions role for...redmatrix2016-01-023-4/+23
* | Update es+nl strings and added title on hover for items (needed to view title...jeroenpraat2016-01-027-212/+224
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-012-1/+74
|\ \
| * \ Merge pull request #245 from chris1315/patch-2redmatrix2016-01-021-0/+73
| |\ \
| | * | Create git_for_non_developers.bbchris13152016-01-011-0/+73
| * | | Merge pull request #244 from anaqreon/anaqreon-titel-typoredmatrix2016-01-021-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Misspelled TitelAndrew Manning2016-01-011-1/+1
| |/ /
* / / issue #241 (redmatrix issue 405)redmatrix2016-01-016-100/+112
|/ /
* | more issue #239redmatrix2015-12-311-1/+1
* | issue #239, provide 'Public' text on ACL selector when appropriate to do so.redmatrix2015-12-313-14/+16
* | yearly license updateredmatrix2015-12-312-1/+2
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-314-58/+47
|\ \
| * | nl+es-es string updatejeroenpraat2015-12-294-58/+47
* | | comment clarificationredmatrix2015-12-311-1/+1
* | | log API improvements and queue optimisation for singleton networksredmatrix2015-12-317-49/+87
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-291-1/+1
|\ \
| * \ Merge pull request #238 from anaqreon/remove-bad-urlredmatrix2015-12-281-1/+1
| |\ \
| | * | Removed defunct URL from old auto-update ideaAndrew Manning2015-12-261-1/+1
* | | | store perms_accept on channel creationredmatrix2015-12-292-3/+3
|/ / /
* / / refresh issueredmatrix2015-12-273-3/+10
|/ /
* | Set accept permissions to that of role so if you change to a custom role you ...redmatrix2015-12-251-1/+1
* | don't send wall-post notifications when creating webpages on another channelredmatrix2015-12-251-1/+1
* | spellingredmatrix2015-12-251-1/+1
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-253-47/+45
|\ \
| * | update es-es stringsjeroenpraat2015-12-253-47/+45
* | | regression: default inherited permission was not being set for a connection i...redmatrix2015-12-253-7/+4
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-2413-1710/+1761
|\ \
| * | After reading and talking with experts I came to the conclusion that es-es an...jeroenpraat2015-12-2412-23098/+1
| * | reverted my previous commit. this is going to be fixed remotely upstream. Mea...jeroenpraat2015-12-2321-20/+1
| * | Spanish language codes. See issue #234jeroenpraat2015-12-2341-0/+23117
| * | update es+nl stringsjeroenpraat2015-12-224-1710/+1760