Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-08 | 2 | -3/+2 |
|\ | |||||
| * | avoid collapsing only above the viewport | Mario Vavti | 2016-02-08 | 2 | -3/+2 |
* | | sort out the well-known acme-challenge mess - at least on apache | redmatrix | 2016-02-08 | 3 | -12/+6 |
|/ | |||||
* | a few tweaks to uno settings page to allow a default ACL to be created | redmatrix | 2016-02-07 | 2 | -1/+8 |
* | change register workflow if uno is set | redmatrix | 2016-02-07 | 1 | -1/+1 |
* | provide get_server_role() to abstract different roles and capabilities | redmatrix | 2016-02-07 | 4 | -2/+9 |
* | block public was still referenced in admin/site template | redmatrix | 2016-02-07 | 1 | -1/+0 |
* | update UI template for 'mood' module | redmatrix | 2016-02-07 | 2 | -8/+19 |
* | fix uno import by disabling for now | redmatrix | 2016-02-05 | 2 | -1/+10 |
* | uno stuff | redmatrix | 2016-02-05 | 3 | -11/+17 |
* | more uno groundwork | redmatrix | 2016-02-05 | 5 | -4/+12 |
* | rev update | redmatrix | 2016-02-05 | 5 | -1465/+1528 |
* | remove blackout setting now that the keepout plugin performs the same tasks (... | redmatrix | 2016-02-04 | 1 | -3/+0 |
* | initial uno config | redmatrix | 2016-02-04 | 14 | -10/+37 |
* | will probably need this to make it work | redmatrix | 2016-02-04 | 1 | -1/+1 |
* | make strict transport security header optional | redmatrix | 2016-02-04 | 2 | -1/+3 |
* | comment buttons hook | redmatrix | 2016-02-04 | 2 | -0/+7 |
* | update docs | redmatrix | 2016-02-04 | 1 | -0/+2 |
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-04 | 1 | -0/+4 |
|\ | |||||
| * | Merge pull request #274 from mrjive/master | redmatrix | 2016-02-05 | 1 | -0/+4 |
| |\ | |||||
| | * | Added section-title-wrapper and section-conent-wrapper to search result page ... | mrjive | 2016-02-03 | 1 | -0/+4 |
| | * | Merge pull request #21 from redmatrix/master | mrjive | 2016-02-03 | 17 | -1925/+2395 |
| | |\ | |||||
| | * \ | Merge pull request #20 from redmatrix/master | mrjive | 2016-02-01 | 25 | -2557/+2987 |
| | |\ \ | |||||
| | * \ \ | Merge pull request #19 from redmatrix/master | mrjive | 2016-01-28 | 71 | -4968/+5082 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge pull request #18 from redmatrix/master | mrjive | 2016-01-21 | 51 | -2025/+2343 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #17 from redmatrix/master | mrjive | 2016-01-15 | 17 | -69/+246 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #16 from redmatrix/master | mrjive | 2016-01-14 | 8 | -204/+92 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #15 from redmatrix/master | mrjive | 2016-01-14 | 29 | -55/+1043 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge pull request #14 from redmatrix/master | mrjive | 2016-01-11 | 16 | -22260/+23419 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #13 from redmatrix/master | mrjive | 2016-01-10 | 10 | -4738/+4790 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #12 from redmatrix/master | mrjive | 2016-01-07 | 12 | -32/+159 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #11 from redmatrix/master | mrjive | 2016-01-04 | 11 | -191/+261 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10 from redmatrix/master | mrjive | 2016-01-03 | 705 | -126165/+39274 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #9 from redmatrix/master | mrjive | 2015-12-04 | 150 | -33202/+45858 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8 from redmatrix/master | mrjive | 2015-11-11 | 671 | -9079/+101813 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7 from redmatrix/master | mrjive | 2015-10-26 | 124 | -21709/+23747 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6 from redmatrix/master | mrjive | 2015-10-02 | 45 | -36246/+38546 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5 from redmatrix/master | mrjive | 2015-09-29 | 97 | -3163/+137724 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4 from redmatrix/master | mrjive | 2015-09-23 | 2 | -8/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3 from redmatrix/master | mrjive | 2015-09-22 | 18 | -149/+312 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2 from redmatrix/master | mrjive | 2015-09-21 | 52 | -428/+662 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1 from redmatrix/master | mrjive | 2015-09-17 | 11 | -66/+61 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | update the poke page layout and UI | redmatrix | 2016-02-04 | 2 | -28/+55 |
|/ / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | add system black/white list for embeds ahead of personal config | redmatrix | 2016-02-04 | 1 | -0/+28 |
* | | | | | | | | | | | | | | | | | | | | | | | poke basic config setting | redmatrix | 2016-02-04 | 2 | -10/+18 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'embedsec' | redmatrix | 2016-02-03 | 7 | -9/+162 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | finish moving block_public to the new security page | redmatrix | 2016-02-03 | 1 | -3/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | don't implement the default embed whitelist just yet | redmatrix | 2016-02-03 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | heavy lifting on admin security page | redmatrix | 2016-02-03 | 5 | -4/+59 |
| * | | | | | | | | | | | | | | | | | | | | | | | admin security page for configuring white and black lists and other security ... | redmatrix | 2016-02-03 | 4 | -3/+103 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |