Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-24 | 2 | -102/+134 |
|\ | |||||
| * | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 2 | -102/+134 |
| | | |||||
* | | Document the additional content export options | redmatrix | 2015-09-24 | 2 | -3/+14 |
|/ | |||||
* | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 1 | -0/+2 |
| | |||||
* | since this is now usable, protect the displayed delivery reports from XSS ↵ | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | | | injection | ||||
* | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 1 | -1/+12 |
| | |||||
* | Merge pull request #54 from git-marijus/master | redmatrix | 2015-09-22 | 1 | -0/+1 |
|\ | | | | | fix consensus items - issue #53 | ||||
| * | fix consensus items - issue #53 | Mario Vavti | 2015-09-22 | 1 | -0/+1 |
| | | |||||
* | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 1 | -0/+32 |
|/ | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-21 | 1 | -122/+128 |
|\ | | | | | | | | | Conflicts: mod/post.php | ||||
| * | issue #52 - try all matching hublocs for remote auth, not just the "best one". | redmatrix | 2015-09-21 | 1 | -128/+135 |
| | | |||||
* | | issue #50 - cloud listings produce white screen for unauthenticated viewer | redmatrix | 2015-09-21 | 1 | -18/+20 |
| | | |||||
* | | issue #51 | redmatrix | 2015-09-21 | 1 | -4/+11 |
| | | |||||
* | | looks like chat has been neglected a bit recently | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | | |||||
* | | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -2/+2 |
| | | | | | | | | mod/filestorage, and fix lockview for photos. | ||||
* | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 3 | -289/+9 |
| | | |||||
* | | quickfix for private messages - needs a lot more work | Mario Vavti | 2015-09-17 | 2 | -28/+27 |
| | | |||||
* | | change matrix to grid, begin webfinger optimisation | redmatrix | 2015-09-16 | 2 | -14/+11 |
| | | |||||
* | | serve as application/xrd+xml | redmatrix | 2015-09-15 | 2 | -2/+2 |
| | | |||||
* | | I'm not going to tell you what's wrong because I'll be accused of bashing ↵ | redmatrix | 2015-09-15 | 3 | -1/+3 |
| | | | | | | | | another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth. | ||||
* | | we need an owner for permissions_sql | redmatrix | 2015-09-14 | 1 | -1/+9 |
| | | |||||
* | | Update siteinfo.php | jeroenpraat | 2015-09-14 | 1 | -0/+5 |
| | | |||||
* | | profile photo change activities | redmatrix | 2015-09-13 | 1 | -5/+67 |
| | | |||||
* | | minor change on invite | redmatrix | 2015-09-11 | 1 | -1/+1 |
| | | |||||
* | | separate the links | redmatrix | 2015-09-10 | 1 | -1/+1 |
| | | |||||
* | | forum mode - use linked avatar and name for title instead of "Channel: ↵ | redmatrix | 2015-09-10 | 1 | -1/+1 |
| | | | | | | | | xxxxx" or "Forum: xxxx" | ||||
* | | duplicated code | redmatrix | 2015-09-10 | 1 | -8/+0 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 1 | -0/+8 |
|\| | | | | | | | | | Conflicts: mod/like.php | ||||
| * | export likes to clones | redmatrix | 2015-09-10 | 1 | -1/+15 |
| | | |||||
| * | merge conflicts | redmatrix | 2015-09-08 | 2 | -2/+2 |
| | | |||||
* | | sync likes | redmatrix | 2015-09-10 | 2 | -1/+18 |
| | | |||||
* | | decentralise likes of things so they can be cloned | redmatrix | 2015-09-09 | 1 | -4/+11 |
| | | |||||
* | | don't auto-open the editor in forum mode. Save the forum selection text ↵ | redmatrix | 2015-09-09 | 5 | -1/+5 |
| | | | | | | | | until we open it. | ||||
* | | fix the lock state when using forum mode | redmatrix | 2015-09-09 | 1 | -3/+5 |
| | | |||||
* | | major changes to "forum mode" on the network/matrix page | redmatrix | 2015-09-09 | 2 | -3/+10 |
| | | |||||
* | | profile photo issues #36 | redmatrix | 2015-09-09 | 1 | -1/+4 |
| | | |||||
* | | move mod_admin to Comanche finally | redmatrix | 2015-09-08 | 1 | -42/+0 |
| | | |||||
* | | issues with "use this photo for profile photo" #36 | redmatrix | 2015-09-08 | 1 | -5/+27 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-08 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | Conflicts: include/menu.php mod/menu.php mod/mitem.php | ||||
| * | add sync packets for menus | redmatrix | 2015-09-08 | 2 | -1/+8 |
| | | |||||
* | | menu import and sync | redmatrix | 2015-09-08 | 3 | -1/+13 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -9/+13 |
|\| | |||||
| * | minor fix to event sync | redmatrix | 2015-09-07 | 1 | -9/+13 |
| | | |||||
* | | work on event sync | redmatrix | 2015-09-07 | 1 | -0/+7 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -0/+19 |
|\| | |||||
| * | create event sync packets | redmatrix | 2015-09-07 | 1 | -0/+19 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -0/+13 |
|\| | | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
| * | sync posted top level items rather than deliver them (actually we do both, ↵ | redmatrix | 2015-09-07 | 1 | -3/+30 |
| | | | | | | | | but sync comes first). This way we get the ACL transferred. | ||||
| * | sync "things" (obj elements) | redmatrix | 2015-09-02 | 1 | -0/+28 |
| | | |||||
* | | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 3 | -99/+29 |
| | |