Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | |||||
* | | second pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 1 | -3/+3 |
|/ | |||||
* | local_user => local_channel | friendica | 2015-01-28 | 1 | -1/+1 |
| | |||||
* | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 1 | -9/+0 |
| | |||||
* | begin the grand unification for 3.0. Start by splitting DAV into a web ↵ | friendica | 2015-01-06 | 1 | -0/+153 |
accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. |