| 
						
					 | 
					
						
						
							
						
						c0df003ac0
					 | 
					
						
						
							
							merge from master
						
						
						
						
						
						
					 | 
					
						2016-06-11 20:16:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd9caf65d2
					 | 
					
						
						
							
							20160611
						
						
						
						
						
						
					 | 
					
						2016-06-11 19:49:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13e014b7d9
					 | 
					
						
						
							
							yiichina
						
						
						
						
						
						
					 | 
					
						2016-03-02 18:50:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e91c92d774
					 | 
					
						
						
							
							added missing info about asset folders to yii integration guide
						
						
						
						
						
						
					 | 
					
						2016-02-25 10:29:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b1dfe54e9
					 | 
					
						
						
							
							Updated composer-asset-plugin requirement to ~1.1.1 all over the framework
						
						
						
						
						
						
					 | 
					
						2015-11-30 08:28:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2c4e26124
					 | 
					
						
						
							
							Update composer-asset-plugin [skip ci]
						
						
						
						
						
						
					 | 
					
						2015-11-11 11:27:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b107d61aac
					 | 
					
						
						
							
							Update docs to latest version of composer-asset-plugin
						
						
						
						
						
						
					 | 
					
						2015-09-03 12:04:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						586684b050
					 | 
					
						
						
							
							2.0.5 bf7edc5
						
						
						
						
						
						
					 | 
					
						2015-07-30 09:52:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c245d39c1
					 | 
					
						
						
							
							Fix for few sections to match doc style guidelines
						
						
						
						
						
						
						
						Yii2 -> Yii 2 
						
						
					 | 
					
						2015-07-20 10:42:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						486e7c59cf
					 | 
					
						
						
							
							updated fxp/composer-asset-plugin version constraint
						
						
						
						
						
						
						
						fixes #6253 
						
						
					 | 
					
						2015-05-06 16:32:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a4dc8a4e8
					 | 
					
						
						
							
							adjust version composer-asset-plugin to 1.0.0 [ci skip]
						
						
						
						
						
						
						
						close #7024 
						
						
					 | 
					
						2015-01-26 13:40:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36bebbfefb
					 | 
					
						
						
							
							use id instead of name for anchor references in the guide
						
						
						
						
						
						
						
						fixes #7013 
						
						
					 | 
					
						2015-01-25 22:13:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1468bd4d3d
					 | 
					
						
						
							
							version 2.0.1 84b42ab
						
						
						
						
						
						
					 | 
					
						2014-12-22 16:33:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						38c04b3d89
					 | 
					
						
						
							
							Fixes #6189
						
						
						
						
						
						
					 | 
					
						2014-11-23 20:56:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b4b2b13eb
					 | 
					
						
						
							
							improved guide about using Yii in 3rd party systems
						
						
						
						
						
						
					 | 
					
						2014-10-18 19:31:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfd68954a5
					 | 
					
						
						
							
							finished guide on formatting
						
						
						
						
						
						
					 | 
					
						2014-10-06 20:48:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d570d3aec1
					 | 
					
						
						
							
							added missing DI container to yii2 and yii1 tut
						
						
						
						
						
						
						
						fixes #5218 
						
						
					 | 
					
						2014-10-01 16:04:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60fe84c89e
					 | 
					
						
						
							
							guide: consistent usage of composer command
						
						
						
						
						
						
					 | 
					
						2014-10-01 15:45:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b66300788b
					 | 
					
						
						
							
							Finished extension and third-party lib usage guide [skip ci]
						
						
						
						
						
						
					 | 
					
						2014-07-06 01:08:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |