Commit Graph

7316 Commits

Author SHA1 Message Date
Carsten Brandt
c6e1a2f02f Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2: (79 commits)
  Refactored app bootstrap logic.
  Update authorization.md
  Fixes #3052: Fixed the issue that cache dependency data is not reused when `reusable` is set true
  start debug logging only if debug runs when bootstrap.
  Update finnish translation
  Add ODBC support to yii\db\Connection
  updated error handler and requirement checker links.
  fixed broken API links [skip ci]
  added more doc [skip ci]
  update class map.
  Fixes #2034: Added `ContentNegotiator` to support response format and language negotiation
  renamed attributes to attributeNames in model
  updated phpdoc
  Removed `Application::preload` in favor of `Application::bootstrap`
  Update module-debug.md
  Update model.md
  Fixes
  Update basics.md
  typo fix [skip ci]
  Added `HtmlResponseFormatter` and `JsonResponseFormatter`
  ...
2014-04-10 22:22:36 +02:00
Carsten Brandt
3c400dbca8 fixed file PHPdoc
issue #3026
2014-04-10 22:10:59 +02:00
Qiang Xue
ea75177abc Refactored app bootstrap logic. 2014-04-10 15:05:01 -04:00
resurtm
567a2bf280 Merge pull request #3058 from armab/patch-1
Update authorization.md
2014-04-10 23:36:28 +06:00
armab
8478db4e28 Update authorization.md
RBAC Rule small fix
2014-04-10 20:26:39 +03:00
Qiang Xue
4674f5b74c Fixes #3052: Fixed the issue that cache dependency data is not reused when reusable is set true 2014-04-10 13:03:22 -04:00
Qiang Xue
3349af1ae5 Merge pull request #3049 from resurtm/db-connection-odbc
Add ODBC support to yii\db\Connection
2014-04-10 09:53:18 -04:00
Qiang Xue
629ed62983 start debug logging only if debug runs when bootstrap. 2014-04-10 08:45:33 -04:00
Alexander Makarov
a0636168ad Merge pull request #3051 from janisto/message_fi_update-2
Update finnish translation
2014-04-10 05:01:12 -07:00
Alexander Makarov
01b1c07d81 Merge pull request #2977 from PaulVanSchayck/fix-webdriver-test
Add wait() to login test with wrong credentials to fix WebDriver test
2014-04-10 05:00:32 -07:00
Jani Mikkonen
3397e7e7b2 Update finnish translation 2014-04-10 14:11:06 +03:00
resurtm
1991c4cbbd Add ODBC support to yii\db\Connection 2014-04-10 14:53:02 +06:00
Qiang Xue
055455d814 updated error handler and requirement checker links. 2014-04-10 00:05:05 -04:00
Qiang Xue
0b29c9607d fixed broken API links [skip ci] 2014-04-09 22:22:49 -04:00
Qiang Xue
eeb9f6026d added more doc [skip ci] 2014-04-09 21:35:19 -04:00
Qiang Xue
5751b58180 update class map. 2014-04-09 19:16:55 -04:00
Qiang Xue
134d3d4610 Fixes #2034: Added ContentNegotiator to support response format and language negotiation 2014-04-09 14:57:04 -04:00
Carsten Brandt
fa767ceaca renamed attributes to attributeNames in model
fixes #3034
2014-04-09 18:54:53 +02:00
Carsten Brandt
3fdcf11f24 updated phpdoc 2014-04-09 18:51:45 +02:00
Carsten Brandt
79b4f4d64b Merge pull request #3032 from arisk/patch-5
Update basics.md [skip ci]
2014-04-09 18:19:02 +02:00
Qiang Xue
586f5b87b0 Removed Application::preload in favor of Application::bootstrap 2014-04-09 10:47:10 -04:00
Alexander Makarov
b2c8dba090 Merge pull request #3041 from MetalGuardian/update-module-debug-md
Update module-debug.md
2014-04-09 06:31:03 -07:00
MetalGuardian
ef03e62e1f Update module-debug.md 2014-04-09 16:28:31 +03:00
Alexander Makarov
b201c39633 Merge pull request #3040 from MetalGuardian/update-model-md
Update model.md
2014-04-09 05:54:57 -07:00
MetalGuardian
b2aaffee7c Update model.md 2014-04-09 15:47:49 +03:00
Aris Karageorgos
6d663bd237 Fixes 2014-04-09 15:16:10 +07:00
Aris Karageorgos
86283c6c35 Update basics.md 2014-04-09 11:10:59 +07:00
Qiang Xue
c4af1569a3 typo fix [skip ci] 2014-04-08 21:03:11 -04:00
Qiang Xue
aec1b8172b Added HtmlResponseFormatter and JsonResponseFormatter 2014-04-08 20:54:07 -04:00
Alexander Makarov
f6eb5e69bc Fixes #2998: Added framework\log\SyslogTarget that is able to write log to syslog 2014-04-09 01:46:18 +04:00
Alexander Makarov
171cab2d6f Merge branch 'SyslogTarget' of github.com:miramir/yii2 into miramir-SyslogTarget 2014-04-09 01:41:45 +04:00
Qiang Xue
e59b2d8948 refactored rule execution. [skip ci] 2014-04-08 08:40:37 -04:00
Qiang Xue
a404e00b02 simplified rule execution [skip ci] 2014-04-08 08:38:34 -04:00
Qiang Xue
face5262e6 Merge pull request #3027 from Alex-Code/addSelect
addSelect method for Query
2014-04-08 08:35:34 -04:00
Carsten Brandt
93d18dcbdd Update IdentityInterface.php
fixes #3028
2014-04-08 14:02:10 +02:00
Alex-Code
d133abf60a Update CHANGELOG.md 2014-04-08 12:13:52 +01:00
Alex-Code
80067204c8 test for addSelect method. 2014-04-08 12:11:55 +01:00
Carsten Brandt
4910343a6f Merge pull request #3026 from robregonm/master
Fixed typo in phpDoc for findAll function
2014-04-08 13:11:00 +02:00
Alex-Code
cee5fa5dd3 New addSelect method
New addSelect method. Useful for scopes.
2014-04-08 12:10:29 +01:00
Ricardo Obregón
e16a3e6192 Fixed typo in phpDoc for findAll function 2014-04-08 05:55:09 -05:00
Qiang Xue
3a261ffc61 Merge branch 'master' of git://github.com/yiisoft/yii2 2014-04-07 20:07:35 -04:00
Qiang Xue
5e9015c89a Fixes #2968. 2014-04-07 20:07:25 -04:00
Qiang Xue
f46b51eaf4 Better executeRule implementation. 2014-04-07 19:59:48 -04:00
Qiang Xue
61e0aa24de Merge pull request #3019 from ufisch/master
Wrong placeholder in translation
2014-04-07 19:54:00 -04:00
Qiang Xue
a16c2eb653 Use proper error message. 2014-04-07 19:52:30 -04:00
Qiang Xue
2acf0b310c Merge pull request #3021 from zelenin/auth-guide-fix
Authorization auth guide fix
2014-04-07 19:46:45 -04:00
Qiang Xue
ab9d4d42a1 changelog fix. 2014-04-07 18:49:24 -04:00
Aleksandr Zelenin
034ba5e625 auth guide fix 2014-04-08 01:26:19 +04:00
ufisch
95d0ab1b1f Wrong placeholder in translation 2014-04-07 22:55:55 +02:00
Qiang Xue
a75a44156e Merge pull request #3003 from yiisoft/split-find-into-find-findOne-findAll
Refactored AR find to fix #2999
2014-04-07 16:33:37 -04:00