Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-09 | 3 | -1823/+1966 |
|\ | |||||
| * | Merge pull request #137 from wave72/master | Wave | 2015-11-09 | 2 | -1823/+1876 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-11-09 | 2 | -1823/+1876 |
| | | | |||||
| | * | Merge pull request #2 from redmatrix/master | Wave | 2015-11-06 | 308 | -11295/+14575 |
| | |\ | | | | | | | | | Update to latest hubzilla | ||||
| * | \ | Merge pull request #133 from kenrestivo/export-v1 | redmatrix | 2015-11-09 | 1 | -0/+90 |
| |\ \ \ | | | | | | | | | | | First pass at endpoints for exporting users and channels as admin. | ||||
| | * | | | First pass at endpoints for exporting users and channels in bulk as admin. | ken restivo | 2015-11-08 | 1 | -0/+90 |
| |/ / / | |||||
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-09 | 2 | -7/+8 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: README.md version.inc | ||||
| * | | | remove references to redmatrix.me | redmatrix | 2015-11-09 | 5 | -10/+10 |
| | | | | |||||
* | | | | suppress duplicate locations in connedit, issue #111 | redmatrix | 2015-11-08 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-08 | 2 | -4/+37 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #132 from kenrestivo/test-for-email | redmatrix | 2015-11-09 | 2 | -4/+37 |
| |\ \ \ \ | | | | | | | | | | | | | Add unit tests for valid email function. | ||||
| | * | | | | Add unit tests for valid email function. | ken restivo | 2015-11-08 | 2 | -4/+37 |
| | | | | | | |||||
* | | | | | | some more db doco | redmatrix | 2015-11-08 | 6 | -29/+32 |
|/ / / / / | |||||
* | | | | | make jotnets modal | redmatrix | 2015-11-08 | 3 | -3/+21 |
| | | | | | |||||
* | | | | | no comment permission bug, also implement delete() in RedDirectory per Waitman | redmatrix | 2015-11-08 | 2 | -8/+34 |
|/ / / / | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-08 | 1 | -3/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #131 from tluther/master | redmatrix | 2015-11-09 | 1 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Quick fix: Moved Twitter select box to the top of ACL selector | ||||
| | * | | | | Quick fix: Moved Twitter select box to the top of ACL selector | Tobias Luther | 2015-11-08 | 1 | -3/+6 |
| |/ / / / | |||||
* / / / / | relative attachment not fetched due to os filename issue | redmatrix | 2015-11-08 | 2 | -2/+5 |
|/ / / / | |||||
* | | | | Merge pull request #129 from HaakonME/master | redmatrix | 2015-11-08 | 848 | -1/+213332 |
|\ \ \ \ | | | | | | | | | | | Hubzilla database entity-relationship documentation and HonO fix | ||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-07 | 4 | -67/+71 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-07 | 11 | -1593/+1695 |
| |\ \ \ \ \ | |||||
| * | | | | | | Hubzilla report created by schemaSpy using zot.meta.xml to imply relationships | Haakon Meland Eriksen | 2015-11-06 | 847 | -0/+213332 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-06 | 174 | -11/+741 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-05 | 9 | -26/+58 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-05 | 24 | -659/+1649 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Removed fixed directory server - new list available in admin panel if one ↵ | Haakon Meland Eriksen | 2015-11-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | becomes unavailable | ||||
* | | | | | | | | | A few quotes too many. Also translations for tooltip. | jeroenpraat | 2015-11-08 | 1 | -5/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix ffsapi for non-English languages (or better when 's was used in the ↵ | jeroenpraat | 2015-11-08 | 5 | -3617/+3723 |
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | strings) - Update nl+es | ||||
* | | | | | | | | more db schema doco | redmatrix | 2015-11-06 | 4 | -67/+71 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #130 from kenrestivo/link-from-human | redmatrix | 2015-11-07 | 2 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Human docs > Computer-generated Docs | ||||
| * | | | | | | | Human > computer | ken restivo | 2015-11-06 | 2 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | update db doco for attach structure to match hubzilla schema | redmatrix | 2015-11-06 | 1 | -7/+9 |
|/ / / / / / / | |||||
* | | | | | | | update the abook schema doco with the hubzilla schema changes | redmatrix | 2015-11-06 | 1 | -19/+11 |
| | | | | | | | |||||
* | | | | | | | database schema documentation for item table | redmatrix | 2015-11-06 | 1 | -49/+96 |
| | | | | | | | |||||
* | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-06 | 3 | -8/+27 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php install/update.php | ||||
| * | | | | | | rev update | redmatrix | 2015-11-06 | 4 | -9/+13 |
| | | | | | | | |||||
| * | | | | | | forgot this one | redmatrix | 2015-11-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | version and string update | redmatrix | 2015-11-06 | 3 | -1509/+1551 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | more hook doco | redmatrix | 2015-11-05 | 2 | -0/+20 |
| | | | | | | |||||
* | | | | | | a bit of explanation at the beginning | redmatrix | 2015-11-05 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | add the hook detail to the doco list | redmatrix | 2015-11-05 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | more work on hook doco | redmatrix | 2015-11-05 | 5 | -6/+8 |
| | | | | | | |||||
* | | | | | | update hooklist | redmatrix | 2015-11-05 | 2 | -4/+121 |
| | | | | | | |||||
* | | | | | | the journey of 1000 miles begins with a single step | redmatrix | 2015-11-05 | 1 | -0/+28 |
| | | | | | | |||||
* | | | | | | preliminary hook detail files | redmatrix | 2015-11-05 | 162 | -0/+162 |
| | | | | | | |||||
* | | | | | | typo | redmatrix | 2015-11-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-05 | 4 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Firefox Share app. Paper plane icon is public domain. Shorted the name in ↵ | jeroenpraat | 2015-11-05 | 4 | -3/+8 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon). | ||||
* | | | | | | handle old files with partial paths | redmatrix | 2015-11-05 | 3 | -6/+18 |
| | | | | | |