aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-01-2929-212/+245
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * implement diaspora profile message (oops) or updated profile photos won't be ↵friendica2015-01-291-21/+4
| | | | | | | | updated
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-282-3/+3
| |\
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-289-144/+446
| | |\
| | * | bookmarkedchats: remove extraneous group by, dupes removed on insertHabeas Codice2015-01-281-2/+2
| | | | | | | | | | | | | | | | suggestedchats: normalize to standard SQL
| | * | fix improper group by usageHabeas Codice2015-01-281-1/+1
| | | |
| * | | remote_user => remote_channelfriendica2015-01-287-13/+13
| | | |
| * | | local_user => local_channelfriendica2015-01-2827-171/+171
| | |/ | |/|
| * | make sure we honour the disable_discover_tab preffriendica2015-01-281-1/+5
| | |
| * | allow diaspora posts to be delivered to the discover channel unless ↵friendica2015-01-281-1/+5
| | | | | | | | | | | | prohibited from doing so.
| * | limit the number of forums that can be tagged in a single post - default is ↵friendica2015-01-281-8/+46
| | | | | | | | | | | | 2. The reason is simple - count how many posts would be in transit simultaneously if this was unlimited and somebody tagged 40-50 forums. In practice when used legitimately - we've rarely seen more than two, in fact I don't recall seeing more than two ever. Typically it is one and occasionally two. Changing the default is tricky - a client system cannot do it, but the site hosting a forum can choose to. Since not all sites that host forums will choose to do so, the ordering of the mentions would then be important.
| * | add yet another firehose checkfriendica2015-01-281-1/+1
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-1/+2
| |\ \
| | * | show shared button only to local usermarijus2015-01-281-1/+2
| | | |
| * | | more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-281-2/+5
| |/ /
* | | more message restrict conversionsfriendica2015-01-297-45/+44
| | |
* | | Merge branch 'master' into tresfriendica2015-01-278-134/+177
|\| | | | | | | | | | | | | | Conflicts: include/socgraph.php
| * | ignore route mismatches on firehose posts to the sys channel. Use whatever ↵friendica2015-01-271-1/+1
| | | | | | | | | | | | parent route we have. By definition we aren't going to have permission issues with these things.
| * | we need to actually ask for the id from the DB if we want to use it.friendica2015-01-271-1/+1
| | |
| * | improved route mismatch detection. We will be less strict about the absolute ↵friendica2015-01-272-35/+42
| | | | | | | | | | | | route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
| * | move userReadableSize() and getIconFromType() from ↵marijus2015-01-272-88/+78
| | | | | | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
| * | superblock enhancementsfriendica2015-01-261-0/+1
| | |
| * | handle an incoming directory rating messagefriendica2015-01-261-2/+45
| | |
| * | provide storage for directory based reputation in the xlink table by setting ↵friendica2015-01-263-8/+10
| | | | | | | | | | | | xlink_static = 1, so that xlink_static = 0 is traditional poco linkages
* | | sql typofriendica2015-01-271-1/+1
| | |
* | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵friendica2015-01-2615-94/+422
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-261-1/+1
| |\|
| | * Merge pull request #878 from habeascodice/masterRedMatrix2015-01-261-1/+1
| | |\ | | | | | | | | ping @mike
| | | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-242-7/+31
| | | |\
| | | * | remove superfluous group byHabeas Codice2015-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | this gets called from a zot post_post dealing with a specific messageid and hubloc_hash combination. grouping by site doesn't make sense here and it gets grouped when pulled back out elsewhere anyway
| * | | | abstract poco into a single function in socgraph so we can provide different ↵friendica2015-01-251-0/+209
| |/ / / | | | | | | | | | | | | wrappers for it providing slightly different functionality.
| * | | turn "large photo thumbnails" into a feature.friendica2015-01-252-6/+12
| | | |
| * | | rework the new connection stuff so we don't need a "permissions have been ↵friendica2015-01-251-14/+9
| | | | | | | | | | | | | | | | changed but not saved" message.
| * | | recognise opus as an audio filefriendica2015-01-252-2/+2
| | | |
| * | | don't set a rating of 1 on old sites that report poco rating as an array. ↵friendica2015-01-251-1/+1
| | |/ | |/| | | | | | | Just set it to 0. It will be fixed whenever they upgrade.
| * | Merge pull request #877 from solstag/masterRedMatrix2015-01-251-1/+2
| |\ \ | | | | | | | | Call sslify with an extra path element so files keep their names
| | * | Call sslify with an extra path element so files keep their namesAlexandre Hannud Abdo2015-01-251-1/+2
| | |/ | | | | | | | | | | | | | | | | | | The main motivation for this is when saving images one doesn't need to inspect and manually input the file's actual name. There might be other benefits, perhaps in automated downloads.
| * / Check allowed emails, also add blacklisting forChristian Vogeley2015-01-251-6/+29
| |/ | | | | | | | | not allowed emails: config:'system','not_allowed_email'
| * optimize check querymarijus2015-01-241-2/+7
| |
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-241-3/+2
| |\
| | * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-231-97/+95
| | |\
| | * | onedirsync issue reported by habeas codicefriendica2015-01-231-3/+2
| | | |
| * | | the old item must be removed before the new is createdmarijus2015-01-241-1/+8
| | |/ | |/|
| * | disable noticesmarijus2015-01-241-2/+2
| | |
| * | some more kissmarijus2015-01-241-65/+51
| | |
| * | typomarijus2015-01-231-1/+1
| | |
| * | we get the object info before it is deleted nowmarijus2015-01-231-12/+12
| | |
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-231-0/+9
| |\|
| | * provide pref to set default photo resolution for posts to something other ↵friendica2015-01-231-0/+9
| | | | | | | | | | | | than 2. The only acceptable option is 1. (640)
| * | some code restructuremarijus2015-01-231-43/+55
| |/