aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1116-19556/+20729
|\
| * revert lost linkredmatrix2016-01-101-0/+1
| * Merge pull request #252 from einervonvielen/homeinstallredmatrix2016-01-114-1/+1118
| |\
| | * Added files for installation scriptEiner von Vielen2016-01-103-0/+1118
| | * indexedEiner von Vielen2016-01-101-1/+0
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-108-14838/+14864
| |\ \
| | * | String update es-es and nl. Plus some extra bits, incl .gitignore update with...jeroenpraat2016-01-108-14838/+14864
| * | | the mail_isreply flag wasn't being set in the right casesredmatrix2016-01-102-4/+7
| |/ /
| * / add locked features to siteinfo to assist in debuggingredmatrix2016-01-091-1/+13
| |/
| * fix relative urls on some Diaspora profile photosredmatrix2016-01-093-4713/+4727
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-098-25/+51
|\|
| * issue #251redmatrix2016-01-071-2/+1
| * provide admin toggle to disable delivery reportsredmatrix2016-01-074-2/+7
| * optional support for public key pinningredmatrix2016-01-071-0/+7
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-071-20/+20
| |\
| | * Merge pull request #250 from wave72/masterredmatrix2016-01-081-20/+20
| | |\
| | | * Wrong branding in Translations docWave722016-01-071-15/+15
| | | * In Hubzilla messages.po is hmessages.poWave722016-01-071-6/+6
| * | | extra security headers, revert or fix if functionality is blockedredmatrix2016-01-072-1/+16
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-077-16/+125
|\| |
| * | version roll1.1redmatrix2016-01-061-2/+2
| * | features management page for hubminsredmatrix2016-01-065-1/+108
| * | provide an option to toggle the view of locked features so we can use the sam...redmatrix2016-01-052-14/+16
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-064-16/+22
|\| |
| * | make 'refresh permissions' do something useful for non-zot connectionsredmatrix2016-01-041-3/+9
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-043-111/+123
| |\ \
| * | | expire delivery reports at 10 days by default instead of 30.redmatrix2016-01-043-13/+13
* | | | 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
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 18:02:24 +0000