Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
| * | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | |||||
* | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -1/+4 |
|/ | |||||
* | fix double encoding of homepage in profile activity - not as ↵ | friendica | 2014-12-21 | 1 | -1/+5 |
| | | | | straight-forward as it looked | ||||
* | sql error in profile_activity | friendica | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | some minor cleanup on plinks for some very subtle permissions issues | friendica | 2014-01-09 | 1 | -0/+2 |
| | |||||
* | provide detailed error to remote site for the myriad of things that can go ↵ | friendica | 2013-09-10 | 1 | -1/+2 |
| | | | | wrong inside item_store(), !! this changes the return of item_store !! | ||||
* | fix profile change activity where the change is a solitary url - and ↵ | friendica | 2013-08-26 | 1 | -0/+2 |
| | | | | includes a stray right quote | ||||
* | rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no ↵ | friendica | 2013-03-21 | 1 | -1/+1 |
| | | | | longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present. | ||||
* | start formatting for Doxygen | friendica | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | fix the profile change activity post | friendica | 2012-11-05 | 1 | -18/+20 |
| | |||||
* | start on the like/dislike activities | friendica | 2012-11-05 | 1 | -6/+6 |
| | |||||
* | more structural stuff | friendica | 2012-10-29 | 1 | -3/+3 |
| | |||||
* | more heavy lifting | friendica | 2012-10-23 | 1 | -1/+1 |
| | |||||
* | upstream fixes | friendica | 2012-10-21 | 1 | -0/+81 |