aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\ \ \ \
| | | * \ \ \ \ 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
| * | | | | | | fix booleanHabeas Codice2014-11-171-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-17176-4812/+6741
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
| * | | | | | when in list mode, make the max height half of the normal height before 'divg...friendica2014-11-162-18/+17
| * | | | | | module cleanupfriendica2014-11-161-106/+109
| * | | | | | blog/list mode display settingsfriendica2014-11-162-0/+12
| * | | | | | "list mode" (forum and blog mode, no comments or comment boxes displayed on t...friendica2014-11-164-4/+191
| * | | | | | some poller optimisations and a fix for undefined (empty) dbtype which shows ...friendica2014-11-165-28/+42
| | |/ / / / | |/| | | |
| * | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-151-1/+1
| |\ \ \ \ \
| | * | | | | fix lost $sql_extra in recent sql query changesmarijus2014-11-151-1/+1
| * | | | | | minor changes to support forum modefriendica2014-11-155-2968/+2964
| * | | | | | doc updatesfriendica2014-11-15152-1591/+3305
| |/ / / / /
| * | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-131-0/+4
| |\ \ \ \ \
| | * | | | | Merge pull request #693 from habeascodice/masterRedMatrix2014-11-141-0/+4
| | |\| | | |
| | | * | | | Add bitwise xor to db_getfunc()Habeas Codice2014-11-131-0/+4
| * | | | | | buttonify some design elements that had not yet been buttonifiedfriendica2014-11-132-7/+7
| |/ / / / /
| * | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-132-29/+33
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #691 from dawnbreak/masterRedMatrix2014-11-142-29/+33
| | |\ \ \ \ \
| | | * | | | | Fixed a variable conflict in mod/xchan.php.Klaus Weidenbach2014-11-142-11/+10