Commit Graph

809 Commits

Author SHA1 Message Date
Carsten Brandt
563243a415 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Corrected default paths for Twig and Smarty
2013-05-07 23:42:41 +02:00
Alexander Makarov
74185cb7fc Corrected default paths for Twig and Smarty 2013-05-08 01:39:20 +04:00
Carsten Brandt
6faf8344a9 Spaces -> Tabs 2013-05-07 23:38:54 +02:00
Carsten Brandt
7e0d35c308 Merge pull request #144 from tonydspaniard/master
Proposed refactor of ConsoleColor to Console
2013-05-07 14:31:03 -07:00
Alexander Makarov
92ec41cc7b Moved Composer vendor dir into framework 2013-05-08 01:30:08 +04:00
Alexander Makarov
f2258e760f Added Purifier and Markdown helpers, added composer.lock 2013-05-08 00:31:55 +04:00
Qiang Xue
17807874b6 Fixes issue #53: implemented Menu. 2013-05-07 15:46:21 -04:00
Alexander Kochetov
82bcd0b298 Fixes 2013-05-07 20:13:15 +04:00
Alexander Kochetov
684295fe0b Fixes 2013-05-07 20:11:31 +04:00
Alexander Kochetov
48d04fbb8c !== array() => !empty() 2013-05-07 19:57:27 +04:00
Alexander Kochetov
d7df7053e0 === array() => empty() 2013-05-07 19:51:29 +04:00
Antonio Ramirez
e1c788233a fixed typo 2013-05-07 17:46:08 +02:00
Qiang Xue
901dabc301 Merge pull request #162 from creocoder/active-record-get-relation
ActiveRecord::getRelation() bugfix
2013-05-07 07:51:49 -07:00
Alexander Kochetov
e3f6faf575 && => || fix 2013-05-07 18:40:31 +04:00
Alexander Kochetov
37f3a400cd ActiveRecord::getRelation() bugfix 2013-05-07 18:36:38 +04:00
Alexander Kochetov
f12518f45c ActiveRecord::insert() and ActiveRecord::update() refactoring 2013-05-07 18:10:50 +04:00
Qiang Xue
dd5969147d move JsExpression to web. 2013-05-07 07:39:24 -04:00
Qiang Xue
f3c17594c6 Fixes issue #155. 2013-05-07 07:18:39 -04:00
Qiang Xue
50aa72467f Renamed YiiBase to \yii\YiiBase. 2013-05-06 20:24:19 -04:00
Qiang Xue
7f35028bfe Merge pull request #147 from slavcodev/bug#146
Fix attaching behavior via config
2013-05-06 13:48:23 -07:00
slavcopost
a94c432311 Fix attaching behavior via config 2013-05-06 23:40:32 +03:00
Qiang Xue
1415c12c5a Changed default value of View::renderers. 2013-05-06 16:34:20 -04:00
slavcopost
3d40b171e0 Fix attaching behavior via config 2013-05-06 23:27:11 +03:00
Qiang Xue
235ad40c2b Menu WIP 2013-05-06 14:52:26 -04:00
Qiang Xue
f01414fff2 Refactored Breadcrumbs. 2013-05-06 13:34:28 -04:00
Qiang Xue
02319b99a0 Fixes issue #54: Implemented Breadcrumbs. 2013-05-06 12:14:40 -04:00
Qiang Xue
c4b04b78d2 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-06 11:16:12 -04:00
Qiang Xue
b19f640b66 Added Breadcrumbs.php 2013-05-06 11:14:25 -04:00
Qiang Xue
034d88e5e4 Fixes issue #134 2013-05-06 08:04:35 -04:00
resurtm
3ca98d458e Merge branch 'master' of github.com:yiisoft/yii2 2013-05-06 17:47:26 +06:00
resurtm
e9ad7d6e36 Rollback word consistencty over entire codebase (ref. #139). 2013-05-06 17:46:34 +06:00
Antonio Ramirez
a20bd45645 Fixed formatting 2013-05-06 13:00:54 +02:00
Antonio Ramirez
ba0032b1cd proposed refactor of ConsoleColor 2013-05-06 12:49:29 +02:00
resurtm
87c2fefe09 Initial MSSQL related commit. 2013-05-06 16:46:33 +06:00
mdeweerd
2d1180f35c Add ensureBehaviors() to detachBehavior*()
Need to add ensureBehaviors() to detachBehavior*().

The intent may be to detach behaviors defined in behaviors().
In the original implementation, if these behaviors() are not yet attached, they can not selectively be detached.
2013-05-06 09:56:15 +03:00
Qiang Xue
d2f35f2062 Fixes issue #124. 2013-05-05 21:02:57 -04:00
Qiang Xue
14699b5ec3 reorganized app code.
removed app template from framework folder.
2013-05-05 18:32:32 -04:00
Qiang Xue
637e11605a Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-05 17:16:20 -04:00
Qiang Xue
0766fbccb5 Fixes issue #128. 2013-05-05 17:16:10 -04:00
Qiang Xue
9880d1fa51 Merge pull request #122 from mynameiszanders/master
Added Newlines
2013-05-05 12:14:14 -07:00
Qiang Xue
0ab4f8f130 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-05 15:11:58 -04:00
Qiang Xue
9841d6c639 Fixes issue #124. 2013-05-05 15:11:53 -04:00
Zander Baldwin
4be9e195c2 Add Newlines
Appended newlines to every PHP document that did not have a newline as the last character in the file.
2013-05-05 17:04:55 +01:00
Rinat Silnov
47c643fbff Call static::dumpAsString in VarDumper::dump
This way we can extend VarDumper::dumpAsString
2013-05-05 19:25:36 +04:00
Qiang Xue
e087533fa7 Merge pull request #117 from vyachin/master
fix SecurityHelper description
2013-05-05 07:50:00 -07:00
Vladimir Vyachin
7f5cbce69c fix SecurityHelper description 2013-05-05 18:46:54 +04:00
Rasmus Lerdorf
3c83b8ed7c Fix typos
A couple of obvious typos here
2013-05-05 07:31:09 -07:00
Vladimir Vyachin
b6cee8af88 fix assetconverter file extensions change only first time 2013-05-05 18:21:10 +04:00
Qiang Xue
c91a0f4b26 Fixes issue #105: route var appears twice in the created URL 2013-05-05 10:14:55 -04:00
Qiang Xue
e5f0579e79 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-05 10:06:45 -04:00