Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #703 from friendica/revert-702-master | RedMatrix | 2014-11-19 | 4 | -43/+4 |
|\ | | | | | Revert "Directory shows channel suggestions by default" | ||||
| * | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 4 | -43/+4 |
|/ | |||||
* | Merge pull request #702 from pafcu/master | RedMatrix | 2014-11-19 | 4 | -4/+43 |
|\ | | | | | Directory shows channel suggestions by default | ||||
| * | Directory shows channel suggestions by default | Stefan Parviainen | 2014-11-18 | 4 | -4/+43 |
| | | |||||
* | | Merge pull request #701 from habeascodice/master | RedMatrix | 2014-11-19 | 2 | -3/+5 |
|\ \ | | | | | | | minor postgres fixes | ||||
| * | | 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 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 17 | -307/+2544 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-17 | 176 | -4812/+6741 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/habeascodice/red | habeascodice | 2014-11-13 | 342 | -15326/+24244 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-10-29 | 320 | -13293/+17851 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | missing custom/ description | habeascodice | 2014-10-20 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/habeascodice/red | habeascodice | 2014-10-15 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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 #699 from pafcu/master | RedMatrix | 2014-11-19 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Fix dirsearch with quoted single-word term | ||||
| * | | | | | | | | | | Fix dirsearch with quoted single-word term | Stefan Parviainen | 2014-11-18 | 1 | -0/+6 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and matrix, display and search are system pages and therefore set at 400) | ||||
* | | | | | | | | | | | 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) |