aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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 values and to ...
| | * | Fix dirsearch parser to not get confused by logic terms in names and to ↵Stefan Parviainen2014-11-171-25/+28
| | | | | | | | | | | | | | | | handle quoted single word names
| * | | Merge pull request #696 from habeascodice/masterRedMatrix2014-11-182-0/+361
| |\ \ \ | | | | | | | | | | simple commandline mysql to postgres migrator
| | * | | simple command-line migrator from mysql to postgresHabeas Codice2014-11-172-0/+361
| | | | | | | | | | | | | | | | | | | | provided with the WorksForMe(tm) warranty of fitness for a purpose implied or otherwise
| | * | | 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
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | Switch to a better datetime picker widget
| | * | | | | 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 ↵friendica2014-11-176-12/+69
|/ / / / / / | | | | | | | | | | | | | | | | | | mark of unseen so as to work with list mode.
* | | | | | allow somebody to access the "home page content" (whatever that may be) even ↵friendica2014-11-161-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | after logging in by including a home/splash argument. It appears that nothing else is required to provide 'sys' channel webpage contents except a link in the admin page to create them. There *may* be an issue with comanche theme selection but we'll cross that bridge when we come to it. Also thinking that we might want to map /home/foo to /page/sys/foo in the longer term scheme of things.
* | | | | | 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 ↵friendica2014-11-162-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | 'divgrow' kicks in.
* | | | | | 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 ↵friendica2014-11-164-4/+191
| | | | | | | | | | | | | | | | | | | | | | | | the summary page)
* | | | | | some poller optimisations and a fix for undefined (empty) dbtype which shows ↵friendica2014-11-165-28/+42
|/ / / / / | | | | | | | | | | | | | | | up as a mysql error that 'rand' isn't found.
* | | | | 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()
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Changed two strange looking places in boot.php.
| | * | | | | Fixed a variable conflict in mod/xchan.php.Klaus Weidenbach2014-11-142-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php.
| | * | | | | Changed two strange looking places in boot.php.Klaus Weidenbach2014-11-131-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been two places that looked wrong, but I don't know how I can test them. So please review and test if I am not wrong.
* | | | | | | mysql driver - in debug mode for statements that return true/false report ↵friendica2014-11-131-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | the sql along with the result so we can match it to an offending statement. This has bugged me for some time but never got around to fixing it until now.
* | | | | | put timeout code in place but don't turn it on.friendica2014-11-132-13/+16
| | | | | |
* | | | | | Merge pull request #692 from habeascodice/masterRedMatrix2014-11-141-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | missed during merge
| * | | | | violates new sql standardsHabeas Codice2014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | missed during merge
* | | | | | Merge pull request #690 from habeascodice/masterRedMatrix2014-11-14110-645/+2258
|\| | | | | | |/ / / / |/| | | | Initial postgres support
| * | | | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-13197-11360/+17155
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php