Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | forgot to add catcloud to the widget doc | friendica | 2014-11-17 | 1 | -0/+6 |
| | |||||
* | requote ignore | friendica | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | place holder | friendica | 2014-11-17 | 1 | -0/+5 |
| | |||||
* | Merge pull request #698 from habeascodice/master | RedMatrix | 2014-11-18 | 2 | -4/+4 |
|\ | | | | | some sql fixes | ||||
| * | implicit type conversion | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | |||||
| * | implicit type conversion | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | |||||
| * | another one | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 191 | -5117/+9279 |
| |\ | |||||
| * | | fix boolean | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | fix the update_unseen stuff on the channel page also | friendica | 2014-11-17 | 1 | -8/+26 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-17 | 16 | -306/+2543 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #697 from pafcu/master | RedMatrix | 2014-11-18 | 1 | -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 Parviainen | 2014-11-17 | 1 | -25/+28 |
| | | | | | | | | | | | | | | | | handle quoted single word names | ||||
| * | | | Merge pull request #696 from habeascodice/master | RedMatrix | 2014-11-18 | 2 | -0/+361 |
| |\ \ \ | | | | | | | | | | | simple commandline mysql to postgres migrator | ||||
| | * | | | simple command-line migrator from mysql to postgres | Habeas Codice | 2014-11-17 | 2 | -0/+361 |
| | | | | | | | | | | | | | | | | | | | | provided with the WorksForMe(tm) warranty of fitness for a purpose implied or otherwise | ||||
| | * | | | Merge branch 'master' of https://github.com/habeascodice/red | habeascodice | 2014-11-17 | 540 | -14892/+28372 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-15 | 26 | -283/+493 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-10-13 | 21 | -957/+1139 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge pull request #695 from pafcu/master | RedMatrix | 2014-11-18 | 13 | -281/+2154 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | Switch to a better datetime picker widget | ||||
| | * | | | | | Use new date selector for item expiry | Stefan Parviainen | 2014-11-17 | 1 | -6/+1 |
| | | | | | | | |||||
| | * | | | | | Switch to a better datetime picker widget | Stefan Parviainen | 2014-11-16 | 12 | -275/+2153 |
| | | | | | | | |||||
* | | | | | | | whitespace | friendica | 2014-11-17 | 1 | -7/+7 |
| | | | | | | | |||||
* | | | | | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 6 | -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 ↵ | friendica | 2014-11-16 | 1 | -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 timers | friendica | 2014-11-16 | 1 | -20/+2 |
| | | | | | | |||||
* | | | | | | speed things up a wee bit | friendica | 2014-11-16 | 2 | -7/+16 |
| | | | | | | |||||
* | | | | | | when in list mode, make the max height half of the normal height before ↵ | friendica | 2014-11-16 | 2 | -18/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'divgrow' kicks in. | ||||
* | | | | | | module cleanup | friendica | 2014-11-16 | 1 | -106/+109 |
| | | | | | | |||||
* | | | | | | blog/list mode display settings | friendica | 2014-11-16 | 2 | -0/+12 |
| | | | | | | |||||
* | | | | | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 4 | -4/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | the summary page) | ||||
* | | | | | | some poller optimisations and a fix for undefined (empty) dbtype which shows ↵ | friendica | 2014-11-16 | 5 | -28/+42 |
|/ / / / / | | | | | | | | | | | | | | | | up as a mysql error that 'rand' isn't found. | ||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix lost $sql_extra in recent sql query changes | marijus | 2014-11-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | minor changes to support forum mode | friendica | 2014-11-15 | 5 | -2968/+2964 |
| | | | | | | |||||
* | | | | | | doc updates | friendica | 2014-11-15 | 152 | -1591/+3305 |
|/ / / / / | |||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-13 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #693 from habeascodice/master | RedMatrix | 2014-11-14 | 1 | -0/+4 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | Add bitwise xor to db_getfunc() | ||||
| | * | | | | Add bitwise xor to db_getfunc() | Habeas Codice | 2014-11-13 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | buttonify some design elements that had not yet been buttonified | friendica | 2014-11-13 | 2 | -7/+7 |
|/ / / / / | |||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-13 | 2 | -29/+33 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #691 from dawnbreak/master | RedMatrix | 2014-11-14 | 2 | -29/+33 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Changed two strange looking places in boot.php. | ||||
| | * | | | | | Fixed a variable conflict in mod/xchan.php. | Klaus Weidenbach | 2014-11-14 | 2 | -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 Weidenbach | 2014-11-13 | 1 | -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 ↵ | friendica | 2014-11-13 | 1 | -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. | friendica | 2014-11-13 | 2 | -13/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #692 from habeascodice/master | RedMatrix | 2014-11-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | missed during merge | ||||
| * | | | | | violates new sql standards | Habeas Codice | 2014-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | missed during merge | ||||
* | | | | | | Merge pull request #690 from habeascodice/master | RedMatrix | 2014-11-14 | 110 | -645/+2258 |
|\| | | | | | |/ / / / |/| | | | | Initial postgres support | ||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 197 | -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 | ||||
* | | | | | update nl | Jeroen | 2014-11-13 | 2 | -2470/+2601 |
| | | | | |