Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | whitespace | redmatrix | 2016-02-11 | 2 | -1/+2 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-11 | 1 | -74/+94 |
|\ | |||||
| * | update readmore.js to a more recent version | Mario Vavti | 2016-02-11 | 1 | -74/+94 |
| | | |||||
* | | guest photo upload failing when js_upload is in use due to non-existent acl ↵ | redmatrix | 2016-02-11 | 3 | -2/+10 |
|/ | | | | parameters | ||||
* | feed dates are always UTC. This means we will need another mechanism to pass ↵ | redmatrix | 2016-02-10 | 1 | -2/+2 |
| | | | | localised dates to items_fetch() | ||||
* | feed dates weren't being honoured. When that was fixed they turned out to be ↵ | redmatrix | 2016-02-10 | 2 | -3/+5 |
| | | | | reversed. | ||||
* | put a sane lower time limit on content search for public feed requests | redmatrix | 2016-02-10 | 1 | -0/+6 |
| | |||||
* | hook changes to support pubsubhubbub | redmatrix | 2016-02-10 | 3 | -5/+33 |
| | |||||
* | rev update | redmatrix | 2016-02-10 | 2 | -1/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-09 | 2 | -30/+26 |
|\ | |||||
| * | Merge pull request #276 from phellmes/invite | git-marijus | 2016-02-09 | 2 | -30/+26 |
| |\ | | | | | | | Invite module UI and strings update | ||||
| | * | [invite module] remove trailing spaces from translatable strings | phellmes | 2016-02-09 | 1 | -6/+6 |
| | | | |||||
| | * | [invite module] update UI template | phellmes | 2016-02-09 | 1 | -24/+20 |
| |/ | |||||
* / | Castellano and Nederlands string updates | jeroenpraat | 2016-02-09 | 4 | -4010/+4152 |
|/ | |||||
* | need to re-arrange a few things for a short vcard | redmatrix | 2016-02-08 | 2 | -1/+46 |
| | |||||
* | lots more zcard tweaks | redmatrix | 2016-02-08 | 6 | -20/+57 |
| | |||||
* | duplicated lines in en config file | redmatrix | 2016-02-08 | 1 | -10/+0 |
| | |||||
* | make yet another recommended security header optional - this time because of ↵ | redmatrix | 2016-02-08 | 12 | -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 again | redmatrix | 2016-02-08 | 2 | -11/+7 |
| | |||||
* | Revert "sort out the well-known acme-challenge mess - at least on apache" | redmatrix | 2016-02-08 | 3 | -6/+12 |
| | | | | This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6. | ||||
* | 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 |
| | | | | (plus a lot more) | ||||
* | 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 |
| |\ | | | | | | | Small adding in search result page in /help | ||||
| | * | Added section-title-wrapper and section-conent-wrapper to search result page ↵ | mrjive | 2016-02-03 | 1 | -0/+4 |
| | | | | | | | | | | | | in /help | ||||
| | * | Merge pull request #21 from redmatrix/master | mrjive | 2016-02-03 | 17 | -1925/+2395 |
| | |\ | | | | | | | | | updating from original codebase | ||||
| | * \ | Merge pull request #20 from redmatrix/master | mrjive | 2016-02-01 | 25 | -2557/+2987 |
| | |\ \ | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ | Merge pull request #19 from redmatrix/master | mrjive | 2016-01-28 | 71 | -4968/+5082 |
| | |\ \ \ | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ | Merge pull request #18 from redmatrix/master | mrjive | 2016-01-21 | 51 | -2025/+2343 |
| | |\ \ \ \ | | | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ \ | Merge pull request #17 from redmatrix/master | mrjive | 2016-01-15 | 17 | -69/+246 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ \ \ | Merge pull request #16 from redmatrix/master | mrjive | 2016-01-14 | 8 | -204/+92 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ \ \ \ | Merge pull request #15 from redmatrix/master | mrjive | 2016-01-14 | 29 | -55/+1043 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ \ \ \ \ | Merge pull request #14 from redmatrix/master | mrjive | 2016-01-11 | 16 | -22260/+23419 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase | ||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #13 from redmatrix/master | mrjive | 2016-01-10 | 10 | -4738/+4790 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | updating from original codebase |