Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-21 | 9 | -20/+277 |
|\ | |||||
| * | allow the photo_rand widget to access photos from any channel (useful if the ↵ | friendica | 2014-11-20 | 1 | -1/+5 |
| | | | | | | | | widget is used in sys-generated pages). You still need permission. | ||||
| * | more logging for zot_feed anomalies | friendica | 2014-11-20 | 1 | -0/+2 |
| | | |||||
| * | more directory tuning to ignore things we already know we can't possibly update | friendica | 2014-11-20 | 1 | -1/+6 |
| | | |||||
| * | directory: don't try and sync a directory update that points to a hubloc we ↵ | friendica | 2014-11-20 | 1 | -1/+18 |
| | | | | | | | | already know is dead and buried. | ||||
| * | yet another option for the homepage | friendica | 2014-11-20 | 5 | -18/+186 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-20 | 2 | -27/+78 |
| |\ | |||||
| * | | random photo widget | friendica | 2014-11-20 | 2 | -1/+62 |
| | | | |||||
* | | | new system config reserved_channels | Habeas Codice | 2014-11-21 | 2 | -1/+8 |
| | | | | | | | | | | | | prevents members from creating channels in a reserved list | ||||
* | | | implicit type conversion | Habeas Codice | 2014-11-21 | 1 | -1/+1 |
| |/ |/| | |||||
* | | fix driver issue for large dbs | Habeas Codice | 2014-11-20 | 1 | -25/+76 |
| | | | | | | | | add rudimentary resume | ||||
* | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-20 | 3 | -2/+8 |
|\| | |||||
| * | to-do update | friendica | 2014-11-20 | 1 | -0/+1 |
| | | |||||
| * | friendica commenters are currently shown using "Diaspora" app. Try and fix ↵ | friendica | 2014-11-20 | 2 | -2/+7 |
| | | | | | | | | this where we can. | ||||
* | | implicit boolean, formatting | Habeas Codice | 2014-11-20 | 1 | -2/+2 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-19 | 17 | -50/+80 |
|\ | |||||
| * | 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 | 3 | -6/+6 |
| | | |||||
| * | couple of fixes: | friendica | 2014-11-19 | 2 | -1/+6 |
| | | | | | | | | | | - 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 | 3 | -2/+4 |
| | | | | | | | | 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 | 3 | -0/+5 |
| | | | | | | | | 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. | ||||
| * | blog mode - turn the comment link into a button and group with the ↵ | friendica | 2014-11-18 | 2 | -16/+11 |
| | | | | | | | | likes/dislikes | ||||
| * | private mail buttons | friendica | 2014-11-18 | 4 | -23/+28 |
| | | |||||
| * | Merge pull request #703 from friendica/revert-702-master | RedMatrix | 2014-11-19 | 4 | -43/+4 |
| |\ | | | | | | | Revert "Directory shows channel suggestions by default" | ||||
| | * | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 4 | -43/+4 |
| |/ | |||||
| * | Merge pull request #702 from pafcu/master | RedMatrix | 2014-11-19 | 4 | -4/+43 |
| |\ | | | | | | | Directory shows channel suggestions by default | ||||
| | * | Directory shows channel suggestions by default | Stefan Parviainen | 2014-11-18 | 4 | -4/+43 |
| | | | |||||
| * | | Merge pull request #701 from habeascodice/master | RedMatrix | 2014-11-19 | 2 | -3/+5 |
| |\ \ | | | | | | | | | minor postgres fixes | ||||
| * \ \ | Merge pull request #699 from pafcu/master | RedMatrix | 2014-11-19 | 1 | -0/+6 |
| |\ \ \ | | | |/ | | |/| | Fix dirsearch with quoted single-word term | ||||
| | * | | Fix dirsearch with quoted single-word term | Stefan Parviainen | 2014-11-18 | 1 | -0/+6 |
| | | | | |||||
* | | | | Should fix issue #704 | Habeas Codice | 2014-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | submitter please verify and close | ||||
* | | | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-18 | 18 | -56/+154 |
|\| | | | |_|/ |/| | | |||||
| * | | undo disabled submit buttons now that ACL is initialised when page loaded | friendica | 2014-11-18 | 8 | -13/+12 |
| | | | |||||
| * | | allow members to set the per-item "show more" height (separately for network ↵ | friendica | 2014-11-17 | 5 | -18/+31 |
| | | | | | | | | | | | | and matrix, display and search are system pages and therefore set at 400) | ||||
| * | | forgot to add catcloud to the widget doc | friendica | 2014-11-17 | 1 | -0/+6 |
| | | | |||||
| * | | requote ignore | friendica | 2014-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | place holder | friendica | 2014-11-17 | 1 | -0/+5 |
| | | | |||||
| * | | Merge pull request #698 from habeascodice/master | RedMatrix | 2014-11-18 | 2 | -4/+4 |
| |\ \ | | | | | | | | | some sql fixes | ||||
| * | | | fix the update_unseen stuff on the channel page also | friendica | 2014-11-17 | 1 | -8/+26 |
| | | | | |||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-17 | 16 | -306/+2543 |
| |\ \ \ | |||||
| * | | | | whitespace | friendica | 2014-11-17 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 6 | -12/+69 |
| | | | | | | | | | | | | | | | | | | | | mark of unseen so as to work with list mode. | ||||
* | | | | | update docs | Habeas Codice | 2014-11-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | postgres fixes | Habeas Codice | 2014-11-18 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 2 | -3/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | implicit type conversion | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | implicit type conversion | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | another one | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 17 | -307/+2544 |
|\| | | | |