aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-212-10/+174
|\
| * yet another option for the homepagefriendica2014-11-202-10/+174
| |
* | implicit type conversionHabeas Codice2014-11-211-1/+1
|/
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-195-16/+20
|\
| * minor photo flag issue - and some more whitespace editsfriendica2014-11-191-1/+1
| |
| * turn the "adult photo flagging" (which prevents a particularly flagged photo ↵friendica2014-11-181-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 ↵friendica2014-11-181-13/+5
| | | | | | | | likes/dislikes
| * private mail buttonsfriendica2014-11-182-2/+7
| |
| * Revert "Directory shows channel suggestions by default"RedMatrix2014-11-191-40/+2
| |
| * Merge pull request #702 from pafcu/masterRedMatrix2014-11-191-2/+40
| |\ | | | | | | Directory shows channel suggestions by default
| | * Directory shows channel suggestions by defaultStefan Parviainen2014-11-181-2/+40
| | |
| * | Merge pull request #699 from pafcu/masterRedMatrix2014-11-191-0/+6
| |\| | | | | | | Fix dirsearch with quoted single-word term
| | * Fix dirsearch with quoted single-word termStefan Parviainen2014-11-181-0/+6
| | |
* | | Should fix issue #704Habeas Codice2014-11-191-1/+1
|/ / | | | | | | submitter please verify and close
* | allow members to set the per-item "show more" height (separately for network ↵friendica2014-11-173-2/+25
| | | | | | | | and matrix, display and search are system pages and therefore set at 400)
* | requote ignorefriendica2014-11-171-1/+1
| |
* | 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-179-176/+199
| |\ \
| * | | 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-172-30/+32
|\ \ \ \ | | |/ / | |/| |
| * | | 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 #695 from pafcu/masterRedMatrix2014-11-181-5/+4
| |\| | | | | | | | | | Switch to a better datetime picker widget
| | * | Switch to a better datetime picker widgetStefan Parviainen2014-11-161-5/+4
| | | |
* | | | whitespacefriendica2014-11-171-7/+7
| | | |
* | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵friendica2014-11-172-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 ↵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.
* | | module cleanupfriendica2014-11-161-106/+109
| | |
* | | blog/list mode display settingsfriendica2014-11-161-0/+10
| | |
* | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵friendica2014-11-162-2/+13
|/ / | | | | | | the summary page)
* | 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-151-4/+0
|/ /
* | Merge pull request #691 from dawnbreak/masterRedMatrix2014-11-141-10/+9
|\ \ | |/ |/| Changed two strange looking places in boot.php.
| * Fixed a variable conflict in mod/xchan.php.Klaus Weidenbach2014-11-141-10/+9
| | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php.
* | violates new sql standardsHabeas Codice2014-11-131-1/+1
| | | | | | | | missed during merge
* | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-1320-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 adminfriendica2014-11-124-156/+211
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-11-121-1/+2
| |\
| | * make search and advanced search use the same input formmarijus2014-11-121-1/+2
| | |
| * | sys edit ability to menus and menu itemsfriendica2014-11-122-60/+96
| |/
| * extend sys support to layoutsfriendica2014-11-123-131/+211
| |
| * uid not set in webpages.php, start on editwebpage.phpfriendica2014-11-112-38/+72
| |
| * cleanupfriendica2014-11-111-37/+45
| |
| * slow progress on sys publishing, making sure all the data we need is in the ↵friendica2014-11-111-6/+21
| | | | | | | | places we need it but validate it anyway
| * some more work on sys publishingfriendica2014-11-112-33/+40
| |