aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | 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
| |\ \
| * \ \ Merge branch 'master' of https://github.com/habeascodice/redHabeas Codice2014-11-1717-307/+2544
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-17176-4812/+6741
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-11-13342-15326/+24244
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-29320-13293/+17851
| |\ \ \ \ \ \
| * | | | | | | missing custom/ descriptionhabeascodice2014-10-201-0/+2
| * | | | | | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-151-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-1526-283/+493
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-1321-957/+1139
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #699 from pafcu/masterRedMatrix2014-11-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Fix dirsearch with quoted single-word termStefan Parviainen2014-11-181-0/+6
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | 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-17191-5117/+9279
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix booleanHabeas Codice2014-11-171-1/+1
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge remote branch 'upstream/master'habeascodice2014-10-1321-957/+1139
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #695 from pafcu/masterRedMatrix2014-11-1813-281/+2154
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Use new date selector for item expiryStefan Parviainen2014-11-171-6/+1
| | * | | | | | | | Switch to a better datetime picker widgetStefan Parviainen2014-11-1612-275/+2153
* | | | | | | | | | 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
|/ / / / / / / / /
* | | | | | | | | allow somebody to access the "home page content" (whatever that may be) even ...friendica2014-11-161-23/+25
* | | | | | | | | remove old timersfriendica2014-11-161-20/+2
* | | | | | | | | speed things up a wee bitfriendica2014-11-162-7/+16