aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-04-298-54/+91
|\ | | | | | | | | Conflicts: include/notifier.php
| * disable voting in blocks, layouts and webpagesMario Vavti2015-04-293-2/+5
| |
| * fix $noloc state in mod editwebpagesMario Vavti2015-04-291-1/+1
| |
| * adjust placeholder namingMario Vavti2015-04-292-2/+3
| |
| * Provide webpage layout descriptionMario Vavti2015-04-251-2/+5
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-245-46/+32
| |\
| | * provide block titles in blocklistMario Vavti2015-04-241-1/+3
| | |
| | * add title to element arrayMario Vavti2015-04-243-3/+5
| | |
| | * there is no key named term in this arrayMario Vavti2015-04-241-1/+0
| | |
| | * copy/paste typoMario Vavti2015-04-241-1/+1
| | |
| | * webpages layout fixesMario Vavti2015-04-243-43/+26
| | |
| * | reset routefriendica2015-04-241-1/+1
| | |
| * | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵friendica2015-04-241-0/+42
| |/ | | | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-232-32/+27
| |\
| * | disconnectfriendica2015-04-231-3/+5
| | |
* | | Merge branch 'master' into tresfriendica2015-04-2361-1388/+2323
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * | webpages blocks fixesMario Vavti2015-04-232-32/+27
| |/
| * 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-222-2/+11
| |
| * provide headings for blocks and layoutsMario Vavti2015-04-223-8/+15
| |
| * bring lockstate to webpagesMario Vavti2015-04-211-1/+5
| |
| * bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-212-14/+26
| |
| * rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-212-107/+120
| |
| * issue #176, sender copy of item not obscured if using private mentionfriendica2015-04-201-1/+1
| |
| * issue #178, searching for words such as 'data' would return private items ↵friendica2015-04-191-2/+4
| | | | | | | | regardless of their unobscured content.
| * issue #157, provide default directory sort orderfriendica2015-04-191-1/+5
| |
| * switch from IMG_XXX constants to IMAGETYPE_XXX constantsMichael Johnston2015-04-191-1/+1
| |
| * log this since we may need it to track down failuresfriendica2015-04-181-0/+1
| |
| * allow jot to be displayed expanded, remove deprected datetimepicker js and ↵Mario Vavti2015-04-173-15/+15
| | | | | | | | some random fixes
| * wording and css fixesMario Vavti2015-04-161-1/+1
| |
| * provide a separate input field for rpost attachmentsMario Vavti2015-04-162-1/+2
| |
| * 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 ↵Mario Vavti2015-04-162-18/+16
| | | | | | | | shareable with rpost
| * Update viewsrc.phpmrjive2015-04-151-1/+2
| | | | | | Adding the item ID to the item source view
| * funny I should mention comanche preview (yesterday) as clicking the view ↵friendica2015-04-141-17/+15
| | | | | | | | link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'.
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-143-16/+8
| |\
| | * css fixes and remove expert mode for block page content typeMario Vavti2015-04-142-11/+3
| | |
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-04-142-6/+11
| | |\
| | * | some more on webpagesMario Vavti2015-04-142-5/+5
| | | |
| * | | default perms not being set in some casesfriendica2015-04-141-0/+10
| | |/ | |/|
| * | unquote binaryHabeas Codice2015-04-131-2/+3
| | |
| * | item_check_service_class wasn't returning correct resultsfriendica2015-04-131-4/+8
| |/
| * webpages appearenceMario Vavti2015-04-131-2/+5
| |
| * reverse file activity logicMario Vavti2015-04-122-5/+5
| |
| * program the affinity slider labelsfriendica2015-04-091-6/+22
| |
| * make sure we redirect to a sane place after deleting a webpage elementfriendica2015-04-093-0/+6
| |
| * system channel always has allow_code privilegesfriendica2015-04-081-1/+1
| |
| * update features, allow sys account page deletionfriendica2015-04-081-0/+4
| |