aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* yet another option for the homepagefriendica2014-11-205-18/+186
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-202-27/+78
|\
| * fix driver issue for large dbsHabeas Codice2014-11-201-25/+76
| * Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-203-2/+8
| |\
| * | implicit boolean, formattingHabeas Codice2014-11-201-2/+2
* | | random photo widgetfriendica2014-11-202-1/+62
| |/ |/|
* | to-do updatefriendica2014-11-201-0/+1
* | friendica commenters are currently shown using "Diaspora" app. Try and fix th...friendica2014-11-202-2/+7
|/
* 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 is...friendica2014-11-193-4/+4
| * minor photo flag issue - and some more whitespace editsfriendica2014-11-193-6/+6
| * couple of fixes:friendica2014-11-192-1/+6
| * there's still a permission issue delivering a public post directly to the sys...friendica2014-11-193-2/+4
| * 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
| * blog mode - turn the comment link into a button and group with the likes/disl...friendica2014-11-182-16/+11
| * 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"RedMatrix2014-11-194-43/+4
| |/
| * Merge pull request #702 from pafcu/masterRedMatrix2014-11-194-4/+43
| |\
| | * Directory shows channel suggestions by defaultStefan Parviainen2014-11-184-4/+43
| * | Merge pull request #701 from habeascodice/masterRedMatrix2014-11-192-3/+5
| |\ \
| * \ \ Merge pull request #699 from pafcu/masterRedMatrix2014-11-191-0/+6
| |\ \ \ | | | |/ | | |/|
| | * | Fix dirsearch with quoted single-word termStefan Parviainen2014-11-181-0/+6
* | | | Should fix issue #704Habeas Codice2014-11-191-1/+1
* | | | 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
| * | 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
| |\ \
| * | | 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 mark...friendica2014-11-176-12/+69
* | | | | 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
| * | | | another oneHabeas Codice2014-11-171-1/+1
* | | | | Merge branch 'master' of https://github.com/habeascodice/redHabeas Codice2014-11-1717-307/+2544
|\| | | |
| * | | | Merge branch 'master' of https://github.com/habeascodice/redHabeas Codice2014-11-17191-5117/+9279
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #697 from pafcu/masterRedMatrix2014-11-181-25/+28
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix dirsearch parser to not get confused by logic terms in names and to handl...Stefan Parviainen2014-11-171-25/+28
| | * | | Merge pull request #696 from habeascodice/masterRedMatrix2014-11-182-0/+361
| | |\ \ \
| | | * | | simple command-line migrator from mysql to postgresHabeas Codice2014-11-172-0/+361
| | | * | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-11-17540-14892/+28372
| | | |\ \ \
| | | * \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-1526-283/+493
| | | |\ \ \ \