aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-147-31/+364
|\
| * typofriendica2013-08-141-1/+1
| * fix expire so it actually should expire stuff; and mostly the correct stuff -...friendica2013-08-141-11/+17
| * menu management is now functional with the exception of acl's (and of course ...friendica2013-08-131-1/+3
| * menu management complete (as opposed to menu *content* management, which is n...friendica2013-08-131-0/+23
| * debugging issue #58 - seems to work but needs (more) themingfriendica2013-08-131-3/+10
| * untested patch for issue #58 - will require theming if it worksfriendica2013-08-131-0/+18
| * a bit more work on menusfriendica2013-08-131-0/+8
| * block content-type (called ITEM_BUILDBLOCK to avoid confusion with content th...friendica2013-08-121-0/+5
| * 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-111-0/+40
| * Merge https://github.com/friendica/red into zpullfriendica2013-08-111-0/+1
| |\
| | * 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-112-18/+51
| * | don't import any hubloc that doesn't have a sitekey. Eventually we should als...friendica2013-08-111-2/+7
| |/
* / Initial shot at write_pages widgetThomas Willingham2013-08-101-0/+12
|/
* move sitekey creation to the account creation function instead of during chan...friendica2013-08-092-9/+7
* malformed ru string filefriendica2013-08-081-1/+1
* Add public visibility setting to privacy groups (collections). This doesn't y...friendica2013-08-071-3/+4
* remove some un-needed codefriendica2013-08-071-1320/+10
* big changes to photo->store() which is now photo->save() and takes an array i...friendica2013-08-072-10/+136
* convert all stored json calls to json_decode_plus()friendica2013-08-065-22/+22
* we've been storing json_encoded structures on disk in several places because ...friendica2013-08-063-6/+13
* add extra logging to tag_deliverfriendica2013-08-051-2/+6
* fine tuning the error checksfriendica2013-08-051-1/+6
* keep total of imported xchans correct - even if one or mail failures occurfriendica2013-08-051-4/+7
* more error checking in case import_xchan failsfriendica2013-08-051-0/+8
* use url part of arrayfriendica2013-08-051-1/+1
* prune old suggested channelsfriendica2013-08-051-0/+10
* populate initial suggestions (ultimately we want to do this at install time a...friendica2013-08-054-86/+94
* enotify: localize things we know how to translatefriendica2013-08-053-8/+14
* directory server sitelist module (needed for public site list and building fr...friendica2013-08-041-0/+1
* progress on unfriendingfriendica2013-08-041-15/+19
* basic *account* removal, but the channel removal which it calls still needs (...friendica2013-08-041-0/+43
* Revert "Revert "merge""Christian Vogeley2013-08-0312-179/+295
* Revert "merge"Christian Vogeley2013-08-0312-295/+179
* mergeChristian Vogeley2013-08-0312-179/+295
|\
| * potentially fixes the "federation" bug w/r/t/ tagged forumsfriendica2013-08-011-2/+2
| * pass item by reference so title can be alteredfriendica2013-08-012-13/+21
| * ensure that no unencrypted content leaks through item_store which is private ...friendica2013-08-013-11/+26
| * yhis should fix the privacy leak - as well as non-private replies to private ...friendica2013-08-012-1/+5
| * privacy leakagefriendica2013-07-311-1/+1
| * fix some privacy leakage in logsfriendica2013-07-312-14/+15
| * better mail obscuringfriendica2013-07-313-57/+84
| * attachment permissions not rightfriendica2013-07-302-40/+46
| * zot feed - getting cut off too earlyfriendica2013-07-291-6/+9
| * ensure conversation is includedfriendica2013-07-291-0/+1
| * fix some weirdness on the zot feedfriendica2013-07-292-12/+23
| * fix bug #84, make imported messages from your clones show up on your wallfriendica2013-07-292-0/+17