Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-18 | 18 | -56/+154 |
|\ | |||||
| * | undo disabled submit buttons now that ACL is initialised when page loaded | friendica | 2014-11-18 | 8 | -13/+12 |
| * | allow members to set the per-item "show more" height (separately for network ... | friendica | 2014-11-17 | 5 | -18/+31 |
| * | 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 |
| |\ | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | whitespace | friendica | 2014-11-17 | 1 | -7/+7 |
| * | | | add unseen count and way to mark unseen to list mode. Also fix automatic mark... | friendica | 2014-11-17 | 6 | -12/+69 |
* | | | | update docs | Habeas Codice | 2014-11-18 | 1 | -2/+2 |
* | | | | postgres fixes | Habeas Codice | 2014-11-18 | 1 | -3/+3 |
* | | | | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 2 | -3/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 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 | 17 | -307/+2544 |
|\| | | | |||||
| * | | | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 191 | -5117/+9279 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 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 names and to handl... | Stefan Parviainen | 2014-11-17 | 1 | -25/+28 |
| | * | | | Merge pull request #696 from habeascodice/master | RedMatrix | 2014-11-18 | 2 | -0/+361 |
| | |\ \ \ | |||||
| | | * | | | simple command-line migrator from mysql to postgres | Habeas Codice | 2014-11-17 | 2 | -0/+361 |
| | | * | | | 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 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | 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 |
| * | | | | | | | fix boolean | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-17 | 176 | -4812/+6741 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | allow somebody to access the "home page content" (whatever that may be) even ... | friendica | 2014-11-16 | 1 | -23/+25 |
| * | | | | | | 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 'divg... | friendica | 2014-11-16 | 2 | -18/+17 |
| * | | | | | | 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 t... | friendica | 2014-11-16 | 4 | -4/+191 |
| * | | | | | | some poller optimisations and a fix for undefined (empty) dbtype which shows ... | friendica | 2014-11-16 | 5 | -28/+42 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | 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() | 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 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fixed a variable conflict in mod/xchan.php. | Klaus Weidenbach | 2014-11-14 | 2 | -11/+10 |