aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-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
* / 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.
* 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.
* 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
|
* cut/paste errorredmatrix2015-05-121-1/+1
|
* repo updatersredmatrix2015-05-123-2/+72
|
* 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
|\
| * 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
| |/
* / missing translationredmatrix2015-05-112-2/+2
|/
* 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
| |/
| * 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
| |
| * comanche docoMario Vavti2015-05-062-2/+10
| |
| * avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| |
| * allow blocks to have custom classes and add a new template called zen which ↵Mario Vavti2015-05-062-2/+20
| | | | | | | | gives you an empty page to work with