aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-123-19/+9
|\
| * make search and advanced search use the same input formmarijus2014-11-123-19/+9
* | History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff.friendica2014-11-121-0/+48
* | sys edit ability to menus and menu itemsfriendica2014-11-122-60/+96
|/
* extend sys support to layoutsfriendica2014-11-124-132/+212
* uid not set in webpages.php, start on editwebpage.phpfriendica2014-11-112-38/+72
* cleanupfriendica2014-11-114-40/+55
* slow progress on sys publishing, making sure all the data we need is in the p...friendica2014-11-114-10/+25
* some more work on sys publishingfriendica2014-11-112-33/+40
* a couple of places where we need to look for a sys channel euid.friendica2014-11-112-10/+25
* and urlencode that.friendica2014-11-111-2/+2
* Most directory searches are POST. get_query_args() only handles GET so that h...friendica2014-11-111-1/+9
* Nothing here, move along.friendica2014-11-111-2/+2
* add some subtle delineation to directory entries, remove forced link on homep...friendica2014-11-113-2/+5
* some work on directory widgetsmarijus2014-11-116-57/+38
* tie the narrow nav-pills to .widget instead of asidemarijus2014-11-112-4/+5
* the code is a bit crufty, but this should fix issue #687friendica2014-11-113-4/+27
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-103-32/+28
|\
| * Merge pull request #685 from zzottel/masterRedMatrix2014-11-111-3/+3
| |\
| | * set channel_w_stream to 0 for forum roleszottel2014-11-101-3/+3
| * | Merge pull request #686 from beardy-unixer/masterRedMatrix2014-11-112-29/+25
| |\ \
| | * | Add a new theme flag - library. Not directly available to be used itself butThomas Willingham2014-11-102-29/+25
| | |/
* | / issue #683 - don't linkify homepage field without validatingfriendica2014-11-103-1/+5
|/ /
* | indicate public forums in directory results (there will be some [possibly con...friendica2014-11-104-4/+16
* | add public forum identification to libzot. No attempt is made to identify oth...friendica2014-11-103-2/+23
* | class is a reserved wordfriendica2014-11-103-6/+6
|/
* add defaults to database tablesfriendica2014-11-092-190/+2467
* menu page cleanupfriendica2014-11-093-16/+21
* remove extraneous loggingfriendica2014-11-091-4/+1
* directory listing shows phantom keywordsfriendica2014-11-092-2/+4
* Merge pull request #682 from pafcu/masterRedMatrix2014-11-091-1/+1
|\
| * Use consistent terminology for channel directoryStefan Parviainen2014-11-091-1/+1
* | Merge pull request #681 from pafcu/masterRedMatrix2014-11-095-241/+96
|\|
| * New layout for directoryStefan Parviainen2014-11-095-241/+96
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-0813-6235/+6474
|\ \
| * | prevent posting before acl got populated since this will disregard the defaul...marijus2014-11-086-10/+11
| * | Merge pull request #680 from pafcu/masterRedMatrix2014-11-092-2/+6
| |\|
| | * Fix merge conflictStefan Parviainen2014-11-08315-13484/+19854
| | |\ | | |/ | |/|
| * | Document reinstalling, or saying don't do that without explicitly stating don...Thomas Willingham2014-11-081-2/+10
| * | Merge pull request #678 from zzottel/masterzzottel2014-11-072-3/+4
| |\ \
| | * | update to German help fileszottel2014-11-072-3/+4
| * | | Merge pull request #677 from zzottel/masterzzottel2014-11-072-6218/+6443
| |\| |
| | * | update to German stringszottel2014-11-072-6218/+6443
| |/ /
| | * Highlight badge on hoverStefan Parviainen2014-11-081-0/+4
| | * Fix highlighting of login buttonStefan Parviainen2014-11-081-2/+2
* | | add acl loading fix to menu-item editsfriendica2014-11-082-2/+2
|/ /
* | tgroup_check - decrypt if obscured before checking body text for resharesfriendica2014-11-071-1/+9
* | revert that bitfriendica2014-11-071-7/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-072-6/+7
|\ \
| * | provide lockstate for photo editmarijus2014-11-072-6/+7