Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #142 from kenrestivo/refactor-out-api-auth | redmatrix | 2015-11-11 | 3 | -90/+96 |
|\ | | | | | Move api_auth() out to a file that can be included from plugins/modules | ||||
| * | Move api_auth() out to a file that can be included from plugins/modules to ↵ | ken restivo | 2015-11-10 | 3 | -90/+96 |
|/ | | | | allow them to expose their own programmatic API. | ||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge0.11 | redmatrix | 2015-11-10 | 2 | -2/+2 |
|\ | |||||
| * | Merge pull request #139 from sasiflo/master | redmatrix | 2015-11-11 | 2 | -2/+2 |
| |\ | | | | | | | Replaced references to redmatrix logo. | ||||
| | * | Replaced references to redmatrix logo. | sasiflo | 2015-11-10 | 2 | -2/+2 |
| |/ | |||||
* / | do a better job of preserving linebreaks in posts for channels that use markdown | redmatrix | 2015-11-10 | 2 | -2/+2 |
|/ | |||||
* | more doco | redmatrix | 2015-11-09 | 2 | -0/+24 |
| | |||||
* | remove the obsolete avatar_img function (gravatar/libravatar lookup) | redmatrix | 2015-11-09 | 3 | -26/+0 |
| | |||||
* | get rid of the pre-comanche widget placement and wgl code | redmatrix | 2015-11-09 | 4 | -48/+0 |
| | |||||
* | more doco | redmatrix | 2015-11-09 | 7 | -4/+41 |
| | |||||
* | add avatars to likes/dislikes/etc. | redmatrix | 2015-11-09 | 2 | -2/+8 |
| | |||||
* | remove list bullets from extended like list | redmatrix | 2015-11-09 | 2 | -1/+5 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-09 | 482 | -123705/+31 |
|\ | |||||
| * | Merge pull request #134 from HaakonME/master | redmatrix | 2015-11-10 | 477 | -123697/+0 |
| |\ | | | | | | | Keep only zot.meta.xml for schemaSpy report generation | ||||
| | * | Keep only zot.meta.xml for schemaSpy report generation, not the report itself | Haakon Meland Eriksen | 2015-11-09 | 477 | -123697/+0 |
| | | | |||||
| * | | Merge pull request #135 from kenrestivo/account-id-link | redmatrix | 2015-11-10 | 1 | -1/+3 |
| |\ \ | | | | | | | | | Manually document account_id link for schemaSpy. | ||||
| | * | | Manually document account_id link for schemaSpy. | ken restivo | 2015-11-08 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #136 from kenrestivo/generate-schemaspy | redmatrix | 2015-11-10 | 2 | -0/+26 |
| |\ \ \ | | | | | | | | | | | First attempt at auto-generating the schemaspy docs | ||||
| | * | | | Correct directory (this runs from inside hubzilla_er | ken restivo | 2015-11-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | First attempt at auto-generating schemaspy. | ken restivo | 2015-11-08 | 2 | -0/+26 |
| | |/ / | |||||
| * | | | This is better | jeroenpraat | 2015-11-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Using bootstrap classes, so other themes/schemas also work. Plus margin when ↵ | jeroenpraat | 2015-11-09 | 2 | -7/+2 |
| | | | | | | | | | | | | | | | | collapsed. | ||||
* | | | | thwart attempts to use an external private directory as a directory server | redmatrix | 2015-11-09 | 1 | -0/+13 |
|/ / / | |||||
* | | | 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 |