aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-05-012-2/+28
|\
| * more performance workfriendica2015-04-301-1/+9
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-301-0/+2
| |\
| * | just a test, please do not try to implement this as there are severe security...friendica2015-04-302-2/+20
* | | Merge branch 'master' into tresfriendica2015-04-295-13/+30
|\ \ \ | | |/ | |/|
| * | disable voting in blocks, layouts and webpagesMario Vavti2015-04-291-0/+2
| |/
| * Provide webpage layout descriptionMario Vavti2015-04-251-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-242-1/+2
| |\
| | * add widget class to blocks again by default. we have the wrap variable now to...Mario Vavti2015-04-241-1/+1
| | * provide block titles in blocklistMario Vavti2015-04-241-0/+1
| * | zotfeed issuesfriendica2015-04-241-3/+3
| * | mod/branchtopic - move an off-topic comment to its own thread as a fresh wall...friendica2015-04-241-1/+1
| |/
| * block unfederated posts from zot_feedfriendica2015-04-231-0/+6
| * disconnectfriendica2015-04-231-7/+15
* | Merge branch 'master' into tresfriendica2015-04-2358-3887/+5463
|\|
| * fix webpage permsMario Vavti2015-04-221-1/+1
| * use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ...friendica2015-04-211-24/+24
| * issue #162friendica2015-04-201-0/+1
| * issue #176, sender copy of item not obscured if using private mentionfriendica2015-04-201-1/+3
| * force event obj_type on updatefriendica2015-04-201-1/+2
| * issue #157, provide default directory sort orderfriendica2015-04-191-1/+7
| * doco updatesfriendica2015-04-191-3/+0
| * add favorites/create and destroy to apifriendica2015-04-191-36/+137
| * api performance enhancerfriendica2015-04-191-5/+2
| * assorted fixes to api direct messagesfriendica2015-04-191-31/+35
| * some api cleanupfriendica2015-04-191-11/+15
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-192-53/+31
| |\
| | * attach an id to menues, allow $menu_title to be empty, if no custom menu clas...Mario Vavti2015-04-191-6/+8
| | * Introduce wrap variable in comanche blocks (if set to none the block will not...Mario Vavti2015-04-192-47/+23
| * | api - unobscure mailfriendica2015-04-192-4/+15
| |/
| * log this since we may need it to track down failuresfriendica2015-04-181-2/+3
| * remove failed experimentfriendica2015-04-171-2/+0
| * add last post to api/account/verify_credentialsfriendica2015-04-171-5/+60
| * allow jot to be displayed expanded, remove deprected datetimepicker js and so...Mario Vavti2015-04-171-1/+2
| * provide a separate input field for rpost attachmentsMario Vavti2015-04-161-0/+1
| * don't show directory keywords widget if globaldir setting is offfriendica2015-04-151-0/+5
| * title=>nameMario Vavti2015-04-151-1/+1
| * match parensfriendica2015-04-141-1/+1
| * post_activity_item incorrectly setting the obj_type when a valid type was spe...friendica2015-04-141-1/+1
| * dont suggest anything here it explains itselfMario Vavti2015-04-141-1/+1
| * some more on webpagesMario Vavti2015-04-141-12/+15
| * remove widget class from webpage blocks and make titles h2 to match the rest ...Mario Vavti2015-04-131-1/+1
| * make dropItem more universal and move delete up in the dropdown menuMario Vavti2015-04-121-1/+1
| * make fs deletion of directories workMario Vavti2015-04-121-2/+2
| * reverse file activity logicMario Vavti2015-04-121-2/+2
| * move style to style.cssMario Vavti2015-04-101-3/+3
| * make r# work better with different font sizesMario Vavti2015-04-101-3/+3
| * don't warn folks about the webaddress observer tag. We need it in constructed...friendica2015-04-091-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-092-382/+557
| |\
| | * Some documentation and whitespaces at line endings.Klaus Weidenbach2015-04-102-382/+557