aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-131-0/+4
|\
| * Merge pull request #693 from habeascodice/masterRedMatrix2014-11-141-0/+4
| |\ | | | | | | Add bitwise xor to db_getfunc()
| | * Add bitwise xor to db_getfunc()Habeas Codice2014-11-131-0/+4
| | |
* | | buttonify some design elements that had not yet been buttonifiedfriendica2014-11-132-7/+7
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-132-29/+33
|\ \
| * \ Merge pull request #691 from dawnbreak/masterRedMatrix2014-11-142-29/+33
| |\ \ | | | | | | | | Changed two strange looking places in boot.php.
| | * | Fixed a variable conflict in mod/xchan.php.Klaus Weidenbach2014-11-142-11/+10
| | | | | | | | | | | | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php.
| | * | Changed two strange looking places in boot.php.Klaus Weidenbach2014-11-131-19/+24
| | | | | | | | | | | | | | | | | | | | There have been two places that looked wrong, but I don't know how I can test them. So please review and test if I am not wrong.
* | | | mysql driver - in debug mode for statements that return true/false report ↵friendica2014-11-131-1/+1
|/ / / | | | | | | | | | the sql along with the result so we can match it to an offending statement. This has bugged me for some time but never got around to fixing it until now.
* | | put timeout code in place but don't turn it on.friendica2014-11-132-13/+16
| | |
* | | Merge pull request #692 from habeascodice/masterRedMatrix2014-11-141-1/+1
|\ \ \ | | |/ | |/| missed during merge
| * | violates new sql standardsHabeas Codice2014-11-131-1/+1
| | | | | | | | | | | | missed during merge
* | | Merge pull request #690 from habeascodice/masterRedMatrix2014-11-14110-645/+2258
|\| | | |/ |/| Initial postgres support
| * Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-13197-11360/+17155
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | 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
* | update nlJeroen2014-11-132-2470/+2601
| |
* | let's try this without a timeoutfriendica2014-11-132-5/+5
| |
* | make it a bit personalfriendica2014-11-121-3/+3
| |
* | ok, I think I'll give it a break now.friendica2014-11-121-6/+8
| |
* | minor word tweaksfriendica2014-11-121-3/+3
| |
* | populate initial ACL before the ajax loader gets called, just in case the ↵friendica2014-11-121-1/+3
| | | | | | | | form is submitted before it completes. Related to issue #615
* | this should make all the 'sys' webpage design tools useable by the adminfriendica2014-11-124-156/+211
| |
* | wordsmithfriendica2014-11-121-1/+1
| |
* | more minor wordsmithingfriendica2014-11-121-2/+2
| |
* | Some dates couldn't be verified without going way back in the archives so at ↵friendica2014-11-121-3/+3
| | | | | | | | least make this document accurate based on what I have in front of me.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-122-206/+290
|\ \
| * \ Merge pull request #689 from dawnbreak/docuRedMatrix2014-11-132-206/+290
| |\ \ | | | | | | | | Some Doxygen documentation.
| | * | Some Doxygen documentation.Klaus Weidenbach2014-11-132-206/+290
| |/ / | | | | | | | | | | | | Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too.
* | | add history linkfriendica2014-11-121-0/+1
| | |
* | | 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 ↵friendica2014-11-114-10/+25
| | | | | | | | places we need it but validate it anyway
* | 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 ↵friendica2014-11-111-1/+9
| | | | | | | | had to be fixed or page 2 of directory search results wouldn't match the search.
* | Nothing here, move along.friendica2014-11-111-2/+2
| |
* | add some subtle delineation to directory entries, remove forced link on ↵friendica2014-11-113-2/+5
| | | | | | | | homepage element (SECURITY)
* | 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 roles
| | * | 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 itsel...
| | * | | Add a new theme flag - library. Not directly available to be used itself butThomas Willingham2014-11-102-29/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed as a lib for other themes. Like SDL, or GTK. Get rid of mobility - it's better done with Comanche and schemas. Describe themes instead of restricting them. Mobile themes can be used as the desktop theme and vice-versa. This deals with the problem of "but my device is something inbetween". Presently not exposed to members.