aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #331 from solstag/jquerypropredmatrix2015-05-241-2/+2
|\
| * Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-2/+2
* | Merge pull request #333 from dawnbreak/docuredmatrix2015-05-242-258/+313
|\ \
| * | Add PHP's xml module check and upload limits to setup.Klaus Weidenbach2015-05-242-258/+313
* | | Merge pull request #332 from solstag/zotfeedcleanupKlaus2015-05-241-3/+1
|\ \ \ | |/ / |/| |
| * | Import security only when necessary, use correct variable in logAlexandre Hannud Abdo2015-05-221-3/+1
| |/
* | federation problem from diaspora comments relayed through red channels due to...redmatrix2015-05-231-1/+1
* | add channel_id to local_dir_update hookredmatrix2015-05-231-1/+1
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-2321-4/+19094
|\ \
| * | use $a->data instead of $a->page for $content and ad another library for use ...Mario Vavti2015-05-2321-4/+19094
| |/
* / add local_dir_update hookredmatrix2015-05-233-523/+529
|/
* preserve lock on edited commentsredmatrix2015-05-212-2/+5
* cloning abook entries was broken in several ways if the target xchan wasn't a...redmatrix2015-05-202-16/+13
* 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 channe...jeroenpraat2015-05-202-71/+71
| * 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 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 inst...Mario Vavti2015-05-191-1/+2
| |/
| * 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-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