aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-17176-4812/+6741
|\
| * allow somebody to access the "home page content" (whatever that may be) even ...friendica2014-11-161-23/+25
| * remove old timersfriendica2014-11-161-20/+2
| * speed things up a wee bitfriendica2014-11-162-7/+16
| * when in list mode, make the max height half of the normal height before 'divg...friendica2014-11-162-18/+17
| * module cleanupfriendica2014-11-161-106/+109
| * blog/list mode display settingsfriendica2014-11-162-0/+12
| * "list mode" (forum and blog mode, no comments or comment boxes displayed on t...friendica2014-11-164-4/+191
| * some poller optimisations and a fix for undefined (empty) dbtype which shows ...friendica2014-11-165-28/+42
| * 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-155-2968/+2964
| * | doc updatesfriendica2014-11-15152-1591/+3305
| |/
| * 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()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
| | |\ \
| | | * | Fixed a variable conflict in mod/xchan.php.Klaus Weidenbach2014-11-142-11/+10
| | | * | Changed two strange looking places in boot.php.Klaus Weidenbach2014-11-131-19/+24
| * | | | mysql driver - in debug mode for statements that return true/false report the...friendica2014-11-131-1/+1
| |/ / /
| * | | 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
| |\ \ \ | | | |/ | | |/|
| | * | violates new sql standardsHabeas Codice2014-11-131-1/+1
| * | | Merge pull request #690 from habeascodice/masterRedMatrix2014-11-14110-645/+2258
| |\| | | | |/ | |/|
* | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-11-13342-15326/+24244
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-13197-11360/+17155
| |\|
| | * 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 for...friendica2014-11-121-1/+3
| | * 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
| | * 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.Klaus Weidenbach2014-11-132-206/+290
| | | |/
| | * | 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 p...friendica2014-11-114-10/+25
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 13:45:07 +0000