aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-1731-421/+612
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1729-415/+602
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * missing $redmatrix2015-05-171-1/+1
| | |
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-172-32/+105
| | |\
| | | * Merge pull request #322 from dawnbreak/masterredmatrix2015-05-181-0/+66
| | | |\ | | | | | | | | | | Add functions to parse and get some values from php.ini.
| | | | * Add functions to parse and get some values from php.ini.Klaus Weidenbach2015-05-161-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get upload limits from php.ini. These functions will be used for checking against upload limits and to give information in the frontend. Wasn't sure in which file to put these functions, so I created a new one include/environment.php.
| | | * | Merge pull request #323 from dawnbreak/docuredmatrix2015-05-181-32/+39
| | | |\ \ | | | | | | | | | | | | Add some more documentation to attach_store()
| | | | * | Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | | | |/
| | * | / Implement permission checking for OAuth clients using the xperm table. ↵redmatrix2015-05-175-6/+106
| | |/ / | | | | | | | | | | | | Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-176-25/+34
| | |\ \
| | | * \ Merge pull request #324 from Razlo/masterKlaus2015-05-174-23/+23
| | | |\ \ | | | | |/ | | | |/| updated the templates to the {{$new_format}}, compared to $old_format
| | | | * updated the templates to the {{}}, compared toRazlo2015-05-174-23/+23
| | | |/
| | | * allow a block to contain $contentMario Vavti2015-05-151-1/+8
| | | |
| | | * preserve htmlhead in case somebody needs itMario Vavti2015-05-151-1/+3
| | | |
| | * | new string file - isolating the projectname from translated strings so that ↵redmatrix2015-05-171-30/+31
| | | | | | | | | | | | | | | | translation files will work across multiple projects.
| | * | more work isolating the projectname from core.redmatrix2015-05-1716-321/+325
| | |/
| | * update to_doredmatrix2015-05-141-0/+1
| | |
| * | update readmeredmatrix2015-05-172-6/+10
| | |
* | | 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
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 23:14:56 +0000