| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-26 | 3 | -7/+9 |
|\ |
|
| * | another typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
| * | check if $addonDir is a dir to silence warning if it does not exist | Mario Vavti | 2016-05-26 | 1 | -5/+7 |
| * | typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
* | | kill off mcrypt | redmatrix | 2016-05-26 | 2 | -10/+11 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 2 | -0/+4 |
|\ |
|
| * | Merge pull request #402 from git-marijus/dev | hubzilla | 2016-05-26 | 2 | -0/+4 |
| |\ |
|
| | * | another try on #385 - replace sabres restrictive CSP with what we do in boot.php | Mario Vavti | 2016-05-25 | 2 | -0/+4 |
* | | | update to the bug doco | redmatrix | 2016-05-25 | 1 | -15/+1 |
|/ / |
|
* | | run background/daemon tasks at approximately 4 hour intervals from web access... | redmatrix | 2016-05-25 | 1 | -5/+10 |
* | | some event fixes, also change jquery-textcomplete to un-minified since the mi... | redmatrix | 2016-05-25 | 4 | -23/+41 |
* | | app rendering issues, typo in class name and could not find icon 'fa-arrow-ci... | redmatrix | 2016-05-25 | 2 | -2/+2 |
* | | duplicate daemon run of cronhooks | redmatrix | 2016-05-25 | 1 | -5/+0 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 3 | -9/+0 |
|\ \ |
|
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-25 | 1 | -1/+1 |
| |\ \ |
|
| * | | | remove the add others button for now - after some research it turned out not ... | Mario Vavti | 2016-05-25 | 3 | -9/+0 |
| | |/
| |/| |
|
* | | | Just set it and forget it. | redmatrix | 2016-05-25 | 1 | -3/+1 |
| |/
|/| |
|
* | | hubzilla is not a legal entity. the hubzilla community encompasses a group of... | redmatrix | 2016-05-25 | 1 | -1/+1 |
|/ |
|
* | require token signatures in zot_refresh, also move channel specific stuff int... | redmatrix | 2016-05-24 | 5 | -23/+50 |
* | code cleanup | redmatrix | 2016-05-24 | 30 | -584/+28 |
* | Add space between project name and server type | redmatrix | 2016-05-24 | 2 | -2/+2 |
* | more work associated with DBA and index.php shuffle | redmatrix | 2016-05-24 | 6 | -139/+105 |
* | relocate index and db | redmatrix | 2016-05-24 | 7 | -221/+253 |
* | moved enotify | redmatrix | 2016-05-24 | 8 | -140/+136 |
* | Clarify the privacy rights of commenters, as this can be contentious across t... | redmatrix | 2016-05-23 | 1 | -2/+2 |
* | typo | redmatrix | 2016-05-23 | 1 | -1/+1 |
* | remove some doxygen files that leaked into /doc | redmatrix | 2016-05-22 | 2 | -577/+0 |
* | change the signed token format. We don't folks to be able to submit random te... | redmatrix | 2016-05-22 | 3 | -2/+7 |
* | Can't use "use x as y" aliases in callback function declarations | redmatrix | 2016-05-22 | 1 | -1/+1 |
* | move chatroom stuff to zlib | redmatrix | 2016-05-22 | 6 | -281/+288 |
* | add missing file | redmatrix | 2016-05-22 | 1 | -0/+659 |
* | move apps to zlib | redmatrix | 2016-05-22 | 4 | -677/+20 |
* | turn the oft-repeated block_public ... check into a function observer_prohibi... | redmatrix | 2016-05-22 | 16 | -307/+311 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-22 | 4 | -1318/+1398 |
|\ |
|
| * | Update NL + ES_ES | jeroenpraat | 2016-05-22 | 4 | -1318/+1398 |
* | | renamed include files identity.php (channel.php) and Contact.php (connections... | redmatrix | 2016-05-22 | 62 | -240/+194 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-21 | 6 | -671/+721 |
|\| |
|
| * | Merge pull request #400 from anaqreon/plugin-repo-path | hubzilla | 2016-05-22 | 1 | -8/+14 |
| |\ |
|
| | * | Temp repo folder error message correction | Andrew Manning | 2016-05-21 | 1 | -2/+2 |
| | * | Moved git repository storage to store/[data]/git to avoid collision with a ch... | Andrew Manning | 2016-05-21 | 1 | -8/+14 |
| * | | Merge pull request #399 from phellmes/de20160521 | hubzilla | 2016-05-22 | 2 | -661/+701 |
| |\ \
| | |/
| |/| |
|
| | * | Update DE translation strings | phellmes | 2016-05-21 | 2 | -661/+701 |
| |/ |
|
| * | revert fix for #385 | Mario Vavti | 2016-05-21 | 1 | -4/+0 |
| * | possible better fix for #385 | Mario Vavti | 2016-05-21 | 2 | -2/+5 |
| * | possible fix for #385 | Mario Vavti | 2016-05-21 | 3 | -1/+6 |
* | | include new finger backend | redmatrix | 2016-05-21 | 1 | -0/+130 |
* | | finish updating zot_finger instances | redmatrix | 2016-05-21 | 10 | -44/+29 |
* | | first cut at zot-finger request signatures | redmatrix | 2016-05-21 | 2 | -8/+14 |
|/ |
|
* | relocate the (unused currently) protocol driver | redmatrix | 2016-05-20 | 2 | -26/+32 |
* | rework the conversation object stuff at a high level - still needs a bit of r... | redmatrix | 2016-05-20 | 21 | -98/+44 |