Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-18 | 1 | -0/+47 | |
| |\ \ | ||||||
| | * \ | Merge pull request #326 from sierracircle/patch-1 | redmatrix | 2015-05-19 | 1 | -0/+47 | |
| | |\ \ | | | | | | | | | | | Create Primary-Directory | |||||
| | | * | | Create Primary-Directory | Adam Robertson | 2015-05-18 | 1 | -0/+47 | |
| | | | | | | | | | | | | | | | Description and Instruction on using a Primary Directory for a series of Private Hubs | |||||
| * | | | | if block title contains $content but $content title is empty do not show an ↵ | Mario Vavti | 2015-05-18 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | empty <h3> tag | |||||
| * | | | remove dbg code | Mario Vavti | 2015-05-18 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | allow block title to contain $content title | Mario Vavti | 2015-05-18 | 1 | -2/+11 | |
| |/ / | ||||||
| * | | Update Dutch (Projectname variable not translated yet, because of undefined ↵ | jeroenpraat | 2015-05-18 | 2 | -383/+390 | |
| | | | | | | | | | | | | variable) | |||||
* | | | fix po2php to handle projectname variables correctly | redmatrix | 2015-05-18 | 2 | -8/+16 | |
|/ / | ||||||
* | | spelling | redmatrix | 2015-05-17 | 2 | -4/+4 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | 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 | |||||
* / / | 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. | |||||
* | | 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. | |||||
* | | 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 | |
| | | ||||||
* | | cut/paste error | redmatrix | 2015-05-12 | 1 | -1/+1 | |
| | | ||||||
* | | repo updaters | redmatrix | 2015-05-12 | 3 | -2/+72 | |
| | | ||||||
* | | 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 | |
|\ \ | ||||||
| * \ | 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 | |
| |/ / | ||||||
* / / | missing translation | redmatrix | 2015-05-11 | 2 | -2/+2 | |
|/ / | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-10 | 18 | -5474/+5835 | |
|\ \ | ||||||
| * | | uid > channel id to make submenus visible for observers | Mario Vavti | 2015-05-10 | 1 | -3/+3 | |
| | | | ||||||
| * | | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 2 | -3/+6 | |
| | | | ||||||
| * | | copy/paste typo | Mario Vavti | 2015-05-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | provide ability to create submenus | Mario Vavti | 2015-05-10 | 8 | -11/+47 | |
| | | |