aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-04-231727-201129/+48987
|\
| * webpages blocks fixesMario Vavti2015-04-236-56/+122
| * explain a bit more about the structure and scopefriendica2015-04-222-1/+3
| * do not show acl button if not ownerMario Vavti2015-04-221-3/+4
| * fix webpages profile_tabsMario Vavti2015-04-221-5/+2
| * fix webpage permsMario Vavti2015-04-223-3/+12
| * provide headings for blocks and layoutsMario Vavti2015-04-227-10/+51
| * add translation plugin to the to-dofriendica2015-04-211-0/+1
| * use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ...friendica2015-04-212-25/+25
| * missing classMario Vavti2015-04-211-1/+1
| * move .lockview to style.css and a typoMario Vavti2015-04-212-5/+5
| * missing dropdown classMario Vavti2015-04-211-1/+1
| * bring lockstate to webpagesMario Vavti2015-04-213-5/+12
| * bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-219-35/+46
| * rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-2111-200/+258
| * issue #162friendica2015-04-203-1/+3
| * issue #176, sender copy of item not obscured if using private mentionfriendica2015-04-202-2/+4
| * force event obj_type on updatefriendica2015-04-201-1/+2
| * update to-do listfriendica2015-04-202-1/+3
| * issue #178, searching for words such as 'data' would return private items reg...friendica2015-04-191-2/+4
| * issue #157, provide default directory sort orderfriendica2015-04-192-2/+12
| * doco updatesfriendica2015-04-192-12/+9
| * 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
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-191-1/+1
| |\
| | * Merge pull request #315 from unary/wallattachredmatrix2015-04-201-1/+1
| | |\
| | | * switch from IMG_XXX constants to IMAGETYPE_XXX constantsMichael Johnston2015-04-191-1/+1
| | |/
| * / some api cleanupfriendica2015-04-191-11/+15
| |/
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-195-70/+44
| |\
| | * attach an id to menues, allow $menu_title to be empty, if no custom menu clas...Mario Vavti2015-04-193-22/+20
| | * Introduce wrap variable in comanche blocks (if set to none the block will not...Mario Vavti2015-04-193-48/+24
| * | api - unobscure mailfriendica2015-04-193-5/+16
| |/
| * log this since we may need it to track down failuresfriendica2015-04-183-3/+5
| * css fixMario Vavti2015-04-181-1/+1
| * fix page-title marginMario Vavti2015-04-181-0/+4
| * remove failed experimentfriendica2015-04-171-2/+0
| * add last post to api/account/verify_credentialsfriendica2015-04-171-5/+60
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-1710-50/+43
| |\
| | * adjus webpage font size to match conv item font sizeMario Vavti2015-04-171-1/+2
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-04-172-5/+3
| | |\
| | * | allow jot to be displayed expanded, remove deprected datetimepicker js and so...Mario Vavti2015-04-1710-49/+41
| * | | hide event share button when editing an eventfriendica2015-04-173-388/+418
| | |/ | |/|
| * | you need communications in there someplace.friendica2015-04-161-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-1613-40/+64
| |\|
| | * wording and css fixesMario Vavti2015-04-162-4/+3
| | * provide a separate input field for rpost attachmentsMario Vavti2015-04-168-10/+26
| | * make rpost respect default post permissionsMario Vavti2015-04-161-1/+8
| | * whitespaceMario Vavti2015-04-161-15/+15
| | * move share webpage element from editwebpage to webpages and make it shareable...Mario Vavti2015-04-164-22/+24