Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | new system config reserved_channels | Habeas Codice | 2014-11-21 | 1 | -1/+6 |
| | | | | prevents members from creating channels in a reserved list | ||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-20 | 1 | -1/+6 |
|\ | |||||
| * | friendica commenters are currently shown using "Diaspora" app. Try and fix ↵ | friendica | 2014-11-20 | 1 | -1/+6 |
| | | | | | | | | this where we can. | ||||
* | | implicit boolean, formatting | Habeas Codice | 2014-11-20 | 1 | -2/+2 |
|/ | |||||
* | change logging of some troublesome or noisy bits so we can figure out what ↵ | friendica | 2014-11-19 | 3 | -4/+4 |
| | | | | is really going on | ||||
* | minor photo flag issue - and some more whitespace edits | friendica | 2014-11-19 | 2 | -5/+5 |
| | |||||
* | couple of fixes: | friendica | 2014-11-19 | 1 | -0/+5 |
| | | | | | - significantly increase the content availability on the discover channel - fix the button group on the blog/list mode which made the border on a single comment button a bit wonky | ||||
* | there's still a permission issue delivering a public post directly to the ↵ | friendica | 2014-11-19 | 2 | -1/+3 |
| | | | | sys channel (on the local system), but this puts the local sys channel in the public delivery chain and fixes an issue with unseen counts showing on the discover page (where you can't do anything about it). | ||||
* | add sys channel to public recips if scope public | friendica | 2014-11-18 | 1 | -0/+12 |
| | |||||
* | turn the "adult photo flagging" (which prevents a particularly flagged photo ↵ | friendica | 2014-11-18 | 1 | -0/+1 |
| | | | | from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. | ||||
* | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 1 | -0/+1 |
| | |||||
* | Merge pull request #702 from pafcu/master | RedMatrix | 2014-11-19 | 1 | -1/+0 |
|\ | | | | | Directory shows channel suggestions by default | ||||
| * | Directory shows channel suggestions by default | Stefan Parviainen | 2014-11-18 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #701 from habeascodice/master | RedMatrix | 2014-11-19 | 1 | -3/+3 |
|\ \ | | | | | | | minor postgres fixes | ||||
| * | | postgres fixes | Habeas Codice | 2014-11-18 | 1 | -3/+3 |
| | | | |||||
* | | | place holder | friendica | 2014-11-17 | 1 | -0/+5 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-17 | 1 | -17/+28 |
|\| | | |||||
| * | | Merge pull request #695 from pafcu/master | RedMatrix | 2014-11-18 | 1 | -17/+28 |
| |\| | | | | | | | Switch to a better datetime picker widget | ||||
| | * | Switch to a better datetime picker widget | Stefan Parviainen | 2014-11-16 | 1 | -17/+28 |
| | | | |||||
* | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 1 | -0/+24 |
|/ / | | | | | | | mark of unseen so as to work with list mode. | ||||
* | | remove old timers | friendica | 2014-11-16 | 1 | -20/+2 |
| | | |||||
* | | speed things up a wee bit | friendica | 2014-11-16 | 2 | -7/+16 |
| | | |||||
* | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 1 | -2/+3 |
| | | | | | | | | the summary page) | ||||
* | | some poller optimisations and a fix for undefined (empty) dbtype which shows ↵ | friendica | 2014-11-16 | 3 | -26/+39 |
|/ | | | | up as a mysql error that 'rand' isn't found. | ||||
* | minor changes to support forum mode | friendica | 2014-11-15 | 2 | -21/+7 |
| | |||||
* | Merge pull request #693 from habeascodice/master | RedMatrix | 2014-11-14 | 1 | -0/+4 |
|\ | | | | | Add bitwise xor to db_getfunc() | ||||
| * | Add bitwise xor to db_getfunc() | Habeas Codice | 2014-11-13 | 1 | -0/+4 |
| | | |||||
* | | mysql driver - in debug mode for statements that return true/false report ↵ | friendica | 2014-11-13 | 1 | -1/+1 |
| | | | | | | | | the sql along with the result so we can match it to an offending statement. This has bugged me for some time but never got around to fixing it until now. | ||||
* | | put timeout code in place but don't turn it on. | friendica | 2014-11-13 | 1 | -6/+7 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 21 | -129/+750 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php | ||||
| * | Some Doxygen documentation. | Klaus Weidenbach | 2014-11-13 | 1 | -44/+128 |
| | | | | | | | | | | Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too. | ||||
| * | make search and advanced search use the same input form | marijus | 2014-11-12 | 1 | -2/+1 |
| | | |||||
| * | cleanup | friendica | 2014-11-11 | 2 | -2/+9 |
| | | |||||
| * | slow progress on sys publishing, making sure all the data we need is in the ↵ | friendica | 2014-11-11 | 2 | -2/+2 |
| | | | | | | | | places we need it but validate it anyway | ||||
| * | a couple of places where we need to look for a sys channel euid. | friendica | 2014-11-11 | 1 | -0/+7 |
| | | |||||
| * | and urlencode that. | friendica | 2014-11-11 | 1 | -2/+2 |
| | | |||||
| * | Most directory searches are POST. get_query_args() only handles GET so that ↵ | friendica | 2014-11-11 | 1 | -1/+9 |
| | | | | | | | | had to be fixed or page 2 of directory search results wouldn't match the search. | ||||
| * | the code is a bit crufty, but this should fix issue #687 | friendica | 2014-11-11 | 1 | -3/+10 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-10 | 1 | -3/+3 |
| |\ | |||||
| | * | Merge pull request #685 from zzottel/master | RedMatrix | 2014-11-11 | 1 | -3/+3 |
| | |\ | | | | | | | | | set channel_w_stream to 0 for forum roles | ||||
| | | * | set channel_w_stream to 0 for forum roles | zottel | 2014-11-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | issue #683 - don't linkify homepage field without validating | friendica | 2014-11-10 | 1 | -0/+2 |
| |/ / | |||||
| * | | indicate public forums in directory results (there will be some [possibly ↵ | friendica | 2014-11-10 | 1 | -4/+5 |
| | | | | | | | | | | | | considerable] lag time before existing forums are correctly tagged). | ||||
| * | | add public forum identification to libzot. No attempt is made to identify ↵ | friendica | 2014-11-10 | 1 | -2/+6 |
| |/ | | | | | | | other types of forums or weird custom channel permissions. If the channel is auto-accept and taggable, it's a public forum. | ||||
| * | Use consistent terminology for channel directory | Stefan Parviainen | 2014-11-09 | 1 | -1/+1 |
| | | |||||
| * | tgroup_check - decrypt if obscured before checking body text for reshares | friendica | 2014-11-07 | 1 | -1/+9 |
| | | |||||
| * | revert that bit | friendica | 2014-11-07 | 1 | -7/+1 |
| | | |||||
| * | visible flag reversed | friendica | 2014-11-06 | 1 | -1/+1 |
| | | |||||
| * | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 1 | -4/+10 |
| | | | | | | | | view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. | ||||
| * | don't overwrite $x (contains import_xchan result) with role permissions | zottel | 2014-11-06 | 1 | -3/+3 |
| | |