Commit Graph

439 Commits

Author SHA1 Message Date
Qiang Xue
945c6e6a41 ... 2012-04-02 21:08:12 -04:00
Qiang Xue
2dabbb8cc7 Merge branch 'master' of git.yiisoft.com:yii2
Conflicts:
	framework/base/Model.php
2012-03-31 17:09:39 -04:00
Qiang Xue
409c508f78 ... 2012-03-31 15:36:18 -04:00
Alexander Makarov
e790827fac Merge remote-tracking branch 'origin/master'
Conflicts:
	framework/base/Model.php
2012-03-31 15:01:11 +04:00
Alexander Makarov
f552b58d14 more event updates and doc corrections 2012-03-31 14:56:21 +04:00
Qiang Xue
7a2343276e ... 2012-03-30 23:11:07 -04:00
Alexander Makarov
7ff5f12769 Changed events to new style 2012-03-31 03:19:38 +04:00
Qiang Xue
e281b402b6 ... 2012-03-26 21:58:40 -04:00
Qiang Xue
ed513b4da9 ... 2012-03-25 23:39:47 -04:00
Qiang Xue
5ddc1ba18a Finished AR query. 2012-03-25 11:01:01 -04:00
Qiang Xue
233183995a ... 2012-03-24 23:23:29 -04:00
Qiang Xue
0e40fb4a61 finished AR findBySql and eager loading. 2012-03-15 10:57:45 -04:00
Qiang Xue
b90f94fe9a finished eager loading. 2012-03-14 22:53:01 -04:00
Qiang Xue
c50d587275 .. 2012-03-14 00:04:24 -04:00
Qiang Xue
df003215de ... 2012-03-13 23:35:34 -04:00
Qiang Xue
c3216bd05e renamed indexBy to be index. 2012-03-10 14:01:11 -05:00
Qiang Xue
769a114d39 renamed groupBy and orderBy to be group and order. 2012-03-10 13:59:22 -05:00
Qiang Xue
d794a813ec ... 2012-03-04 17:24:38 -05:00
Qiang Xue
62336b43b7 ... 2012-03-02 23:10:58 -05:00
Qiang Xue
50743935d3 ... 2012-03-01 20:18:54 -05:00
Qiang Xue
a53acdf60d .... 2012-03-01 16:01:42 -05:00
Qiang Xue
409eab133e .. 2012-03-01 15:32:43 -05:00
Qiang Xue
4222c9d09a Merge branch 'master' of git.yiisoft.com:yii2
Conflicts:
	framework/db/ar/ActiveFinder.php
	framework/db/ar/ActiveQuery.php
2012-03-01 15:29:40 -05:00
Qiang Xue
3210a2171c ... 2012-03-01 15:24:33 -05:00
Qiang Xue
71fc3dbe35 .. 2012-02-25 12:07:03 -05:00
Qiang Xue
965fe5c4d2 ... 2012-02-25 09:56:04 -05:00
Qiang Xue
cf10943cd3 ... 2012-02-10 23:30:42 -05:00
Qiang Xue
37220ee8c6 ... 2012-02-10 14:17:43 -05:00
Qiang Xue
9d8a401273 ... 2012-02-10 11:25:14 -05:00
Qiang Xue
6d6d8d9590 . 2012-02-06 21:00:40 -05:00
Qiang Xue
c5cdcab6c6 ... 2012-02-06 16:22:42 -05:00
Qiang Xue
da4b7afe59 ... 2012-02-04 20:27:34 -05:00
Qiang Xue
0ba6b4bdec ... 2012-01-30 15:48:46 -05:00
Qiang Xue
376dd0d41e .. 2012-01-30 14:54:38 -05:00
Qiang Xue
1978a4efca ... 2012-01-30 13:27:12 -05:00
Alexander Makarov
e5534b3c14 Merge remote-tracking branch 'origin/master' 2012-01-28 21:15:17 +04:00
Qiang Xue
f62d062269 ... 2012-01-28 11:49:21 -05:00
Alexander Makarov
6f964b6d3a corrected phpdoc 2012-01-28 20:43:27 +04:00
Qiang Xue
1b7c00a044 ... 2012-01-28 09:47:22 -05:00
Qiang Xue
86ae5bdf28 .. 2012-01-25 23:06:28 -05:00
Qiang Xue
a92acf65ce ... 2012-01-25 22:36:18 -05:00
Qiang Xue
2f37d09367 ... 2011-12-31 21:08:37 -05:00
Qiang Xue
95135f11ef ... 2011-12-30 10:31:53 -05:00
Qiang Xue
a00afed163 ... 2011-12-30 00:25:38 -05:00
Qiang Xue
702476d886 ... 2011-12-28 14:07:25 -05:00
Qiang Xue
1295fbe2bc ... 2011-12-27 23:17:39 -05:00
Qiang Xue
eddf9937e1 ... 2011-12-27 22:35:01 -05:00
Qiang Xue
1dd651df51 ... 2011-12-27 17:33:51 -05:00
Qiang Xue
3301b9d6b2 ... 2011-12-27 17:28:48 -05:00
Qiang Xue
bcd884adb4 ... 2011-12-27 16:56:41 -05:00