aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-184-385/+446
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-181-0/+47
| |\
| | * Merge pull request #326 from sierracircle/patch-1redmatrix2015-05-191-0/+47
| | |\
| | | * Create Primary-DirectoryAdam Robertson2015-05-181-0/+47
| * | | if block title contains $content but $content title is empty do not show an e...Mario Vavti2015-05-181-1/+1
| |/ /
| * | remove dbg codeMario Vavti2015-05-181-2/+0
| * | allow block title to contain $content titleMario Vavti2015-05-181-2/+11
| |/
| * Update Dutch (Projectname variable not translated yet, because of undefined v...jeroenpraat2015-05-182-383/+390
* | fix po2php to handle projectname variables correctlyredmatrix2015-05-182-8/+16
|/
* spellingredmatrix2015-05-172-4/+4
* 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.Klaus Weidenbach2015-05-161-0/+66
| * | Merge pull request #323 from dawnbreak/docuredmatrix2015-05-181-32/+39
| |\ \
| | * | Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | |/
* | / Implement permission checking for OAuth clients using the xperm table. Curren...redmatrix2015-05-175-6/+106
|/ /
* | 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 {{}}, 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 t...redmatrix2015-05-171-30/+31
* | 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.Klaus Weidenbach2015-05-1415-4/+497
| |/
* / provide default permissions ('all') for existing and newly created OAuth app ...redmatrix2015-05-144-14/+40
|/
* 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 mer...redmatrix2015-05-1348-277/+277
* 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, and...redmatrix2015-05-1311-15/+15
* 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 issu...redmatrix2015-05-121-2/+15
* 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 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