Commit Graph

5352 Commits

Author SHA1 Message Date
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
Qiang Xue
1c93c50386 Merge pull request #160 from creocoder/active-record-refactoring
ActiveRecord::insert() and ActiveRecord::update() refactoring
2013-05-07 07:49:38 -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
sensorario
c699213c19 Merge http://github.com/yiisoft/yii2
* http://github.com/yiisoft/yii2: (23 commits)
  move JsExpression to web.
  Fixes issue #155.
  Fixes the variable name
  Added twig, smarty and php-markdown dependencies, vendor is gitignored now
  added composer.json
  fix
  fix
  Wrapped code with github-style blocks with PHP highlighting
  Fixed typo
  Controllers section example fix
  Renamed YiiBase to \yii\YiiBase.
  Added namespace section.
  Added dirty attribute description.
  Fixed doc about renderers.
  Finished the initial draft of upgrading instructions
  Fix attaching behavior via config
  Changed default value of View::renderers.
  Fix attaching behavior via config
  Menu WIP
  upgrading instructions WIP
  ...
2013-05-07 14:48:35 +02:00
Qiang Xue
dd5969147d move JsExpression to web. 2013-05-07 07:39:24 -04:00
Qiang Xue
462f2033dd Merge pull request #156 from andersonamuller/patch-1
Fixes the variable name
2013-05-07 04:23:19 -07:00
Qiang Xue
f3c17594c6 Fixes issue #155. 2013-05-07 07:18:39 -04:00
Anderson Müller
8c18feb1b5 Fixes the variable name 2013-05-07 14:11:52 +03:00
Alexander Makarov
34b0da0dc4 Added twig, smarty and php-markdown dependencies, vendor is gitignored now 2013-05-07 14:44:48 +04:00
Alexander Makarov
3ba55c1bb9 added composer.json 2013-05-07 14:20:04 +04:00
Alexander Makarov
91e6f8220c fix 2013-05-07 12:27:07 +04:00
Alexander Makarov
a5ab4aa22c fix 2013-05-07 12:25:56 +04:00
Alexander Makarov
9a1221e7c4 Wrapped code with github-style blocks with PHP highlighting 2013-05-07 12:25:00 +04:00
Alexander Makarov
9990dde19e Merge pull request #151 from lucianobaraglia/master
Fix in docs
2013-05-07 01:05:32 -07:00
Alexander Makarov
a4cf52c647 Merge pull request #153 from br0sk/master
Changed based class to base class
2013-05-07 01:04:49 -07:00
br0sk
9844c2e526 Fixed typo 2013-05-07 08:41:33 +02:00
Luciano Baraglia
6b9a0531b8 Controllers section example fix 2013-05-07 02:01:00 -03:00
Qiang Xue
0a169589ae Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-06 20:24:26 -04:00
Qiang Xue
50aa72467f Renamed YiiBase to \yii\YiiBase. 2013-05-06 20:24:19 -04:00
Qiang Xue
ce1e725a6b Added namespace section. 2013-05-06 21:20:26 -03:00
Carsten Brandt
f59f39087f Merge branch 'master' of github.com:yiisoft/yii2 into redis
* 'master' of github.com:yiisoft/yii2: (87 commits)
  Added dirty attribute description.
  Fixed doc about renderers.
  Finished the initial draft of upgrading instructions
  Fix attaching behavior via config
  Changed default value of View::renderers.
  Fix attaching behavior via config
  Menu WIP
  upgrading instructions WIP
  Refactored Breadcrumbs.
  Fixes issue #54: Implemented Breadcrumbs.
  Added Breadcrumbs.php
  Fixes issue #134
  Rollback word consistencty over entire codebase (ref. #139).
  Add ensureBehaviors() to detachBehavior*()
  Fixes issue #124.
  code reorganization fix.
  reorganized app code. removed app template from framework folder.
  Fixes issue #128.
  Fixes issue #124.
  Add Newlines
  ...

Conflicts:
	tests/unit/framework/caching/ApcCacheTest.php
2013-05-07 01:53:24 +02:00
Qiang Xue
647a802782 Added dirty attribute description. 2013-05-06 20:33:03 -03:00
Qiang Xue
881a85d463 Fixed doc about renderers. 2013-05-06 20:24:22 -03:00
Qiang Xue
2707c22857 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-06 19:20:25 -04:00
Qiang Xue
36d452ae16 Finished the initial draft of upgrading instructions 2013-05-06 19:20:20 -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
c6642a3d65 upgrading instructions WIP 2013-05-06 14:50:16 -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
sensorario
d0a634b935 Merge http://github.com/yiisoft/yii2
* http://github.com/yiisoft/yii2:
  Fixes issue #134
  Rollback word consistencty over entire codebase (ref. #139).
  Add ensureBehaviors() to detachBehavior*()
2013-05-06 14:44:10 +02: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
Qiang Xue
8bb4a990cb Merge pull request #136 from mdeweerd/patch-1
Add ensureBehaviors() to detachBehavior*()
2013-05-06 04:43:37 -07:00
Antonio Ramirez
fc7fc8032b remove for now 2013-05-06 13:06:17 +02:00
Antonio Ramirez
a20bd45645 Fixed formatting 2013-05-06 13:00:54 +02:00
Antonio Ramirez
d40e2446df minor fix for test unit 2013-05-06 12:50:55 +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
sensorario
77d9fad701 Removed unnecessary else 2013-05-06 12:38:07 +02:00