Qiang Xue 6c88183be0 Merge commit 'd3ff343e5ee02a14dd17d6cf947aa7f52857474a' into feature-restapi ...

Conflicts:
	framework/helpers/BaseArrayHelper.php

2014-02-28 18:22:10 -05:00

..

ArrayHelper.php

psr-4 move

2014-01-10 21:41:43 -05:00

BaseArrayHelper.php

rest WIP

2014-02-28 08:34:51 -05:00

BaseConsole.php

Removed unused assignment

2014-02-07 13:12:33 +04:00

BaseFileHelper.php

Fixed an issue with Filehelper and not accessable directories

2014-01-28 11:09:41 +01:00

BaseHtml.php

Fixes #2392: Added addCssStyle(), removeCssStyle(), cssStyleFromArray() and cssStyleToArray() to Html

2014-02-23 19:12:33 -05:00

BaseHtmlPurifier.php

psr-4 move

2014-01-10 21:41:43 -05:00

BaseInflector.php

psr-4 move

2014-01-10 21:41:43 -05:00

BaseJson.php

refactored Json helper.

2014-01-11 17:25:54 -05:00

BaseMarkdown.php

fixed several issues with apidoc generator

2014-02-18 05:01:49 +01:00

BaseSecurity.php

added back fallback mechanism for generating salt.

2014-02-13 14:04:15 -05:00

BaseStringHelper.php

Removed unused namespace imports

2014-02-07 13:26:00 +04:00

BaseVarDumper.php

psr-4 move

2014-01-10 21:41:43 -05:00

Console.php

psr-4 move

2014-01-10 21:41:43 -05:00

FileHelper.php

psr-4 move

2014-01-10 21:41:43 -05:00

Html.php

more clear docs about html options

2014-01-28 11:40:19 +01:00

HtmlPurifier.php

psr-4 move

2014-01-10 21:41:43 -05:00

Inflector.php

psr-4 move

2014-01-10 21:41:43 -05:00

Json.php

psr-4 move

2014-01-10 21:41:43 -05:00

Markdown.php

Changed markdown library to cebe/markdown

2014-02-18 03:48:31 +01:00

mimeTypes.php

psr-4 move

2014-01-10 21:41:43 -05:00

Security.php

psr-4 move

2014-01-10 21:41:43 -05:00

StringHelper.php

psr-4 move

2014-01-10 21:41:43 -05:00

VarDumper.php

psr-4 move

2014-01-10 21:41:43 -05:00