Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-21 | 2 | -10/+174 |
|\ | |||||
| * | yet another option for the homepage | friendica | 2014-11-20 | 2 | -10/+174 |
| | | |||||
* | | implicit type conversion | Habeas Codice | 2014-11-21 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-19 | 5 | -16/+20 |
|\ | |||||
| * | minor photo flag issue - and some more whitespace edits | friendica | 2014-11-19 | 1 | -1/+1 |
| | | |||||
| * | turn the "adult photo flagging" (which prevents a particularly flagged photo ↵ | friendica | 2014-11-18 | 1 | -0/+1 |
| | | | | | | | | from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. | ||||
| * | blog mode - turn the comment link into a button and group with the ↵ | friendica | 2014-11-18 | 1 | -13/+5 |
| | | | | | | | | likes/dislikes | ||||
| * | private mail buttons | friendica | 2014-11-18 | 2 | -2/+7 |
| | | |||||
| * | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 1 | -40/+2 |
| | | |||||
| * | Merge pull request #702 from pafcu/master | RedMatrix | 2014-11-19 | 1 | -2/+40 |
| |\ | | | | | | | Directory shows channel suggestions by default | ||||
| | * | Directory shows channel suggestions by default | Stefan Parviainen | 2014-11-18 | 1 | -2/+40 |
| | | | |||||
| * | | 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 |
| | | | |||||
* | | | Should fix issue #704 | Habeas Codice | 2014-11-19 | 1 | -1/+1 |
|/ / | | | | | | | submitter please verify and close | ||||
* | | allow members to set the per-item "show more" height (separately for network ↵ | friendica | 2014-11-17 | 3 | -2/+25 |
| | | | | | | | | and matrix, display and search are system pages and therefore set at 400) | ||||
* | | requote ignore | friendica | 2014-11-17 | 1 | -1/+1 |
| | | |||||
* | | 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 | 9 | -176/+199 |
| |\ \ | |||||
| * | | | 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 | 2 | -30/+32 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 #695 from pafcu/master | RedMatrix | 2014-11-18 | 1 | -5/+4 |
| |\| | | | | | | | | | | Switch to a better datetime picker widget | ||||
| | * | | Switch to a better datetime picker widget | Stefan Parviainen | 2014-11-16 | 1 | -5/+4 |
| | | | | |||||
* | | | | 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 | 2 | -10/+35 |
|/ / / | | | | | | | | | | 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. | ||||
* | | | module cleanup | friendica | 2014-11-16 | 1 | -106/+109 |
| | | | |||||
* | | | blog/list mode display settings | friendica | 2014-11-16 | 1 | -0/+10 |
| | | | |||||
* | | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 2 | -2/+13 |
|/ / | | | | | | | the summary page) | ||||
* | | 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 | 1 | -4/+0 |
|/ / | |||||
* | | Merge pull request #691 from dawnbreak/master | RedMatrix | 2014-11-14 | 1 | -10/+9 |
|\ \ | |/ |/| | Changed two strange looking places in boot.php. | ||||
| * | Fixed a variable conflict in mod/xchan.php. | Klaus Weidenbach | 2014-11-14 | 1 | -10/+9 |
| | | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php. | ||||
* | | violates new sql standards | Habeas Codice | 2014-11-13 | 1 | -1/+1 |
| | | | | | | | | missed during merge | ||||
* | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 20 | -854/+1123 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | this should make all the 'sys' webpage design tools useable by the admin | friendica | 2014-11-12 | 4 | -156/+211 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-12 | 1 | -1/+2 |
| |\ | |||||
| | * | make search and advanced search use the same input form | marijus | 2014-11-12 | 1 | -1/+2 |
| | | | |||||
| * | | sys edit ability to menus and menu items | friendica | 2014-11-12 | 2 | -60/+96 |
| |/ | |||||
| * | extend sys support to layouts | friendica | 2014-11-12 | 3 | -131/+211 |
| | | |||||
| * | uid not set in webpages.php, start on editwebpage.php | friendica | 2014-11-11 | 2 | -38/+72 |
| | | |||||
| * | cleanup | friendica | 2014-11-11 | 1 | -37/+45 |
| | | |||||
| * | slow progress on sys publishing, making sure all the data we need is in the ↵ | friendica | 2014-11-11 | 1 | -6/+21 |
| | | | | | | | | places we need it but validate it anyway | ||||
| * | some more work on sys publishing | friendica | 2014-11-11 | 2 | -33/+40 |
| | |