aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| | |\
| | | * Added section-title-wrapper and section-conent-wrapper to search result page ...mrjive2016-02-031-0/+4
| | | * Merge pull request #21 from redmatrix/mastermrjive2016-02-0317-1925/+2395
| | | |\
| | | * \ Merge pull request #20 from redmatrix/mastermrjive2016-02-0125-2557/+2987
| | | |\ \
| | | * \ \ Merge pull request #19 from redmatrix/mastermrjive2016-01-2871-4968/+5082
| | | |\ \ \
| | | * \ \ \ Merge pull request #18 from redmatrix/mastermrjive2016-01-2151-2025/+2343
| | | |\ \ \ \
| | | * \ \ \ \ Merge pull request #17 from redmatrix/mastermrjive2016-01-1517-69/+246
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #16 from redmatrix/mastermrjive2016-01-148-204/+92
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge pull request #15 from redmatrix/mastermrjive2016-01-1429-55/+1043
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pull request #14 from redmatrix/mastermrjive2016-01-1116-22260/+23419
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge pull request #13 from redmatrix/mastermrjive2016-01-1010-4738/+4790
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge pull request #12 from redmatrix/mastermrjive2016-01-0712-32/+159
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge pull request #11 from redmatrix/mastermrjive2016-01-0411-191/+261
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10 from redmatrix/mastermrjive2016-01-03705-126165/+39274
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9 from redmatrix/mastermrjive2015-12-04150-33202/+45858
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8 from redmatrix/mastermrjive2015-11-11671-9079/+101813
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7 from redmatrix/mastermrjive2015-10-26124-21709/+23747
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6 from redmatrix/mastermrjive2015-10-0245-36246/+38546
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5 from redmatrix/mastermrjive2015-09-2997-3163/+137724
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4 from redmatrix/mastermrjive2015-09-232-8/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3 from redmatrix/mastermrjive2015-09-2218-149/+312
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2 from redmatrix/mastermrjive2015-09-2152-428/+662
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1 from redmatrix/mastermrjive2015-09-1711-66/+61
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | update the poke page layout and UIredmatrix2016-02-042-28/+55
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | add system black/white list for embeds ahead of personal configredmatrix2016-02-041-0/+28
| * | | | | | | | | | | | | | | | | | | | | | | poke basic config settingredmatrix2016-02-042-10/+18
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'embedsec'redmatrix2016-02-037-9/+162
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | finish moving block_public to the new security pageredmatrix2016-02-031-3/+0
| | * | | | | | | | | | | | | | | | | | | | | | | don't implement the default embed whitelist just yetredmatrix2016-02-031-2/+3
| | * | | | | | | | | | | | | | | | | | | | | | | heavy lifting on admin security pageredmatrix2016-02-035-4/+59
| | * | | | | | | | | | | | | | | | | | | | | | | admin security page for configuring white and black lists and other security ...redmatrix2016-02-034-3/+103
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-047-25/+139
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | change view_storage from perms_public to perms_specific in the social_private...redmatrix2016-02-031-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | more zcard tweaksredmatrix2016-02-023-4/+8
| * | | | | | | | | | | | | | | | | | | | | | some zcard cleanup - still eneds a lot more workredmatrix2016-02-024-20/+130
* | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0222-1930/+2609
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #271 from wave72/masterWave2016-02-022-1907/+1968
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:11:19 +0000