aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-08-152-1/+4
|\
| * Merge pull request #98 from cvogeley/masterfriendica2013-08-152-1/+4
| |\
| | * Do it like normal themesChristian Vogeley2013-08-161-1/+1
| | * Fix Load mobile themeChristian Vogeley2013-08-162-1/+4
* | | we only want to maintain one INSTALL.txt - and it is in the directory 'instal...friendica2013-08-154-282/+47
|/ /
* | fix import from filefriendica2013-08-152-5/+5
* | don't include archived contacts in public posts, unless specifically requestedfriendica2013-08-152-4/+5
* | issues marking for deathfriendica2013-08-151-14/+15
|/
* fix homebase variablefriendica2013-08-151-1/+1
* move js from matrix pagefriendica2013-08-152-17/+9
* not able to drop pending connectionsfriendica2013-08-152-2/+3
* show main menu page even if no menus existfriendica2013-08-141-2/+2
* Merge https://github.com/friendica/red into zpullfriendica2013-08-146-23/+87
|\
| * Merge pull request #96 from beardy-unixer/masterfriendica2013-08-146-23/+87
| |\
| | * More progress on pages - extend writepages widget, add pagelist widgetThomas Willingham2013-08-145-20/+46
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-1427-508/+1319
| | |\
| | * | Initial shot at write_pages widgetThomas Willingham2013-08-103-1/+29
| | * | Small improvementThomas Willingham2013-08-091-1/+1
| | * | Allow creation of webpages at channels other than your own.Thomas Willingham2013-08-091-9/+19
* | | | util/pconfig - if you understand util/config you'll understand this; if you d...friendica2013-08-141-0/+34
|/ / /
* | / most of expire is now ported from friendica, but the protocol bits to push ou...friendica2013-08-144-6/+23
| |/ |/|
* | typofriendica2013-08-141-1/+1
* | fix expire so it actually should expire stuff; and mostly the correct stuff -...friendica2013-08-142-12/+17
* | ru strings updatedfriendica2013-08-142-155/+159
* | Merge pull request #95 from pixelroot/masterfriendica2013-08-141-301/+317
|\ \
| * | modified: view/ru/messages.popixelroot2013-08-121-11/+11
| * | modified: view/ru/messages.popixelroot2013-08-121-297/+313
* | | primitive cms functionality - provide a custom menu below your profile vcardfriendica2013-08-132-0/+13
* | | helps to include the new templates...friendica2013-08-132-0/+39
* | | menu management is now functional with the exception of acl's (and of course ...friendica2013-08-137-26/+133
* | | menu management complete (as opposed to menu *content* management, which is n...friendica2013-08-135-15/+95
* | | debugging issue #58 - seems to work but needs (more) themingfriendica2013-08-134-5/+24
* | | untested patch for issue #58 - will require theming if it worksfriendica2013-08-133-12/+28
* | | a bit more work on menusfriendica2013-08-134-1/+43
* | | block content-type (called ITEM_BUILDBLOCK to avoid confusion with content th...friendica2013-08-123-0/+9
* | | add mod_mitem to manage menu itemsfriendica2013-08-122-35/+95
* | | menu modulefriendica2013-08-121-0/+96
* | | theme personal menus so they look more or less like widgetsfriendica2013-08-123-3/+13
* | | more menu manage functions - should be everything we need to get startedfriendica2013-08-111-0/+187
* | | debugging user menusfriendica2013-08-111-6/+4
* | | check these in so I can go back and find out why the stylsheet is horkedfriendica2013-08-115-3/+74
* | | Merge https://github.com/friendica/red into zpullfriendica2013-08-113-1/+2
|\ \ \
| * | | Update install.txt - fix shell command and path instructionAbinoam P. Marques Jr.2013-08-111-1/+1
| * | | How did that end up there? Move sample config to right place.Thomas Willingham2013-08-111-0/+0
| * | | Missing include for new_keypairThomas Willingham2013-08-101-0/+1
| | |/ | |/|
* | | important bits we need to allow php executable content. These must be explici...friendica2013-08-113-20/+53
* | | don't import any hubloc that doesn't have a sitekey. Eventually we should als...friendica2013-08-112-3/+8
|/ /
* | fix string horkagefriendica2013-08-092-109/+103
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-091-422/+379
|\ \
| * | Merge pull request #92 from pixelroot/masterfriendica2013-08-091-422/+379
| |\|