aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-219-27/+63
|\
| * looks like chat has been neglected a bit recentlyredmatrix2015-09-206-8/+7
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-13/+43
| |\
| | * new delivery report formatredmatrix2015-09-202-13/+42
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
| |\|
| | * improve on the last attemptredmatrix2015-09-201-4/+4
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
| |\|
| | * catch the timestamp alsoredmatrix2015-09-201-1/+1
| | * remove system flags from channel import packetredmatrix2015-09-201-5/+9
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-201-1/+1
| |\ \
| | * | kick right aside out a little earlierMario Vavti2015-09-201-1/+1
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * we need the xchan record alsoredmatrix2015-09-201-1/+1
* | | Removed hot_deployHaakon Meland Eriksen2015-09-201-0/+0
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-203-18/+66
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-1/+47
| |\|
| | * initial checkin delivery report classredmatrix2015-09-202-1/+47
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-192-1/+2
| |\|
| | * clone new connection requestsredmatrix2015-09-192-19/+20
| * | clone new connectionsredmatrix2015-09-191-17/+18
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-1914-20/+122
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
| |\|
| | * include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
| * | DB table for delivery reportsredmatrix2015-09-183-1/+86
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-188-14/+21
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-185-11/+14
| | |\
| | | * Another (hopefully final) Spanish updatejeroenpraat2015-09-172-5/+5
| | | * fix calculation of content height with marginsMario Vavti2015-09-173-6/+9
| | * | dummy updateredmatrix2015-09-184-8/+12
| | |/
| * | add reporting site to delivery reportredmatrix2015-09-183-1/+7
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-188-1/+8
| |\ \
| * | | more work on surviving hub re-installsredmatrix2015-09-182-4/+8
* | | | Added hot_deploy directly to .openshift/makers/hot_deployHaakon Meland Eriksen2015-09-181-0/+0
* | | | Added hot_deploy to deploy script - fixed echoHaakon Meland Eriksen2015-09-181-1/+1
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-1875-761/+964
|\ \ \ \ | | |/ / | |/| |
| * | | css fixesMario Vavti2015-09-188-1/+8
| |/ /
| * | change photo permissions when attach permissions are changed through mod/file...redmatrix2015-09-183-4/+14
| * | start hooking in the new webfinger/zot merged discoveryredmatrix2015-09-171-6/+10
| * | consolidate zotfinger and webfingerredmatrix2015-09-175-291/+299
| * | Converse width for a few related (old) schemas back to 1024px / Name default ...jeroenpraat2015-09-176-6/+15
| * | missing refernce to arrayMario Vavti2015-09-171-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-173-5/+5
| |\ \
| | * \ Merge pull request #46 from anaqreon/mastergit-marijus2015-09-173-5/+5
| | |\ \
| | | * | Corrected some missing space typos in docsAndrew Manning2015-09-173-5/+5
| * | | | quickfix for private messages - needs a lot more workMario Vavti2015-09-175-48/+56
| |/ / /
| * / / Revert "moved submit button to the bottom in settings.tpl"Mario Vavti2015-09-171-5/+7
| |/ /
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-161-1/+1
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-1612-197/+199
| | |\
| | * | push revisionredmatrix2015-09-161-1/+1
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-160-0/+0
| |\ \ \ | | | |/ | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:09:36 +0000