| Commit message (Expand) | Author | Age | Files | Lines |
* | Nothing here, move along. | friendica | 2014-11-11 | 1 | -2/+2 |
* | add some subtle delineation to directory entries, remove forced link on homep... | friendica | 2014-11-11 | 3 | -2/+5 |
* | some work on directory widgets | marijus | 2014-11-11 | 6 | -57/+38 |
* | tie the narrow nav-pills to .widget instead of aside | marijus | 2014-11-11 | 2 | -4/+5 |
* | the code is a bit crufty, but this should fix issue #687 | friendica | 2014-11-11 | 3 | -4/+27 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-10 | 3 | -32/+28 |
|\ |
|
| * | Merge pull request #685 from zzottel/master | RedMatrix | 2014-11-11 | 1 | -3/+3 |
| |\ |
|
| | * | set channel_w_stream to 0 for forum roles | zottel | 2014-11-10 | 1 | -3/+3 |
| * | | Merge pull request #686 from beardy-unixer/master | RedMatrix | 2014-11-11 | 2 | -29/+25 |
| |\ \ |
|
| | * | | Add a new theme flag - library. Not directly available to be used itself but | Thomas Willingham | 2014-11-10 | 2 | -29/+25 |
| | |/ |
|
* | / | issue #683 - don't linkify homepage field without validating | friendica | 2014-11-10 | 3 | -1/+5 |
|/ / |
|
* | | indicate public forums in directory results (there will be some [possibly con... | friendica | 2014-11-10 | 4 | -4/+16 |
* | | add public forum identification to libzot. No attempt is made to identify oth... | friendica | 2014-11-10 | 3 | -2/+23 |
* | | class is a reserved word | friendica | 2014-11-10 | 3 | -6/+6 |
|/ |
|
* | add defaults to database tables | friendica | 2014-11-09 | 2 | -190/+2467 |
* | menu page cleanup | friendica | 2014-11-09 | 3 | -16/+21 |
* | remove extraneous logging | friendica | 2014-11-09 | 1 | -4/+1 |
* | directory listing shows phantom keywords | friendica | 2014-11-09 | 2 | -2/+4 |
* | Merge pull request #682 from pafcu/master | RedMatrix | 2014-11-09 | 1 | -1/+1 |
|\ |
|
| * | Use consistent terminology for channel directory | Stefan Parviainen | 2014-11-09 | 1 | -1/+1 |
* | | Merge pull request #681 from pafcu/master | RedMatrix | 2014-11-09 | 5 | -241/+96 |
|\| |
|
| * | New layout for directory | Stefan Parviainen | 2014-11-09 | 5 | -241/+96 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-08 | 13 | -6235/+6474 |
|\ \ |
|
| * | | prevent posting before acl got populated since this will disregard the defaul... | marijus | 2014-11-08 | 6 | -10/+11 |
| * | | Merge pull request #680 from pafcu/master | RedMatrix | 2014-11-09 | 2 | -2/+6 |
| |\| |
|
| | * | Fix merge conflict | Stefan Parviainen | 2014-11-08 | 315 | -13484/+19854 |
| | |\
| | |/
| |/| |
|
| * | | Document reinstalling, or saying don't do that without explicitly stating don... | Thomas Willingham | 2014-11-08 | 1 | -2/+10 |
| * | | Merge pull request #678 from zzottel/master | zzottel | 2014-11-07 | 2 | -3/+4 |
| |\ \ |
|
| | * | | update to German help files | zottel | 2014-11-07 | 2 | -3/+4 |
| * | | | Merge pull request #677 from zzottel/master | zzottel | 2014-11-07 | 2 | -6218/+6443 |
| |\| | |
|
| | * | | update to German strings | zottel | 2014-11-07 | 2 | -6218/+6443 |
| |/ / |
|
| | * | Highlight badge on hover | Stefan Parviainen | 2014-11-08 | 1 | -0/+4 |
| | * | Fix highlighting of login button | Stefan Parviainen | 2014-11-08 | 1 | -2/+2 |
* | | | add acl loading fix to menu-item edits | friendica | 2014-11-08 | 2 | -2/+2 |
|/ / |
|
* | | tgroup_check - decrypt if obscured before checking body text for reshares | friendica | 2014-11-07 | 1 | -1/+9 |
* | | revert that bit | friendica | 2014-11-07 | 1 | -7/+1 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 2 | -6/+7 |
|\ \ |
|
| * | | provide lockstate for photo edit | marijus | 2014-11-07 | 2 | -6/+7 |
* | | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 |
* | | | rev update | friendica | 2014-11-07 | 2 | -522/+609 |
* | | | doc updates | friendica | 2014-11-07 | 102 | -406/+1576 |
|/ / |
|
* | | include self in load_contact_links so you don't get a connect menu entry for ... | friendica | 2014-11-06 | 1 | -3/+2 |
* | | Merge pull request #676 from magicoli/master | RedMatrix | 2014-11-07 | 2 | -6/+6 |
|\ \ |
|
| * | | fix nbsp tag typoes in french translation | Olivier van Helden (hal) | 2014-11-07 | 2 | -6/+6 |
|/ / |
|
* | | visible flag reversed | friendica | 2014-11-06 | 1 | -1/+1 |
* | | Provide a way to mark photos as adult and hide them from the default album vi... | friendica | 2014-11-06 | 4 | -32/+45 |
* | | Merge pull request #675 from zzottel/master | RedMatrix | 2014-11-07 | 1 | -3/+3 |
|\ \ |
|
| * | | don't overwrite $x (contains import_xchan result) with role permissions | zottel | 2014-11-06 | 1 | -3/+3 |
|/ / |
|
* | | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 |
* | | make sure the "tagcloud" actually shows hashtags. So we don't confuse folks w... | friendica | 2014-11-06 | 1 | -1/+1 |