Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -3/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -3/+3 |
| | | |||||
* | | more expanding item flags | friendica | 2015-01-22 | 1 | -2/+2 |
|/ | |||||
* | make discover items interactive | friendica | 2014-09-22 | 1 | -1/+4 |
| | |||||
* | unobscure viewsrc items | friendica | 2014-08-23 | 1 | -2/+5 |
| | |||||
* | sometimes it gets confusing when using two trees with completely different ↵ | friendica | 2012-11-13 | 1 | -1/+1 |
| | | | | structures | ||||
* | provide json parameter to viewsrc to support end-to-end encryption | friendica | 2012-11-13 | 1 | -2/+2 |
| | |||||
* | still a lot of files to bring up to date with new architecture - keep ↵ | friendica | 2012-11-13 | 1 | -18/+20 |
| | | | | plugging away at them | ||||
* | start on contacts/profiles | friendica | 2012-08-30 | 1 | -8/+8 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -1/+6 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | viewsrc: return only body if page is requested via ajax | Fabio Comuni | 2012-03-28 | 1 | -1/+6 |
|/ | |||||
* | implement "moderate" flag on items | friendica | 2012-01-23 | 1 | -0/+1 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | view source of item [bbcode] usage: viewsrc/nnn | Friendika | 2011-10-30 | 1 | -0/+30 |