aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* private mail: $preid should be abook_xchan not abook_idMario Vavti2015-10-021-4/+4
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-022-382/+400
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-022-20/+42
| |\
| * | need full path to deliver_hooks.phpredmatrix2015-10-021-1/+1
| * | string updateredmatrix2015-10-021-381/+399
* | | private mail compositor changesMario Vavti2015-10-026-97/+74
| |/ |/|
* | whitespaceMario Vavti2015-10-021-3/+0
* | move mail item buttons/menu to dropdownMario Vavti2015-10-021-7/+25
* | private mail template and css fixesMario Vavti2015-10-022-14/+21
|/
* issue with resetting post perms to default audience - not sticking.0.10redmatrix2015-10-011-6/+17
* one more changeredmatrix2015-10-012-0/+3
* notification changes to support testdriveredmatrix2015-10-012-1/+5
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-012-5/+5
|\
| * allow additional uses for xtagsredmatrix2015-10-012-5/+5
* | Merge pull request #66 from HaakonME/masterredmatrix2015-10-0218-7716/+8321
|\ \
| * | Small fix to deployHaakon Meland Eriksen2015-10-011-1/+1
| * | Small fix to deployHaakon Meland Eriksen2015-10-011-1/+1
| * | Changed deploy script - removed hot_deploy and changed poller to every 10 min...Haakon Meland Eriksen2015-10-011-7/+7
| * | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2015-10-011-1502/+1560
| * | Updated Norwegian string for HubzillaHaakon Meland Eriksen2015-10-011-6214/+6500
| * | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-10-0113-21033/+22308
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-3084-3019/+137693
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-2510-19/+140
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-2422-150/+318
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-232-2/+24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-2213-6/+128
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-227-146/+188
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-219-27/+63
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed hot_deployHaakon Meland Eriksen2015-09-201-0/+0
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-203-18/+66
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-1914-20/+122
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added hot_deploy to deploy scriptHaakon Meland Eriksen2015-09-181-0/+16
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-1164-833/+1535
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed old pollerHaakon Meland Eriksen2015-09-041-10/+0
| * | | | | | | | | | | | | | Updating OpenShift deploy scriptHaakon Meland Eriksen2015-09-041-0/+24
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0334-708/+1358
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0116-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix filenameHaakon Meland Eriksen2015-09-011-2/+1
| * | | | | | | | | | | | | | | | Fixed deploy scriptHaakon Meland Eriksen2015-09-011-8/+37
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-011-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Added openshift-hubzilla-deploy to .openshift/action_hooks/deployHaakon Meland Eriksen2015-09-011-0/+110
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-0147-663/+722
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2723-1165/+1188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2333-238/+532
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-1945-11403/+20389
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0613-117/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Hubzilla addons addedHaakon Meland Eriksen2015-08-031-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 19:57:30 +0000