aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* prevent database hackery from leaking over the wireHabeas Codice2014-11-221-1/+2
|
* somehow missed this oneHabeas Codice2014-11-221-0/+2
| | | | was causing problems with pickup messages originating from postgres servers
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-219-20/+277
|\
| * allow the photo_rand widget to access photos from any channel (useful if the ↵friendica2014-11-201-1/+5
| | | | | | | | widget is used in sys-generated pages). You still need permission.
| * more logging for zot_feed anomaliesfriendica2014-11-201-0/+2
| |
| * more directory tuning to ignore things we already know we can't possibly updatefriendica2014-11-201-1/+6
| |
| * directory: don't try and sync a directory update that points to a hubloc we ↵friendica2014-11-201-1/+18
| | | | | | | | already know is dead and buried.
| * yet another option for the homepagefriendica2014-11-205-18/+186
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-11-202-27/+78
| |\
| * | random photo widgetfriendica2014-11-202-1/+62
| | |
* | | new system config reserved_channelsHabeas Codice2014-11-212-1/+8
| | | | | | | | | | | | prevents members from creating channels in a reserved list
* | | implicit type conversionHabeas Codice2014-11-211-1/+1
| |/ |/|
* | fix driver issue for large dbsHabeas Codice2014-11-201-25/+76
| | | | | | | | add rudimentary resume
* | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-203-2/+8
|\|
| * to-do updatefriendica2014-11-201-0/+1
| |
| * friendica commenters are currently shown using "Diaspora" app. Try and fix ↵friendica2014-11-202-2/+7
| | | | | | | | this where we can.
* | implicit boolean, formattingHabeas Codice2014-11-201-2/+2
|/
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-1917-50/+80
|\
| * change logging of some troublesome or noisy bits so we can figure out what ↵friendica2014-11-193-4/+4
| | | | | | | | is really going on
| * minor photo flag issue - and some more whitespace editsfriendica2014-11-193-6/+6
| |
| * couple of fixes:friendica2014-11-192-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 ↵friendica2014-11-193-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 publicfriendica2014-11-181-0/+12
| |
| * turn the "adult photo flagging" (which prevents a particularly flagged photo ↵friendica2014-11-183-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 ↵friendica2014-11-182-16/+11
| | | | | | | | likes/dislikes
| * private mail buttonsfriendica2014-11-184-23/+28
| |
| * Merge pull request #703 from friendica/revert-702-masterRedMatrix2014-11-194-43/+4
| |\ | | | | | | Revert "Directory shows channel suggestions by default"
| | * Revert "Directory shows channel suggestions by default"RedMatrix2014-11-194-43/+4
| |/
| * Merge pull request #702 from pafcu/masterRedMatrix2014-11-194-4/+43
| |\ | | | | | | Directory shows channel suggestions by default
| | * Directory shows channel suggestions by defaultStefan Parviainen2014-11-184-4/+43
| | |
| * | Merge pull request #701 from habeascodice/masterRedMatrix2014-11-192-3/+5
| |\ \ | | | | | | | | minor postgres fixes
| * \ \ Merge pull request #699 from pafcu/masterRedMatrix2014-11-191-0/+6
| |\ \ \ | | | |/ | | |/| Fix dirsearch with quoted single-word term
| | * | Fix dirsearch with quoted single-word termStefan Parviainen2014-11-181-0/+6
| | | |
* | | | Should fix issue #704Habeas Codice2014-11-191-1/+1
| | | | | | | | | | | | | | | | submitter please verify and close
* | | | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-1818-56/+154
|\| | | | |_|/ |/| |
| * | undo disabled submit buttons now that ACL is initialised when page loadedfriendica2014-11-188-13/+12
| | |
| * | allow members to set the per-item "show more" height (separately for network ↵friendica2014-11-175-18/+31
| | | | | | | | | | | | and matrix, display and search are system pages and therefore set at 400)
| * | forgot to add catcloud to the widget docfriendica2014-11-171-0/+6
| | |
| * | requote ignorefriendica2014-11-171-1/+1
| | |
| * | place holderfriendica2014-11-171-0/+5
| | |
| * | Merge pull request #698 from habeascodice/masterRedMatrix2014-11-182-4/+4
| |\ \ | | | | | | | | some sql fixes
| * | | fix the update_unseen stuff on the channel page alsofriendica2014-11-171-8/+26
| | | |
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-1716-306/+2543
| |\ \ \
| * | | | whitespacefriendica2014-11-171-7/+7
| | | | |
| * | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵friendica2014-11-176-12/+69
| | | | | | | | | | | | | | | | | | | | mark of unseen so as to work with list mode.
* | | | | update docsHabeas Codice2014-11-181-2/+2
| | | | |
* | | | | postgres fixesHabeas Codice2014-11-181-3/+3
| | | | |
* | | | | Merge branch 'master' of https://github.com/habeascodice/redHabeas Codice2014-11-172-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | implicit type conversionHabeas Codice2014-11-171-1/+1
| | | | |
| * | | | implicit type conversionHabeas Codice2014-11-171-1/+1
| | | | |