aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into pocoratefriendica2015-01-289-21/+75
|\
| * 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.
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-4/+2
| |\
| | * fix /view/de/lostpass_eml.tplmarijus2015-01-281-4/+2
| | |
| * | Revert "issue with de email template (lostpass_eml.tpl)"friendica2015-01-281-1/+1
| | | | | | | | | | | | This reverts commit 3e8fa8c8a2cd125dd7aa0a9482e98ae39db61e52.
| * | issue with de email template (lostpass_eml.tpl)friendica2015-01-281-1/+1
| |/
| * add yet another firehose checkfriendica2015-01-281-1/+1
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-283-2/+5
| |\
| | * show shared button only to local usermarijus2015-01-282-1/+4
| | |
| | * no need for new line here - spacing is done via cssmarijus2015-01-281-1/+1
| | |
| * | more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-282-3/+6
| |/
| * allow RSS connections in the type 'a' autocomplete results as that is used ↵friendica2015-01-271-3/+7
| | | | | | | | for channel sources. Without it a feed cannot be selected as a channel source.
| * 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
| |
* | first cut at direntry template, right now just provide a mockup with a ↵friendica2015-01-271-0/+12
|/ | | | slider and rating count to look at.
* 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.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-276-102/+154
|\
| * tpl and css cleanupmarijus2015-01-272-12/+5
| |
| * move userReadableSize() and getIconFromType() from ↵marijus2015-01-276-102/+161
| | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
* | allow doc/help system to use subdirsfriendica2015-01-272-7/+15
|/
* superblock enhancementsfriendica2015-01-262-5/+10
|
* handle an incoming directory rating messagefriendica2015-01-261-2/+45
|
* provide storage for directory based reputation in the xlink table by setting ↵friendica2015-01-267-11/+28
| | | | xlink_static = 1, so that xlink_static = 0 is traditional poco linkages
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-264-4/+5
|\
| * Add pg support channel to external resourcesHabeas Codice2015-01-251-0/+1
| |
| * Merge pull request #878 from habeascodice/masterRedMatrix2015-01-263-4/+4
| |\ | | | | | | ping @mike
| | * typoHabeas Codice2015-01-251-1/+1
| | |
| | * update schemaHabeas Codice2015-01-251-1/+1
| | |
| | * suppress notices that might be confusingHabeas Codice2015-01-251-2/+2
| | |
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-246-596/+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
* | | | provide a json feed of search resultsfriendica2015-01-262-1/+18
| | | |
* | | | abstract poco into a single function in socgraph so we can provide different ↵friendica2015-01-253-207/+220
|/ / / | | | | | | | | | wrappers for it providing slightly different functionality.
* | | we also don't need a profile selector when editing our default permissions.friendica2015-01-251-0/+2
| | |
* | | don't hide the scary stuff when editing self permissions.friendica2015-01-251-2/+8
| | |
* | | roadmap updatefriendica2015-01-251-0/+4
| | |
* | | Hide all the scary decision making stuff that sends intellectually ↵friendica2015-01-252-0/+5
| | | | | | | | | | | | challenged beings into siezures and brain melt-downs and online freak-outs.
* | | 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-253-28/+16
| | | | | | | | | | | | changed but not saved" message.
* | | Merge pull request #879 from anaqreon/patch-1RedMatrix2015-01-261-1/+1
|\ \ \ | | | | | | | | misspelling
| * | | misspellinganaqreon2015-01-251-1/+1
|/ / /
* | | recognise opus as an audio filefriendica2015-01-252-2/+2
| | |
* | | move connection approval checkbox to top of page (above the sliders) - ↵friendica2015-01-251-11/+8
| | | | | | | | | | | | instead of being in between rating and rating text.
* | | don't set a rating of 1 on old sites that report poco rating as an array. ↵friendica2015-01-252-2/+2
| |/ |/| | | | | 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.
* | | Merge pull request #876 from cvogeley/masterRedMatrix2015-01-255-595/+29
|\ \ \ | |_|/ |/| | Check allowed emails, also add blacklisting for
| * | Check allowed emails, also add blacklisting forChristian Vogeley2015-01-255-595/+29
| |/ | | | | | | | | not allowed emails: config:'system','not_allowed_email'