| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into pocorate | friendica | 2015-02-03 | 2 | -2/+7 |
|\ |
|
| * | garbage in garbage out | friendica | 2015-02-03 | 2 | -2/+7 |
* | | send rating information to directories | friendica | 2015-02-02 | 3 | -24/+153 |
|/ |
|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-02 | 1 | -0/+75 |
|\ |
|
| * | comment out latest changes - needs more testing | marijus | 2015-02-02 | 1 | -4/+4 |
| * | comment this out for now - it is not always true | marijus | 2015-02-02 | 1 | -2/+2 |
| * | one important line missing | marijus | 2015-02-02 | 1 | -0/+1 |
| * | we also need folder here | marijus | 2015-02-02 | 1 | -1/+1 |
| * | typo | marijus | 2015-02-02 | 1 | -1/+1 |
| * | just select perms | marijus | 2015-02-02 | 1 | -1/+1 |
| * | respect parent dir permissions | marijus | 2015-02-02 | 1 | -0/+74 |
* | | issue #889 private tags for forums no longer recognised after tag refactor a ... | friendica | 2015-02-02 | 2 | -0/+4 |
|/ |
|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-01 | 1 | -0/+1 |
|\ |
|
| * | add multipart/mixed to getIconFromType() | marijus | 2015-02-01 | 1 | -0/+1 |
* | | two tracks proceeding in parallel - first adding the ability to store a digit... | friendica | 2015-02-01 | 1 | -0/+4 |
|/ |
|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-31 | 1 | -1/+1 |
|\ |
|
| * | prevent silly fake null date from causing problems OTW from older builds | Habeas Codice | 2015-01-30 | 1 | -1/+1 |
* | | issue #885, autoperms not working for diaspora connections | friendica | 2015-01-31 | 1 | -1/+1 |
|/ |
|
* | sync_locations() toggle DB flag functions were broken - result of postgres ch... | friendica | 2015-01-30 | 1 | -4/+22 |
* | fix random profiles | friendica | 2015-01-30 | 1 | -2/+3 |
* | let zot_refresh continue without a primary hub if one cannot be found. also w... | friendica | 2015-01-30 | 1 | -5/+14 |
* | bring back inline images | friendica | 2015-01-29 | 1 | -6/+15 |
* | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 29 | -200/+183 |
|\ |
|
| * | implement diaspora profile message (oops) or updated profile photos won't be ... | friendica | 2015-01-29 | 1 | -21/+4 |
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-28 | 2 | -3/+3 |
| |\ |
|
| | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-28 | 9 | -144/+446 |
| | |\ |
|
| | * | | bookmarkedchats: remove extraneous group by, dupes removed on insert | Habeas Codice | 2015-01-28 | 1 | -2/+2 |
| | * | | fix improper group by usage | Habeas Codice | 2015-01-28 | 1 | -1/+1 |
| * | | | remote_user => remote_channel | friendica | 2015-01-28 | 7 | -13/+13 |
| * | | | local_user => local_channel | friendica | 2015-01-28 | 27 | -171/+171 |
| | |/
| |/| |
|
* / | | updates to put rating info into the local xlink before sending it to known di... | friendica | 2015-01-28 | 1 | -0/+10 |
|/ / |
|
* | | make sure we honour the disable_discover_tab pref | friendica | 2015-01-28 | 1 | -1/+5 |
* | | allow diaspora posts to be delivered to the discover channel unless prohibite... | friendica | 2015-01-28 | 1 | -1/+5 |
* | | limit the number of forums that can be tagged in a single post - default is 2... | friendica | 2015-01-28 | 1 | -8/+46 |
* | | add yet another firehose check | friendica | 2015-01-28 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-28 | 1 | -1/+2 |
|\ \ |
|
| * | | show shared button only to local user | marijus | 2015-01-28 | 1 | -1/+2 |
* | | | more minor tweaks to the route mismatch algorithm after watching it all day. | friendica | 2015-01-28 | 1 | -2/+5 |
|/ / |
|
* | | ignore route mismatches on firehose posts to the sys channel. Use whatever pa... | friendica | 2015-01-27 | 1 | -1/+1 |
* | | we need to actually ask for the id from the DB if we want to use it. | friendica | 2015-01-27 | 1 | -1/+1 |
* | | improved route mismatch detection. We will be less strict about the absolute ... | friendica | 2015-01-27 | 2 | -35/+42 |
* | | move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser... | marijus | 2015-01-27 | 2 | -88/+78 |
* | | superblock enhancements | friendica | 2015-01-26 | 1 | -0/+1 |
* | | handle an incoming directory rating message | friendica | 2015-01-26 | 1 | -2/+45 |
* | | provide storage for directory based reputation in the xlink table by setting ... | friendica | 2015-01-26 | 3 | -8/+10 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-26 | 1 | -1/+1 |
|\| |
|
| * | Merge pull request #878 from habeascodice/master | RedMatrix | 2015-01-26 | 1 | -1/+1 |
| |\ |
|
| | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-24 | 2 | -7/+31 |
| | |\ |
|
| | * | | remove superfluous group by | Habeas Codice | 2015-01-24 | 1 | -1/+1 |
* | | | | abstract poco into a single function in socgraph so we can provide different ... | friendica | 2015-01-25 | 1 | -0/+209 |
|/ / / |
|