Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-01-27 | 20 | -166/+302 |
|\ | | | | | | | | | Conflicts: include/socgraph.php | ||||
| * | allow RSS connections in the type 'a' autocomplete results as that is used ↵ | friendica | 2015-01-27 | 1 | -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 ↵ | friendica | 2015-01-27 | 1 | -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. | 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 |
| | | | | | | | | 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_merge | friendica | 2015-01-27 | 6 | -102/+154 |
| |\ | |||||
| | * | tpl and css cleanup | marijus | 2015-01-27 | 2 | -12/+5 |
| | | | |||||
| | * | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 6 | -102/+161 |
| | | | | | | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme | ||||
| * | | allow doc/help system to use subdirs | friendica | 2015-01-27 | 2 | -7/+15 |
| |/ | |||||
| * | superblock enhancements | friendica | 2015-01-26 | 2 | -5/+10 |
| | | |||||
| * | 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 | 7 | -11/+28 |
| | | | | | | | | xlink_static = 1, so that xlink_static = 0 is traditional poco linkages | ||||
* | | sql typo | friendica | 2015-01-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵ | friendica | 2015-01-26 | 99 | -1998/+1864 |
|\| | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-26 | 4 | -4/+5 |
| |\ | |||||
| | * | Add pg support channel to external resources | Habeas Codice | 2015-01-25 | 1 | -0/+1 |
| | | | |||||
| | * | Merge pull request #878 from habeascodice/master | RedMatrix | 2015-01-26 | 3 | -4/+4 |
| | |\ | | | | | | | | | ping @mike | ||||
| | | * | typo | Habeas Codice | 2015-01-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | update schema | Habeas Codice | 2015-01-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | suppress notices that might be confusing | Habeas Codice | 2015-01-25 | 1 | -2/+2 |
| | | | | |||||
| | | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-24 | 6 | -596/+31 |
| | | |\ | |||||
| | | * | | remove superfluous group by | Habeas Codice | 2015-01-24 | 1 | -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 results | friendica | 2015-01-26 | 2 | -1/+18 |
| | | | | | |||||
| * | | | | abstract poco into a single function in socgraph so we can provide different ↵ | friendica | 2015-01-25 | 3 | -207/+220 |
| |/ / / | | | | | | | | | | | | | wrappers for it providing slightly different functionality. | ||||
| * | | | we also don't need a profile selector when editing our default permissions. | friendica | 2015-01-25 | 1 | -0/+2 |
| | | | | |||||
| * | | | don't hide the scary stuff when editing self permissions. | friendica | 2015-01-25 | 1 | -2/+8 |
| | | | | |||||
| * | | | roadmap update | friendica | 2015-01-25 | 1 | -0/+4 |
| | | | | |||||
| * | | | Hide all the scary decision making stuff that sends intellectually ↵ | friendica | 2015-01-25 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | challenged beings into siezures and brain melt-downs and online freak-outs. | ||||
| * | | | turn "large photo thumbnails" into a feature. | friendica | 2015-01-25 | 2 | -6/+12 |
| | | | | |||||
| * | | | rework the new connection stuff so we don't need a "permissions have been ↵ | friendica | 2015-01-25 | 3 | -28/+16 |
| | | | | | | | | | | | | | | | | changed but not saved" message. | ||||
| * | | | Merge pull request #879 from anaqreon/patch-1 | RedMatrix | 2015-01-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | misspelling | ||||
| | * | | | misspelling | anaqreon | 2015-01-25 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | recognise opus as an audio file | friendica | 2015-01-25 | 2 | -2/+2 |
| | | | | |||||
| * | | | move connection approval checkbox to top of page (above the sliders) - ↵ | friendica | 2015-01-25 | 1 | -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. ↵ | friendica | 2015-01-25 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | Just set it to 0. It will be fixed whenever they upgrade. | ||||
| * | | Merge pull request #877 from solstag/master | RedMatrix | 2015-01-25 | 1 | -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 names | Alexandre Hannud Abdo | 2015-01-25 | 1 | -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/master | RedMatrix | 2015-01-25 | 5 | -595/+29 |
| |\ \ \ | | |_|/ | |/| | | Check allowed emails, also add blacklisting for | ||||
| | * | | Check allowed emails, also add blacklisting for | Christian Vogeley | 2015-01-25 | 5 | -595/+29 |
| | |/ | | | | | | | | | | | | | not allowed emails: config:'system','not_allowed_email' | ||||
| * | | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-24 | 1 | -3/+15 |
| |\| | |||||
| | * | optimize check query | marijus | 2015-01-24 | 1 | -2/+7 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2015-01-24 | 6 | -7/+12 |
| | |\ | |||||
| | * | | the old item must be removed before the new is created | marijus | 2015-01-24 | 1 | -1/+8 |
| | | | | |||||
| * | | | standardize sql | Habeas Codice | 2015-01-24 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | unmatched parens | Habeas Codice | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-23 | 7 | -131/+115 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-23 | 58 | -1239/+1497 |
| | |\ \ | |||||
| | | * \ | Merge pull request #875 from zzottel/master | RedMatrix | 2015-01-24 | 2 | -0/+4 |
| | | |\ \ | | | | |/ | | | |/| | add db update 1131/1132 to database schemas | ||||
| | | | * | add db update 1131/1132 to database schemas | zottel | 2015-01-23 | 2 | -0/+4 |
| | | | | | |||||
| | | * | | disable notices | marijus | 2015-01-24 | 1 | -2/+2 |
| | | | | |