Commit Graph

3566 Commits

Author SHA1 Message Date
Alexander Makarov
0e6cbda43e RBAC: decoupled rules from assignments and items, implemented php manager 2014-04-04 04:40:06 +04:00
Carsten Brandt
865b71ef5e cleanup CHANGELOGs 2014-04-03 20:28:08 +02:00
Carsten Brandt
44dbb2235a cleanup docs 2014-04-03 20:13:32 +02:00
Qiang Xue
54e08f3f01 fixed build break. 2014-04-03 11:57:49 -04:00
Qiang Xue
8b4dfcc876 Fixes #2955: Changed the signature of ActiveQuery constructors and ActiveRecord::createQuery() to simplify customizing ActiveQuery classes 2014-04-03 10:36:52 -04:00
Qiang Xue
0fa19291f1 refactored filterWhere(). 2014-04-02 20:03:42 -04:00
Alexander Makarov
85bb94a668 Added nl to languages 2014-04-03 01:45:13 +04:00
Alexander Makarov
0fa418bfdb Removed app.php from vi messages, sorted languages 2014-04-03 01:43:49 +04:00
Qiang Xue
869d96ee0d Fixed test break. 2014-04-02 15:25:08 -04:00
Carsten Brandt
745c20538c Merge pull request #2885 branch 'query-filter'
* query-filter:
  added CHANGELOG lines
  added tests for redis
  added proper tests for elasticsearch
  removed unnecessary code duplication
  adjusted tests
  typo
  renamed Query::filter() to Query::filterWhere()
  reverted elasticsearch rename of filter
  Adjusted search model code generated by Gii CRUD generator
  Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query
  Gii CRUD generator now uses new addFilter method
  Query::filter() adjustments
  fixes #2002
  Added tests for Query::filter()

Conflicts:
	framework/db/QueryTrait.php
2014-04-02 19:33:40 +02:00
Carsten Brandt
cc0d5b6f94 added CHANGELOG lines 2014-04-02 19:22:43 +02:00
Carsten Brandt
e9e59483f4 removed unnecessary code duplication 2014-04-02 19:07:13 +02:00
Carsten Brandt
96f1c4c10b renamed Query::filter() to Query::filterWhere() 2014-04-02 18:48:14 +02:00
Qiang Xue
a440abad21 doc fix [skip ci] 2014-04-02 11:18:41 -04:00
Carsten Brandt
a35ef1ce7a added andOnCondition and orOnCondition to ActiveQuery
fixes #2957
2014-04-02 16:17:50 +02:00
Evgeniy Tkachenko
90caa527f2 Update ActiveRecord.php
fix for https://github.com/yiisoft/yii2/pull/2958
2014-04-02 17:00:39 +03:00
Alexander Makarov
ada39df60b Corrected theming docs not to give an example of theme view files under webroot 2014-04-02 17:07:04 +04:00
Alexander Makarov
663d3fedc8 Added defaultView to ViewAction 2014-04-02 12:42:04 +04:00
Nguyễn Đình Trung
6595504f81 Add Vietnamese into messages. 2014-04-02 12:45:40 +07:00
Qiang Xue
c0e06b447c Refactored ViewAction. 2014-04-01 12:14:59 -04:00
Alexander Makarov
a528b2ed1c Merge pull request #2934 from yiisoft/action-for-static-pages
Fixes #2932: Added `yii\web\ViewAction` that allow you to render views based on GET parameter
2014-04-01 19:58:08 +04:00
Alexander Makarov
0cce768443 Removed ViewAction::afterRun() 2014-04-01 19:12:34 +04:00
resurtm
a2c3538553 Proper language name is kk, not kz as it was before
See this for more details: https://github.com/yiisoft/yii/pull/3300
2014-04-01 16:47:51 +06:00
Alexander Makarov
9fd0dcedaa Extracted render method to allow custom renderers by subclassing 2014-04-01 13:15:51 +04:00
Alexander Makarov
a4be5bc910 Dropped defaultView 2014-04-01 13:13:15 +04:00
Alexander Makarov
542d532b12 Renamed basePath to viewPrefix 2014-04-01 13:12:09 +04:00
Qiang Xue
a0f9a6d701 Fixes #2937 2014-03-31 23:17:39 -04:00
Alexander Makarov
9936acf764 Fixes #2932: Added yii\web\ViewAction that allow you to render views based on GET parameter 2014-04-01 00:41:21 +04:00
Qiang Xue
271dccdc6b Fixes #2931. 2014-03-31 11:34:47 -04:00
Alexander Makarov
06fdb79730 Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query 2014-03-31 15:09:33 +04:00
Qiang Xue
338b6aa7d3 Refactored ActiveRecord::find() so that find(null) will also return an ActiveRecord instance instead of ActiveQuery. 2014-03-30 19:01:02 -04:00
Carsten Brandt
3fb840f3f3 updated errorhandler views doc 2014-03-31 00:43:08 +02:00
Alexander Makarov
ecf019e311 Merge branch 'master' 2014-03-31 02:20:56 +04:00
Alexander Makarov
6054ede16a Fixed phpdoc, removed unit tests for Formatter asRelativeTime that were relative to current time since it was impossible to specify correct expected values 2014-03-31 02:05:04 +04:00
Alexander Makarov
05afeb4831 Merge branch 'master' 2014-03-31 01:06:09 +04:00
Qiang Xue
5adcac52a6 improved DI definition normalization. 2014-03-30 17:03:44 -04:00
Carsten Brandt
21f2602c10 Merge pull request #2916 from yiisoft/refactor-errorhandler
Refactor errorhandler
2014-03-30 22:54:50 +02:00
Qiang Xue
c23b671f3b better fix [skip ci] 2014-03-30 12:39:22 -04:00
Qiang Xue
03db4c468a Fixes #2921 2014-03-30 12:38:04 -04:00
Qiang Xue
4acab5c42d fixed data-method. 2014-03-30 12:23:10 -04:00
Alexander Makarov
cb4488ae4c Implemented Oracle column comment reading from another schema 2014-03-30 19:41:47 +04:00
Alexander Makarov
ab799d8ea9 Fixes #2911: Removed tbl_ default for table prefix 2014-03-30 19:33:46 +04:00
Carsten Brandt
f6ce9ead97 removed unnecessary static var 2014-03-30 12:38:13 +02:00
Carsten Brandt
7be743e1a7 cleanup application errorHandler getter 2014-03-30 12:24:45 +02:00
Carsten Brandt
a64429acf3 removed TODOs 2014-03-30 12:01:08 +02:00
Carsten Brandt
a4b6fb263d handle Exceptions in application init() 2014-03-30 01:27:18 +01:00
Carsten Brandt
89f6a00147 created console errorHandler 2014-03-30 01:04:43 +01:00
Carsten Brandt
f2b20d99d5 Merge branch 'master' into refactor-errorhandler
* master:
  Fixes #2912: Relative view files will be looked for under the directory containing the view currently being rendered
  app end improvement.
  improvement of Application::end() handling.
  typo fix.
  Fixes #2910: Added `Application::end()`

Conflicts:
	framework/base/Application.php
2014-03-30 00:27:51 +01:00
Carsten Brandt
c93231e26b improved session error handling
fixes #1946
2014-03-29 23:54:26 +01:00
Carsten Brandt
8b4d4a0b25 cleanup web errorhandler 2014-03-29 23:02:35 +01:00