aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use $a->data instead of $a->page for $content and ad another library for use ↵Mario Vavti2015-05-2321-4/+19094
| | | | with webpages - foundation
* preserve lock on edited commentsredmatrix2015-05-212-2/+5
|
* cloning abook entries was broken in several ways if the target xchan wasn't ↵redmatrix2015-05-202-16/+13
| | | | available on the clone site. This should make it less broken.
* check for success before updating remote idredmatrix2015-05-201-8/+9
|
* don't allow item_id to update without a valid post idredmatrix2015-05-201-0/+5
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-203-72/+89
|\
| * Another update for Dutch with complete $Projectname substitutions (and ↵jeroenpraat2015-05-202-71/+71
| | | | | | | | channel activity as suggested on previous discussion)
| * make design elements translateableMario Vavti2015-05-201-1/+18
| |
* | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-208-26/+32
|/
* issue with deleting imported design elements and re-installing themredmatrix2015-05-191-1/+9
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-196-108/+127
|\
| * Merge pull request #327 from solstag/helpredmatrix2015-05-203-3/+21
| |\ | | | | | | Document php-xml requirement for webdav and widget creation.
| | * Document widget creation.Alexandre Hannud Abdo2015-05-192-1/+17
| | |
| | * Document php-xml requirement for webdav.Alexandre Hannud Abdo2015-05-191-2/+4
| | |
| * | remove dbg codeMario Vavti2015-05-191-1/+1
| | |
| * | be verbose about what type of element (block, layout, webpage) is beeing ↵Mario Vavti2015-05-191-1/+2
| |/ | | | | | | installed
| * New update Dutchjeroenpraat2015-05-192-104/+104
| |
* | version updateredmatrix2015-05-191-1/+1
|/
* this should fix undeletable blocks and layoutsredmatrix2015-05-182-4/+6
|
* 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-Directory
| | | * Create Primary-DirectoryAdam Robertson2015-05-181-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 Vavti2015-05-181-1/+1
| |/ / | | | | | | | | | empty <h3> tag
| * | 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 ↵jeroenpraat2015-05-182-383/+390
| | | | | | | | variable)
* | 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.
| | * 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.