| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 29 | -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 $ | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-17 | 2 | -32/+105 |
| | |\ | |||||
| | | * | Merge pull request #322 from dawnbreak/master | redmatrix | 2015-05-18 | 1 | -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 Weidenbach | 2015-05-16 | 1 | -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/docu | redmatrix | 2015-05-18 | 1 | -32/+39 |
| | | |\ \ | | | | | | | | | | | Add some more documentation to attach_store() | ||||
| | | | * | | Add some more documentation to attach_store() | Klaus Weidenbach | 2015-05-17 | 1 | -32/+39 |
| | | | |/ | |||||
| | * | / | Implement permission checking for OAuth clients using the xperm table. ↵ | redmatrix | 2015-05-17 | 5 | -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_merge | redmatrix | 2015-05-17 | 6 | -25/+34 |
| | |\ \ | |||||
| | | * \ | Merge pull request #324 from Razlo/master | Klaus | 2015-05-17 | 4 | -23/+23 |
| | | |\ \ | | | |/ | | |/| | updated the templates to the {{$new_format}}, compared to $old_format | ||||
| | | | * | updated the templates to the {{}}, compared to | Razlo | 2015-05-17 | 4 | -23/+23 |
| | | |/ | |||||
| | | * | allow a block to contain $content | Mario Vavti | 2015-05-15 | 1 | -1/+8 |
| | | | | |||||
| | | * | preserve htmlhead in case somebody needs it | Mario Vavti | 2015-05-15 | 1 | -1/+3 |
| | | | | |||||
| | * | | new string file - isolating the projectname from translated strings so that ↵ | redmatrix | 2015-05-17 | 1 | -30/+31 |
| | | | | | | | | | | | | | translation files will work across multiple projects. | ||||
| | * | | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 16 | -321/+325 |
| | |/ | |||||
| | * | update to_do | redmatrix | 2015-05-14 | 1 | -0/+1 |
| | | | |||||
| * | | update readme | redmatrix | 2015-05-17 | 2 | -6/+10 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 4 | -14/+40 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-14 | 15 | -4/+497 |
| | |\ | |||||
| | * | | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 4 | -14/+40 |
| | | | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 15 | -4/+497 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #320 from dawnbreak/master | redmatrix | 2015-05-15 | 15 | -4/+497 |
| | |\ \ | | |/ | |/| | Add sprintf.js v1.0.2. | ||||
| | | * | Add sprintf.js v1.0.2. | Klaus Weidenbach | 2015-05-14 | 15 | -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' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 46 | -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 stuff | redmatrix | 2015-05-13 | 2 | -577/+0 |
| | | | |||||
| | * | remove project name dependency from most of the doc files to ease project ↵ | redmatrix | 2015-05-13 | 48 | -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/redmatrix | redmatrix | 2015-05-13 | 13 | -19/+23 |
| |\| | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| | * | restrict webpage list to undeleted items | redmatrix | 2015-05-13 | 2 | -3/+3 |
| | | | |||||
| | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 11 | -15/+15 |
| | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| | * | issue #187 | redmatrix | 2015-05-12 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 3 | -2/+72 |
| |\| | |||||
| | * | cut/paste error | redmatrix | 2015-05-12 | 1 | -1/+1 |
| | | | |||||
| | * | repo updaters | redmatrix | 2015-05-12 | 3 | -2/+72 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 6 | -5/+27 |
| |\| | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | ||||
| | * | provide a method for loading site/custom widgets | redmatrix | 2015-05-12 | 1 | -0/+3 |
| | | | |||||
| | * | replace project name with $product or $Product in strings to avoid merge ↵ | redmatrix | 2015-05-12 | 1 | -2/+15 |
| | | | | | | | | | issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. | ||||
| | * | version update | redmatrix | 2015-05-12 | 1 | -1/+1 |
| | | | |||||
| | * | Dutch 100\% again | jeroenpraat | 2015-05-12 | 2 | -56/+76 |
| | | | |||||
| | * | fix a couple of miscellaneous errors which showed up in the logs | redmatrix | 2015-05-11 | 2 | -2/+5 |
| | | | |||||
| | * | let the site admin import a record directly from the probe diagnostic | redmatrix | 2015-05-11 | 1 | -0/+3 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-11 | 2 | -6099/+7075 |
| | |\ | |||||
| | * | | missing translation | redmatrix | 2015-05-11 | 2 | -2/+2 |
| | | | | |||||
| * | | | missing merge conflict | redmatrix | 2015-05-11 | 1 | -6/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-11 | 0 | -0/+0 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: view/pt-br/messages.po view/pt-br/strings.php | ||||
| | * | | Merge pull request #319 from solstag/ptbrupdate | redmatrix | 2015-05-12 | 2 | -6099/+7075 |
| | |\ \ | | |/ | |/| | update pt-br transation | ||||
| | | * | update pt-br transation | Alexandre Hannud Abdo | 2015-05-11 | 2 | -6099/+7075 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into merger | redmatrix | 2015-05-10 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge pull request #1 from anaqreon/patch-1 | redmatrix | 2015-05-11 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | Misspelling | ||||
| | | * | | Misspelling | anaqreon | 2015-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | correcting upstream | redmatrix | 2015-05-10 | 2 | -2/+2 |
| |/ / / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |