Permalink
Browse files

Merge branch 'master' of https://github.com/yiisoft/yii.git into form…

…atHour
  • Loading branch information...
2 parents 40b5025 + 1287d21 commit 1adca742316dde05b7dcfcfd7cb84dbe1948db41 @adminnu committed Jan 19, 2013
Showing 1,023 changed files with 8,483 additions and 983 deletions.
View
@@ -9,6 +9,7 @@ Version 1.1.14 work in progress
- Bug #1915: CDataProviderIterator: fixed init in case of disabled pagination (antoncpu)
- Bug #1941: yiiactiveform.js form reset now uses CHtml::errorCss instead of a hardcoded value (mdomba)
- Bug #1942: CActiveForm client/ajax validation will now remove error class from server side validation (mdomba)
+- Bug #1984: CDbMigration: fix of undeclared variable usage in debug information in dropPrimaryKey (papulovskiy)
- Enh #1847: Added COutputCache::varyByLanguage to generate separate cache for different languages (Obramko)
- Enh #1971: Added CLocale::getHourMeridian defining hour meridian type for the current locale (adminnu)
- Chg #645: CDbConnection now throws CDbException when failed to open DB connection instead of failing with a warning (kidol, eirikhm, samdark, cebe)
View
@@ -1,7 +1,7 @@
The Yii framework is free software. It is released under the terms of
the following BSD License.
-Copyright © 2008-2011 by Yii Software LLC (http://www.yiisoft.com)
+Copyright (c) 2008-2013 by Yii Software LLC (http://www.yiisoft.com)
All rights reserved.
Redistribution and use in source and binary forms, with or without
View
@@ -8,7 +8,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @copyright 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
View
@@ -7,7 +7,7 @@ rem This is the bootstrap script for running build on Windows.
rem
rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/
-rem @copyright Copyright &copy; 2008 Yii Software LLC
+rem @copyright 2008 Yii Software LLC
rem @license http://www.yiiframework.com/license/
rem @version $Id$
rem -------------------------------------------------------------
View
@@ -5,7 +5,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2009 Yii Software LLC
+ * @copyright 2008-2009 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
-->
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
Yii::import('application.commands.api.ApiModel');
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -207,7 +207,7 @@ protected function process($path)
* Copyright © 1991-2007 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
*
- * Copyright © 2008-2011 Yii Software LLC (http://www.yiiframework.com/license/)
+ * @copyright 2008-2013 Yii Software LLC (http://www.yiiframework.com/license/)
*/
return $data;
EOD;
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -58,7 +58,7 @@ public function run($args)
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2012 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
* @version \$Id: \$
* @since 1.0
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2012 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -21,7 +21,7 @@
</div><!-- end of content -->
<div id="apiFooter">
-Copyright &copy; 2008-2011 by <a href="http://www.yiisoft.com">Yii Software LLC</a><br/>
+&copy; 2008-2013 by <a href="http://www.yiisoft.com">Yii Software LLC</a><br/>
All Rights Reserved.<br/>
</div><!-- end of footer -->
@@ -15,7 +15,7 @@
%\begin{center} \large \today \end{center}
\begin{center}
- Copyright 2008-2012. All Rights Reserved.
+ Copyright 2008-2013. All Rights Reserved.
\end{center}
\vfill
@@ -15,7 +15,7 @@
%\begin{center} \large \today \end{center}
\begin{center}
- Copyright 2008-2012. All Rights Reserved.
+ Copyright 2008-2013. All Rights Reserved.
\end{center}
\vfill
@@ -5,7 +5,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2010 Yii Software LLC
+ * @copyright 2008-2010 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Wei Zhuo <weizho@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
View
@@ -30,7 +30,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2010 Yii Software LLC
+ * @copyright 2008-2010 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -114,7 +114,7 @@ automatically.
An event can be attached with multiple handlers. When the event is raised,
the handlers will be invoked in the order that they are attached to the event.
-If a handler decides to prevent the rest handlers from being invoked, it can set
+If a handler decides to prevent the rest of the handlers from being invoked, it can set
[$event->handled|CEvent::handled] to be true.
@@ -130,7 +130,7 @@ A component can be attached with several behaviors and thus achieve 'multiple in
Behavior classes must implement the [IBehavior] interface. Most behaviors can
extend from the [CBehavior] base class. If a behavior needs to be attached to
a [model](/doc/guide/basics.model), it may also extend from [CModelBehavior] or
-[CActiveRecordBehavior] which implements additional features specifc for models.
+[CActiveRecordBehavior] which implements additional features specific for models.
To use a behavior, it must be attached to a component first by calling the behavior's
[attach()|IBehavior::attach] method. Then we can call a behavior method via the component:
@@ -3,6 +3,10 @@
このページは、各々の Yii リリースにおいて導入された主な新機能をまとめています。
+Version 1.1.14
+--------------
+ * [CPasswordHelper] を追加
+
Version 1.1.11
--------------
* [http キャッシュのサポートを追加](/doc/guide/caching.page#sec-3)
@@ -585,4 +585,3 @@ $contents=Content::model()->findAll();
> これらは、`INSERT`、`UPDATE`、`DELETE` クエリに対しては無視されます。
> さらに、デフォルトスコープまたは名前付きスコープを宣言するとき、そのスコープを宣言するメソッドの中では AR クラスを使って DB クエリを作成することが出来ません。
-<div class="revision">$Id$</div>
View
@@ -5,7 +5,7 @@ Yii 公式ガイド
All Rights Reserved.
-2008-2010 (c) Yii Software LLC.
+2008-2013 (c) Yii Software LLC.
翻訳:
mocapapa &lt;<mocapapa@g.pugpug.org>&gt;,
@@ -192,5 +192,3 @@ class PostController extends CController
サービスプロバイダで [IWebServiceProvider] インタフェースを実装することで、リモートからのメソッド呼び出しを阻止することができます。
[IWebServiceProvider::beforeWebMethod] 内でプロバイダは [CWebService] のインスタンスをうけとり、[CWebService::methodName] によって、リクエストされたメソッド名を得ることができます。
何らかの理由 (例: 権限のないアクセスなど) でリモートからのメソッド呼び出しを許可したくない場合は、false を返すことで呼び出しを阻止できます。
-
-<div class="revision">$Id$</div>
View
@@ -5,7 +5,7 @@ Ten przewodnik został wydany zgodnie z [warunkami dokumentacji Yii](http://www.
Wszystkie prawa zastrzeżone.
-2008-2011 &copy; Yii Software LLC.
+2008-2013 &copy; Yii Software LLC.
<div class="revision">$Id: index.txt 1679 2010-01-07 21:03:36Z qiang.xue $</div>
@@ -21,7 +21,7 @@ Yii 权威指南
All Rights Reserved.
-2008-2012 &copy; Yii Software LLC.
+2008-2013 &copy; Yii Software LLC.
<div class="revision">$Id: index.txt 2335 2012-02-27 03:39:10Z dongbeta@qq.com $</div>
Oops, something went wrong.

0 comments on commit 1adca74

Please sign in to comment.