aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-1419-18/+537
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-144-14/+40
| |\
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-1415-4/+497
| | |\
| | * | provide default permissions ('all') for existing and newly created OAuth app ↵redmatrix2015-05-144-14/+40
| | | | | | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions.
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1415-4/+497
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #320 from dawnbreak/masterredmatrix2015-05-1515-4/+497
| | |\ \ | | | |/ | | |/| Add sprintf.js v1.0.2.
| | | * Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-1415-4/+497
| | |/ | | | | | | | | | | | | | | | | | | | | | This script provides sprintf() for JavaScript. It can be used for example for translating strings used in JavaScript with variables. It is licensed under BSD-3-Clause and can be found on GitHub: https://github.com/alexei/sprintf.js
* | | Merge branch 'master' into tresredmatrix2015-05-14187-9453/+9692
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1346-209/+226
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * not sure how these files ended up here, but they belong with doxygen stuffredmatrix2015-05-132-577/+0
| | |
| | * remove project name dependency from most of the doc files to ease project ↵redmatrix2015-05-1348-277/+277
| | | | | | | | | | | | 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-1313-19/+23
| |\| | | | | | | | | | | | | | | | | | | 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-1311-15/+15
| | | | | | | | | | | | 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-123-2/+72
| |\|
| | * cut/paste errorredmatrix2015-05-121-1/+1
| | |
| | * repo updatersredmatrix2015-05-123-2/+72
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-126-5/+27
| |\| | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php
| | * provide a method for loading site/custom widgetsredmatrix2015-05-121-0/+3
| | |
| | * replace project name with $product or $Product in strings to avoid merge ↵redmatrix2015-05-121-2/+15
| | | | | | | | | | | | issues across different project names. Currently a place-holder. The strings themselves have not yet been modified.
| | * version updateredmatrix2015-05-121-1/+1
| | |
| | * Dutch 100\% againjeroenpraat2015-05-122-56/+76
| | |
| | * fix a couple of miscellaneous errors which showed up in the logsredmatrix2015-05-112-2/+5
| | |
| | * let the site admin import a record directly from the probe diagnosticredmatrix2015-05-111-0/+3
| | |
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-112-6099/+7075
| | |\
| | * | missing translationredmatrix2015-05-112-2/+2
| | | |
| * | | missing merge conflictredmatrix2015-05-111-6/+1
| | | |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-110-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: view/pt-br/messages.po view/pt-br/strings.php
| | * | Merge pull request #319 from solstag/ptbrupdateredmatrix2015-05-122-6099/+7075
| | |\ \ | | | |/ | | |/| update pt-br transation
| | | * update pt-br transationAlexandre Hannud Abdo2015-05-112-6099/+7075
| | |/
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into mergerredmatrix2015-05-100-0/+0
| |\ \
| | * \ Merge pull request #1 from anaqreon/patch-1redmatrix2015-05-111-1/+1
| | |\ \ | | | | | | | | | | Misspelling
| | | * | Misspellinganaqreon2015-05-101-1/+1
| | | | |
| * | | | correcting upstreamredmatrix2015-05-102-2/+2
| |/ / /
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1014-126/+186
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-1018-5474/+5835
| | |\ \
| | | * | uid > channel id to make submenus visible for observersMario Vavti2015-05-101-3/+3
| | | | |
| | | * | provide drop down submenu suggestions in edit modeMario Vavti2015-05-102-3/+6
| | | | |
| | | * | copy/paste typoMario Vavti2015-05-101-1/+1
| | | | |
| | | * | provide ability to create submenusMario Vavti2015-05-108-11/+47
| | | | |
| | | * | Merge pull request #318 from zzottel/masterzzottel2015-05-082-5226/+5453
| | | |\ \ | | | | | | | | | | | | update to German strings
| | | | * | update to German stringszottel2015-05-082-5226/+5453
| | | |/ /
| | * | | rev updateredmatrix2015-05-103-47/+63
| | | | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-078-232/+301
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | provide wrap variable for comanche menusMario Vavti2015-05-073-5/+23
| | | |
| | * | Update Dutchjeroenpraat2015-05-072-221/+232
| | | |
| | * | provide a possibility to include js/css libsMario Vavti2015-05-071-0/+40
| | | |
| | * | adjust icon sizeMario Vavti2015-05-073-6/+6
| | | |
| * | | missed one...redmatrix2015-05-063-2/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 06:26:48 +0000