Commit Graph

7316 Commits

Author SHA1 Message Date
Qiang Xue
581aad8e22 Fixed test break. 2014-04-04 10:25:08 -04:00
Qiang Xue
4889ff9cbb Merge pull request #2981 from yiisoft/fix-duplicated-joins
removed duplicated joins when using joinWith and via relations
2014-04-04 09:44:44 -04:00
Carsten Brandt
1a3accb6cb removed duplicated joins when using joinWith and via relations
fixes #2650
2014-04-04 15:34:19 +02:00
lubosdz
612d3ed27d removed redundant whitespace 2014-04-04 15:18:58 +02:00
Qiang Xue
7437e21d17 Merge pull request #2976 from jeicd/urlmanager_fix
Fixed UrlManager rules caching
2014-04-04 08:39:40 -04:00
Qiang Xue
4283342e83 Merge pull request #2979 from lubosdz/master
Fixes issue #2978 - JSON MIME type
2014-04-04 08:01:05 -04:00
lubosdz
b6826cb20b Fixed test break and JSON MIME type. Fixes issue #2978. 2014-04-04 13:57:19 +02:00
lubosdz
164459f90a Fixed test break and JSON MIME type. Fixes issue #2978. 2014-04-04 13:54:04 +02:00
lubosdz
0040633fa4 Fixed test break and JSON MIME type. Fixes issue #2978. 2014-04-04 13:50:58 +02:00
Paul van Schayck
0456cd660a Add wait() to login test with wrong credentials to fix WebDriver test 2014-04-04 12:16:17 +02:00
jeicd
76402ea079 Fixed UrlManager rules caching 2014-04-04 13:27:20 +06:00
Alexander Makarov
a97a35bab7 fixed typo 2014-04-04 04:40:17 +04:00
Alexander Makarov
0e6cbda43e RBAC: decoupled rules from assignments and items, implemented php manager 2014-04-04 04:40:06 +04:00
Carsten Brandt
4f50295f41 created build ReleaseController 2014-04-03 21:02:17 +02: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
a6aaafd3e6 Fixed test break. 2014-04-03 13:55:34 -04: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
3ea6343799 improved search model [skip ci] 2014-04-03 09:48:17 -04:00
Qiang Xue
b23cb17713 fixed search model to use base model class. 2014-04-03 08:27:31 -04:00
Qiang Xue
1e098ebd4b simplified search model [skip ci] 2014-04-02 21:20:27 -04:00
Qiang Xue
f747768fcf improved search model generator. 2014-04-02 20:47:01 -04:00
Qiang Xue
3ba9dcbedc Fixed test break. 2014-04-02 20:26:55 -04:00
Qiang Xue
2efb5aaf31 added filterWhere guide. 2014-04-02 20:17:13 -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
Carsten Brandt
03e208e59d removed wrong test 2014-04-02 21:39:53 +02:00
Qiang Xue
869d96ee0d Fixed test break. 2014-04-02 15:25:08 -04:00
Carsten Brandt
ff83bd1bb5 removed todo
fixes #2887
2014-04-02 19:37:59 +02: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
d97996c354 added tests for redis 2014-04-02 19:21:26 +02:00
Carsten Brandt
e9c364d2f2 added proper tests for elasticsearch 2014-04-02 19:15:21 +02:00
Carsten Brandt
e9e59483f4 removed unnecessary code duplication 2014-04-02 19:07:13 +02:00
Carsten Brandt
c572c23c2f adjusted tests 2014-04-02 18:56:49 +02:00
Carsten Brandt
51eabf527f typo 2014-04-02 18:50:49 +02:00
Carsten Brandt
96f1c4c10b renamed Query::filter() to Query::filterWhere() 2014-04-02 18:48:14 +02:00
Carsten Brandt
e5ba8c8715 reverted elasticsearch rename of filter 2014-04-02 18:47:30 +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
Qiang Xue
ac12f9ec16 Merge pull request #2962 from githubjeka/patch-1
add @method hasOne|hasMany declaration in yii\db\ActiveRecord.
2014-04-02 10:06:32 -04: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
3a232743a4 Added info about table prefix syntax to the guide 2014-04-02 14:17:19 +04:00
Alexander Makarov
663d3fedc8 Added defaultView to ViewAction 2014-04-02 12:42:04 +04:00
Alexander Makarov
96d388200a Merge pull request #2954 from dinhtrung/master
Add Vietnamese into messages.
2014-04-02 12:28:51 +04:00
Alex-Code
1c80b9d2cc Test case for new truncate methods.
Test case for new truncate methods.
2014-04-02 08:51:02 +01:00
Nguyễn Đình Trung
6595504f81 Add Vietnamese into messages. 2014-04-02 12:45:40 +07:00