Permalink
Browse files

Merge branch 'master' of git://github.com/yiisoft/yii into fixes-873-2

Conflicts:
	CHANGELOG
  • Loading branch information...
2 parents 0d774ae + 5fabd4a commit a0213a565a6e78c8483a2e4717ff3739f73b6ed5 @resurtm committed Jul 24, 2012
Showing with 621 additions and 411 deletions.
  1. +1 −1 .travis.yml
  2. +5 −2 CHANGELOG
  3. +0 −4 build/build
  4. +174 −162 build/commands/Utf8Command.php
  5. +133 −0 docs/guide/basics.namespace.txt
  6. +1 −3 docs/guide/changes.txt
  7. +1 −1 docs/guide/database.dao.txt
  8. +1 −1 docs/guide/database.migration.txt
  9. +5 −0 docs/guide/de/changes.txt
  10. +1 −1 docs/guide/de/database.ar.txt
  11. +1 −1 docs/guide/de/quickstart.apache-nginx-config.txt
  12. +6 −4 docs/guide/de/topics.console.txt
  13. +3 −0 docs/guide/de/topics.i18n.txt
  14. +1 −2 docs/guide/de/topics.webservice.txt
  15. +2 −2 docs/guide/ja/caching.page.txt
  16. +26 −28 docs/guide/ja/changes.txt
  17. +2 −2 docs/guide/ja/database.dao.txt
  18. +2 −2 docs/guide/ja/database.migration.txt
  19. +2 −0 docs/guide/ja/topics.console.txt
  20. +2 −2 docs/guide/ja/topics.logging.txt
  21. +0 −3 docs/guide/pl/changes.txt
  22. +0 −3 docs/guide/ru/changes.txt
  23. +2 −0 docs/guide/topics.console.txt
  24. +0 −3 docs/guide/uk/changes.txt
  25. +0 −3 docs/guide/zh_cn/changes.txt
  26. +23 −2 framework/base/CErrorHandler.php
  27. +2 −1 framework/caching/CFileCache.php
  28. +1 −1 framework/db/CDbConnection.php
  29. +4 −4 framework/db/CDbMigration.php
  30. +1 −1 framework/db/CDbTransaction.php
  31. +4 −4 framework/messages/el/yii.php
  32. +32 −0 framework/messages/ja/size_units.php
  33. +4 −3 framework/messages/ja/yii.php
  34. +2 −2 framework/messages/ja/zii.php
  35. +3 −1 framework/test/CTestCase.php
  36. +1 −0 framework/test/CWebTestCase.php
  37. +1 −1 framework/utils/CFileHelper.php
  38. +11 −3 framework/utils/CMarkdownParser.php
  39. +1 −1 framework/vendors/README.html
  40. +125 −100 framework/vendors/markdown/markdown.php
  41. +11 −0 framework/web/CWebApplication.php
  42. +6 −0 framework/web/CWebModule.php
  43. +4 −3 framework/yiic.php
  44. +4 −1 framework/zii/widgets/CBaseListView.php
  45. +1 −4 framework/zii/widgets/assets/gridview/jquery.yiigridview.js
  46. +0 −7 framework/zii/widgets/grid/CDataColumn.php
  47. +2 −2 tests/framework/db/CDbTransactionTest.php
  48. +5 −3 tests/framework/db/schema/CMssqlTest.php
  49. +2 −5 tests/framework/web/auth/CDbAuthManagerTest.php
  50. +0 −32 tests/framework/web/auth/schema.sql
View
@@ -14,4 +14,4 @@ before_script:
- echo 'y' | pecl install memcache > ~/memcache.log || ( echo "=== MEMCACHE BUILD FAILED ==="; cat ~/memcache.log )
- echo "extension=memcache.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-script: phpunit --colors --coverage-text framework
+script: phpunit --colors --coverage-text --exclude-group mssql framework
View
@@ -32,7 +32,7 @@ Version 1.1.11 work in progress
- Bug #859: Fixed CSort::applyOrder() and CSort::getOrderBy() to use custom table aliases (troch, samdark)
- Bug #865: CLogRoute called processLogs() even if log array was empty and caused empty emails and log files (cebe)
- Bug #879: Fixed a possible PHP error caused by CWebUser::restoreFromCookie() in combination with CHttpRequest.enableCookieValidation (kidol)
-- Bug #901: Fixed possible encoding problem on exception (mdomba, samdark)
+- Bug #901: Fixed possible encoding problem on exception (mdomba, samdark, cebe)
- Bug #803: Arbitary non-sorting links in CDataColumn's header were not working proper way (resurtm)
- Bug: Fixed CMenu::isItemActive() to work properly when there is a hash in the item's url (SlKelevro)
- Bug: Added missing return statement to CAuthItem->revoke() (mdomba)
@@ -73,8 +73,9 @@ Version 1.1.11 work in progress
- Enh #766: Added 'userId' to $params in CDbAuthManager::checkAccess() and CPhpAuthManager::checkAccess() (cebe)
- Enh #666: Added property $off to CValidator, a list of scenarios that the validator should not be applied to (resurtm)
- Enh #839: CListView::renderItems now resolves view file only once (nizsheanez)
-- Enh #938: CFileValidator::sizeToBytes() is now public and available for using in the whole application (resurtm)
- Enh #873: CStatRelation (CActiveRecord::STAT) now supports scopes (resurtm)
+- Enh #938: CFileValidator::sizeToBytes() is now public and available for using in the whole application (resurtm)
+- Enh #967: Commands from YII_CONSOLE_COMMANDS environment variable are now always added to yiic console application (schmunk)
- Enh: Fixed romanian translation to use the better-supported cedilla characters (tudorilisoi)
- Enh: Added default value to CConsoleCommand::confirm (musterknabe)
- Enh: Allowed returning integer values as application exit code in CConsoleCommand actions (cebe)
@@ -87,6 +88,7 @@ Version 1.1.11 work in progress
- Enh: Added CErrorHandler::getHttpHeader() to send correct HTTP error codes (pgaultier)
- Enh: CGridView, only rows in tbody should have hover effect (mdomba)
- Enh: CHttpCookie now implements __toString (suralc)
+- Enh: Ability to set namespace for module controllers using CWebModule::controllerNamespace, documentation about using namespaced controllers and modules (samdark)
- Enh: Added possibility to set the container for CHtml::radioButtonList and CHtml::checkBoxList() (pgaultier)
- Enh: Added zii romanian(ro) translation; edited core messages to include proper romanian characters with diacritic marks (tudorilisoi)
- Enh: Added ILogFilter interface as an alternative to using CLogFilter as base class for implementing log filters (cebe)
@@ -96,6 +98,7 @@ Version 1.1.11 work in progress
- Chg #497: Added log component and preloaded it in default console application config in order to properly log errors (samdark)
- Chg: Upgraded jQuery to 1.7.2 (samdark)
- Chg: More unit tests added for CHtml (resurtm)
+- Chg: Upgraded bundled markdown parser to v1.2.5 (DaSourcerer)
- New: Added TranslationsCommand build command aimed to help translation teams (samdark)
Version 1.1.10 February 12, 2012
View
@@ -13,10 +13,6 @@
* @version $Id$
*/
-require_once('PHPUnit/Runner/Version.php');
-if(version_compare(PHPUnit_Runner_Version::id(), '3.5.0RC1')>=0)
- require_once('PHPUnit/Autoload.php');
-
$root=dirname(__FILE__);
$config=array('basePath'=>$root);
require_once($root.'/../framework/yiic.php');
Oops, something went wrong.

0 comments on commit a0213a5

Please sign in to comment.