Commit Graph

7547 Commits

Author SHA1 Message Date
Carsten Brandt
44bdb65d7b Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Creating transport at 'yii\swiftmailer\Mailer' fixed to track possible "__call".
  Unit test for 'yii\swiftmailer\Message' fixed.
2013-11-08 12:34:37 +01:00
Carsten Brandt
5ddb0e2cbf controller php-doc 2013-11-08 12:34:13 +01:00
Paul Klimov
d1f18e43f7 Merge branch 'master' of github.com:yiisoft/yii2 2013-11-08 13:25:49 +02:00
Carsten Brandt
913eb62294 updated phpdoc and fixed generator read/write-only annotation 2013-11-08 12:24:03 +01:00
Paul Klimov
5a584c0bda Creating transport at 'yii\swiftmailer\Mailer' fixed to track possible "__call". 2013-11-08 13:23:14 +02:00
Paul Klimov
a38c280a29 Unit test for 'yii\swiftmailer\Message' fixed. 2013-11-08 13:18:19 +02:00
Paul Klimov
aa347f1e4c Merge branch 'master' of github.com:yiisoft/yii2 into sphinx 2013-11-08 11:02:10 +02:00
Paul Klimov
6934707d25 Merge branch 'master' of github.com:yiisoft/yii2 into sphinx 2013-11-08 11:01:57 +02:00
Qiang Xue
998cf7e675 updated apps to use the mail component. 2013-11-07 23:01:13 -05:00
Qiang Xue
9763086842 Fixed test break 2013-11-07 22:57:49 -05:00
Qiang Xue
f7f76a3e62 Fixed test break. 2013-11-07 22:43:47 -05:00
Qiang Xue
4bf6ee45b7 Merge branch 'master' of github.com:yiisoft/yii2 2013-11-07 22:34:14 -05:00
Qiang Xue
90a5bcc611 Refactored mail. 2013-11-07 22:33:57 -05:00
Carsten Brandt
3e11b31b6a removed conflicting use statement
fixes #1161
2013-11-08 02:32:02 +01:00
Qiang Xue
ed0e44d23b minor touch up of swiftmailer. 2013-11-07 13:08:49 -05:00
Qiang Xue
7b91011032 Adjusted the directories of swiftmailer. 2013-11-07 11:01:43 -05:00
Qiang Xue
d0a2358217 Merge pull request #1049 from klimov-paul/email-swift-2
Proposal for #31: email component based on SwiftMailer
2013-11-07 07:56:22 -08:00
Qiang Xue
bc393ff5d3 added doc about sub-relation. 2013-11-07 10:38:12 -05:00
Qiang Xue
3701cbd55f Merge pull request #1125 from cebe/842-relation-data
Proposal for accessing populated relations
2013-11-07 07:30:37 -08:00
Paul Klimov
9dbf4d7420 Mailer default view class changed to "yii\web\View". 2013-11-07 17:18:48 +02:00
Paul Klimov
f77a047273 Merge branch 'master' of github.com:yiisoft/yii2 into email-swift-2 2013-11-07 17:16:40 +02:00
Paul Klimov
85c26332c5 Doc comments for "MessageInterface" and "MailerInterface" updated. 2013-11-07 17:16:25 +02:00
Paul Klimov
b9137dfef6 Sphinx command and query added. 2013-11-07 16:58:39 +02:00
Paul Klimov
afcdcb9a72 Merge branch 'master' of github.com:yiisoft/yii2 into sphinx 2013-11-07 13:10:32 +02:00
Paul Klimov
104cfd7cb2 'yii\mail\MessageInterface' methods renamed: 'text' to 'textBody', 'html' to 'htmlBody' 2013-11-07 12:22:24 +02:00
Carsten Brandt
0bc8cbf158 php-doc
[ci skip]
2013-11-07 11:18:16 +01:00
Paul Klimov
1aafa73e15 Render methods removed from 'yii\mail\MessageInterface'.
Method 'yii\mail\MailerInterface::compose()' reworked allowing rendering message body.
2013-11-07 12:18:07 +02:00
Carsten Brandt
c4468ac315 forgot to remove strtolower from __get and __unset 2013-11-07 11:09:35 +01:00
Carsten Brandt
a23c54acb8 made relation names in AR case sensitive 2013-11-07 10:39:35 +01:00
Alexander Makarov
65d7ffa74f Fixed View refactoring test breakage 2013-11-07 01:31:27 +04:00
Alexander Makarov
f2484fd616 Modified application templates so when trying to log in when already logged in it just redirects to homepage instead of throwing exceptions 2013-11-07 01:19:36 +04:00
Alexander Makarov
d3f5d34819 Fixed advanced app error view 2013-11-07 01:15:01 +04:00
Alexander Makarov
a65734abc3 Merge pull request #1152 from yiisoft/view-refactoring
Refactored View
2013-11-06 12:45:45 -08:00
Carsten Brandt
08a668989d Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Fix typo
2013-11-06 20:27:28 +01:00
Carsten Brandt
0ea05a6460 added unit tests for logger and log target
related to #1151
2013-11-06 20:26:49 +01:00
Alexander Makarov
927e9dddb4 Refactored View 2013-11-06 22:52:27 +04:00
Qiang Xue
7462075403 Merge pull request #1150 from marsuboss/patch-1
Fixed typo
2013-11-06 08:47:09 -08:00
marsuboss
a652ac8a4e Fix typo 2013-11-06 17:05:46 +01:00
Carsten Brandt
086326b1ee Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Fixes #1146: Gii generates wrong relation.
2013-11-06 14:31:36 +01:00
Carsten Brandt
07391b6dc1 fixed wrong relation class name in gii model generator
fixes #1146
2013-11-06 14:30:53 +01:00
Qiang Xue
0515d32bdf Fixes #1146: Gii generates wrong relation. 2013-11-06 08:30:36 -05:00
Paul Klimov
ad7761f96a Method 'yii\mail\MessageInterface::compose()' renamed to 'yii\mail\MessageInterface::message()'. 2013-11-06 13:27:07 +02:00
Paul Klimov
3d1a625cbb 'yii\mail\MessageInterface' updated:
- 'body()' renamed to 'renderBody()'
- new 'body()' method introduced
2013-11-06 12:48:44 +02:00
Paul Klimov
b0c5981d42 Method names "yii\mail\MessageInterface" simplified. 2013-11-06 12:28:39 +02:00
Alexander Makarov
b7990d3d37 Added FAQ to composer doc 2013-11-06 14:15:58 +04:00
Qiang Xue
cbab0951dc reverted back jquery asset. 2013-11-05 20:11:22 -05:00
Qiang Xue
3cb61cac17 fixed jqueryasset path. 2013-11-05 18:56:33 -05:00
Qiang Xue
0a7cef7c1c change to use frameworks/jquery temporarily. 2013-11-05 18:48:01 -05:00
Qiang Xue
372c5e1f1c Moved jquery.js to external package. 2013-11-05 18:19:37 -05:00
Qiang Xue
b700f7129e fixes #1142: exposes Command::params. 2013-11-05 14:52:12 -05:00