aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0930-49/+246
|\
| * need to re-arrange a few things for a short vcardredmatrix2016-02-082-1/+46
| |
| * lots more zcard tweaksredmatrix2016-02-086-20/+57
| |
| * duplicated lines in en config fileredmatrix2016-02-081-10/+0
| |
| * make yet another recommended security header optional - this time because of ↵redmatrix2016-02-0812-1/+107
| | | | | | | | piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
| * try that patch againredmatrix2016-02-082-11/+7
| |
| * Revert "sort out the well-known acme-challenge mess - at least on apache"redmatrix2016-02-083-6/+12
| | | | | | | | This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6.
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-082-3/+2
| |\
| | * avoid collapsing only above the viewportMario Vavti2016-02-082-3/+2
| | |
| * | sort out the well-known acme-challenge mess - at least on apacheredmatrix2016-02-083-12/+6
| |/
| * a few tweaks to uno settings page to allow a default ACL to be createdredmatrix2016-02-072-1/+8
| |
| * change register workflow if uno is setredmatrix2016-02-071-1/+1
| |
| * provide get_server_role() to abstract different roles and capabilitiesredmatrix2016-02-074-2/+9
| |
| * block public was still referenced in admin/site templateredmatrix2016-02-071-1/+0
| |
| * update UI template for 'mood' moduleredmatrix2016-02-072-8/+19
| |
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0629-1494/+1604
|\|
| * fix uno import by disabling for nowredmatrix2016-02-052-1/+10
| |
| * uno stuffredmatrix2016-02-053-11/+17
| |
| * more uno groundworkredmatrix2016-02-055-4/+12
| |
| * rev updateredmatrix2016-02-055-1465/+1528
| |
| * remove blackout setting now that the keepout plugin performs the same tasks ↵redmatrix2016-02-041-3/+0
| | | | | | | | (plus a lot more)
| * initial uno configredmatrix2016-02-0414-10/+37
| |
| * will probably need this to make it workredmatrix2016-02-041-1/+1
| |
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0516-47/+278
|\|
| * make strict transport security header optionalredmatrix2016-02-042-1/+3
| |
| * comment buttons hookredmatrix2016-02-042-0/+7
| |
| * update docsredmatrix2016-02-041-0/+2
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-041-0/+4
| |\
| | * Merge pull request #274 from mrjive/masterredmatrix2016-02-051-0/+4
| | |\ | | | | | | | | Small adding in search result page in /help
| | | * Added section-title-wrapper and section-conent-wrapper to search result page ↵mrjive2016-02-031-0/+4
| | | | | | | | | | | | | | | | in /help
| | | * Merge pull request #21 from redmatrix/mastermrjive2016-02-0317-1925/+2395
| | | |\ | | | | | | | | | | updating from original codebase
| | | * \ Merge pull request #20 from redmatrix/mastermrjive2016-02-0125-2557/+2987
| | | |\ \ | | | | | | | | | | | | updating from original codebase
| | | * \ \ Merge pull request #19 from redmatrix/mastermrjive2016-01-2871-4968/+5082
| | | |\ \ \ | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ Merge pull request #18 from redmatrix/mastermrjive2016-01-2151-2025/+2343
| | | |\ \ \ \ | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ Merge pull request #17 from redmatrix/mastermrjive2016-01-1517-69/+246
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ Merge pull request #16 from redmatrix/mastermrjive2016-01-148-204/+92
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ Merge pull request #15 from redmatrix/mastermrjive2016-01-1429-55/+1043
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ Merge pull request #14 from redmatrix/mastermrjive2016-01-1116-22260/+23419
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ Merge pull request #13 from redmatrix/mastermrjive2016-01-1010-4738/+4790
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ Merge pull request #12 from redmatrix/mastermrjive2016-01-0712-32/+159
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ Merge pull request #11 from redmatrix/mastermrjive2016-01-0411-191/+261
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10 from redmatrix/mastermrjive2016-01-03705-126165/+39274
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9 from redmatrix/mastermrjive2015-12-04150-33202/+45858
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8 from redmatrix/mastermrjive2015-11-11671-9079/+101813
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get fresh code from HZ base
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7 from redmatrix/mastermrjive2015-10-26124-21709/+23747
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6 from redmatrix/mastermrjive2015-10-0245-36246/+38546
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5 from redmatrix/mastermrjive2015-09-2997-3163/+137724
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4 from redmatrix/mastermrjive2015-09-232-8/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3 from redmatrix/mastermrjive2015-09-2218-149/+312
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2 from redmatrix/mastermrjive2015-09-2152-428/+662
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get fresh code from HZ base
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:25:07 +0000