aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* fix some merge errorsredmatrix2015-05-181-2/+4
|
* Merge branch 'master' into tresredmatrix2015-05-1711-22/+20
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1711-22/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
| | * more work isolating the projectname from core.redmatrix2015-05-1711-18/+18
| | |
* | | Merge branch 'master' into tresredmatrix2015-05-141-10/+15
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-10/+15
| |\|
| | * provide default permissions ('all') for existing and newly created OAuth app ↵redmatrix2015-05-141-10/+15
| | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions.
* | | Merge branch 'master' into tresredmatrix2015-05-1424-69/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/DerivedTheme1.md doc/Developers.md doc/Features.md doc/Plugins.md doc/Privacy.md doc/README.md doc/Remove-Account.md doc/Translations.md doc/about.bb doc/account_basics.bb doc/accounts_profiles_channels_basics.bb doc/addons.bb doc/addons_gnusocial.bb doc/bbcode.html doc/campaign.bb doc/classRedmatrix_1_1Import_1_1Import-members.html doc/classRedmatrix_1_1Import_1_1Import.html doc/cloud.bb doc/connecting_to_channels.bb doc/connecting_to_channels.md doc/credits.bb doc/de/channels.bb doc/de/features.bb doc/de/main.bb doc/de/registration.bb doc/developers.bb doc/encryption.bb doc/external-resource-links.bb doc/extra_features.bb doc/faq_admins.bb doc/faq_developers.bb doc/faq_members.bb doc/features.bb doc/hidden_configs.bb doc/history.md doc/html/index.php doc/main.bb doc/permissions.bb doc/plugins.bb doc/problems-following-an-update.bb doc/profiles.bb doc/red2pi.bb doc/registration.bb doc/roadmap.bb doc/sv/main.bb doc/what_is_zot.bb doc/zot.md
| | * remove project name dependency from most of the doc files to ease project ↵redmatrix2015-05-131-1/+1
| | | | | | | | | | | | merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-135-7/+11
| |\| | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php
| | * restrict webpage list to undeleted itemsredmatrix2015-05-132-3/+3
| | |
| | * product was a bad string to use because we may require it for e-commerce, ↵redmatrix2015-05-133-3/+3
| | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons.
| | * issue #187redmatrix2015-05-121-1/+5
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-121-0/+3
| |\| | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php
| | * let the site admin import a record directly from the probe diagnosticredmatrix2015-05-111-0/+3
| | |
| | * missing translationredmatrix2015-05-111-1/+1
| | |
| * | missing merge conflictredmatrix2015-05-111-6/+1
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-101-4/+18
| |\| | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| | * provide drop down submenu suggestions in edit modeMario Vavti2015-05-101-3/+4
| | |
| | * provide ability to create submenusMario Vavti2015-05-101-2/+10
| | |
| * | missed one...redmatrix2015-05-061-1/+1
| | |
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-0613-41/+38
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-061-1/+1
| |\|
| | * avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| | |
| * | for hubzilla we won't be obscuring items, only private mail, this will allow ↵redmatrix2015-05-051-8/+0
| | | | | | | | | | | | us to search and cache private posts
| * | second pass name changeredmatrix2015-05-056-7/+7
| | |
| * | first pass name changeredmatrix2015-05-059-20/+20
| |/
* | 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
| |