a5850657f8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #319  from slavcodev/patch-1  
							
							... 
							
							
 
							
							AccessRule match controller error. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								057062cb48 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #321  from creocoder/bootstrap-update-to-2.3.2  
							
							... 
							
							
 
							
							Twitter bootstrap updated to 2.3.2 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								73437c5712 
								
							
								 
							
						 
						
							
							
								
								Twitter bootstrap updated to 2.3.2  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								241b6fc49a 
								
							
								 
							
						 
						
							
							
								
								Modified the IAssetConvert interface.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								5f23f631ba 
								
							
								 
							
						 
						
							
							
								
								hashing the key for registerCss and registerJs.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								5e5b629df4 
								
							
								 
							
						 
						
							
							
								
								Update AccessRule.php  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								520e5b954a 
								
							
								 
							
						 
						
							
							
								
								refactored code after feedback  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								f3d23ec0e9 
								
							
								 
							
						 
						
							
							
								
								Fixed framework path.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								0d41a25eb4 
								
							
								 
							
						 
						
							
							
								
								Added support for View::POS_READY.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								105e277f8d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bootstrap  
							
							... 
							
							
 
							
							* master: (84 commits)
  remove from master (update track)
  minor fixes
  updated the README file of the bootstrap app.
  Inflector class
  readjusting files for the framework package.
  renamed files.
  Added punycode as part of the framework.
  Renamed core asset bundles.
  fixed wrong dependency name.
  Added bootstrap bundles.
  Reorganized the bootstrap app to prepare it as a separate composer package.
  Update Pagination.php
  "ManagerTestBase::testExecuteBizRule()" has been fixed to not produce side effects on other tests.
  changed back to "create_time".
  Always enable profiling for DB queries.
  Fixed SiteController about Yii.
  changed to insert_time.
  Minor doc fix.
  refactored AutoTimestamp.
  Added UrlRule::host.
  ...
Conflicts:
	yii/assets.php 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								2551273356 
								
							
								 
							
						 
						
							
							
								
								new proposed structure  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								edd7ec4214 
								
							
								 
							
						 
						
							
							
								
								Inflector second revision  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								a1af54a0d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:yiisoft/yii2 into 313-Inflector-Helper  
							
							... 
							
							
 
							
							* 'master' of github.com:yiisoft/yii2:
  updated the README file of the bootstrap app.
  readjusting files for the framework package. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								ab695d1118 
								
							
								 
							
						 
						
							
							
								
								remove from master (update track)  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								70b161ba01 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:yiisoft/yii2  
							
							... 
							
							
 
							
							* 'master' of github.com:yiisoft/yii2:
  updated the README file of the bootstrap app.
  readjusting files for the framework package. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								1cc2e4a0c5 
								
							
								 
							
						 
						
							
							
								
								minor fixes  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								75c54507b9 
								
							
								 
							
						 
						
							
							
								
								updated the README file of the bootstrap app.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								17397a8876 
								
							
								 
							
						 
						
							
							
								
								Inflector class  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								e8a824cc46 
								
							
								 
							
						 
						
							
							
								
								readjusting files for the framework package.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								0066e95290 
								
							
								 
							
						 
						
							
							
								
								renamed files.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								619c4f9fd0 
								
							
								 
							
						 
						
							
							
								
								Added punycode as part of the framework.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								c9b65d3008 
								
							
								 
							
						 
						
							
							
								
								Renamed core asset bundles.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9a472c8323 
								
							
								 
							
						 
						
							
							
								
								"yii\console\controllers\AssetController::getAssetManager()" has been updated enforcing 'basePath' and 'baseUrl' config parameters.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								84237dd828 
								
							
								 
							
						 
						
							
							
								
								E_NOTICE at "yii\console\controllers\AssetController::loadBundleDependency()" has been fixed.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								57e5474143 
								
							
								 
							
						 
						
							
							
								
								Method "yii\console\controllers\AssetController::loadBundleDependency()" has been improved allowing dection of the circular dependency.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								f83eaecd5a 
								
							
								 
							
						 
						
							
							
								
								fixed wrong dependency name.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								8e96b12e18 
								
							
								 
							
						 
						
							
							
								
								Added bootstrap bundles.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								7dc624d1da 
								
							
								 
							
						 
						
							
							
								
								Reorganized the bootstrap app to prepare it as a separate composer package.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4695362ae2 
								
							
								 
							
						 
						
							
							
								
								Unit test for "yii\console\controllers\AssetController" has been adjusted.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9f66abc984 
								
							
								 
							
						 
						
							
							
								
								"yii\console\controllers\AssetController" has been updated:  
							
							... 
							
							
 
							
							- assetManager has been converted into virtual property
 - bundle dependency load has been fixed 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								ff1b258411 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #308  from sergon/patch-1  
							
							... 
							
							
 
							
							pages -> pagination 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								bb32d973be 
								
							
								 
							
						 
						
							
							
								
								Update Pagination.php  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								d4b896f65c 
								
							
								 
							
						 
						
							
							
								
								"ManagerTestBase::testExecuteBizRule()" has been fixed to not produce side effects on other tests.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								285a45520c 
								
							
								 
							
						 
						
							
							
								
								fixed auth manager unit test to not expect generic exception  
							
							... 
							
							
 
							
							This is not allowed by phpunit as a test may not fail anymore 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								946f65523c 
								
							
								 
							
						 
						
							
							
								
								changed back to "create_time".  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								d06e785e79 
								
							
								 
							
						 
						
							
							
								
								Always enable profiling for DB queries.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								80b3d5641d 
								
							
								 
							
						 
						
							
							
								
								Fixed SiteController about Yii.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4ad0b9a335 
								
							
								 
							
						 
						
							
							
								
								changed to insert_time.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								84fe426c5f 
								
							
								 
							
						 
						
							
							
								
								Minor doc fix.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								e69afe32b5 
								
							
								 
							
						 
						
							
							
								
								refactored AutoTimestamp.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								14228f8615 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'asset-command'  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9e948ccd43 
								
							
								 
							
						 
						
							
							
								
								Added UrlRule::host.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								b6fffeb0e4 
								
							
								 
							
						 
						
							
							
								
								Removed trailing slash in created URLs.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								e6b52b8523 
								
							
								 
							
						 
						
							
							
								
								Fixes issue  #268 : added support for subdomain matching of URL rules.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								3daf2467a2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #301  from rinatio/view-begin-content-docs  
							
							... 
							
							
 
							
							View begin content docs 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								ab10896b03 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #300  from rinatio/113-yiic-to-yii  
							
							... 
							
							
 
							
							Rename yiic to yii. Fixes  #113  
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								2b091e7ba5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/yiisoft/yii2 into view-begin-content-docs  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								f675cdf3e7 
								
							
								 
							
						 
						
							
							
								
								Added file extension in View::beginContent docs  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								5a81959d4a 
								
							
								 
							
						 
						
							
							
								
								Rename yiic to yii.  Fixes   #113  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								16931cad97 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #299  from creocoder/yiic-to-yii  
							
							... 
							
							
 
							
							yiic => yii additional corrections 
							
						 
						
							13 years ago