Qiang Xue e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi ...

Conflicts:
	framework/db/BaseActiveRecord.php

2014-03-06 00:00:33 -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

fix code style php5.4 syntax

2014-03-04 06:37:49 +02:00

BaseHtml.php

fixed > 100 typos introduced by me :-)

2014-03-05 02:38:59 +01:00

BaseHtmlPurifier.php

psr-4 move

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

BaseInflector.php

Fixed indentation in BaseInflector

2014-03-03 03:18:17 +01:00

BaseJson.php

refactored Json helper.

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

BaseMarkdown.php

fix code style

2014-03-04 06:12:30 +02:00

BaseSecurity.php

fix code style

2014-03-04 06:12:30 +02: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