| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						486e7c59cf
					 | 
					
						
						
							
							updated fxp/composer-asset-plugin version constraint
						
						
						
						
						
						
						
						fixes #6253 
						
						
					 | 
					
						2015-05-06 16:32:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87a824515f
					 | 
					
						
						
							
							Renamed application template into project template in docs
						
						
						
						
						
						
					 | 
					
						2015-04-02 14:46:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aaebf9c49c
					 | 
					
						
						
							
							Update application templates links
						
						
						
						
						
						
					 | 
					
						2015-03-22 11:16:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a4dc8a4e8
					 | 
					
						
						
							
							adjust version composer-asset-plugin to 1.0.0 [ci skip]
						
						
						
						
						
						
						
						close #7024 
						
						
					 | 
					
						2015-01-26 13:40:15 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8eedd9a28d
					 | 
					
						
						
							
							Fixes #5517: Fixed broken guide links that should lead to basic/advanced app templates
						
						
						
						
						
						
					 | 
					
						2014-10-15 01:40:33 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebc2e71890
					 | 
					
						
						
							
							couple small corrections
						
						
						
						
						
						
					 | 
					
						2014-10-14 12:54:44 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4fac33f4b
					 | 
					
						
						
							
							Fixes #5509.
						
						
						
						
						
						
					 | 
					
						2014-10-12 18:13:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60fe84c89e
					 | 
					
						
						
							
							guide: consistent usage of composer command
						
						
						
						
						
						
					 | 
					
						2014-10-01 15:45:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f9d2c661c
					 | 
					
						
						
							
							use 1.0.0-beta2 version for composer asset plugin.
						
						
						
						
						
						
					 | 
					
						2014-09-27 12:57:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff17d9608a
					 | 
					
						
						
							
							Switch to 1.0.0-beta1 for the composer asset plugin.
						
						
						
						
						
						
					 | 
					
						2014-09-19 08:32:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1bb796ee0
					 | 
					
						
						
							
							Fixed wrong instruction.
						
						
						
						
						
						
					 | 
					
						2014-09-16 20:58:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b6a53e3046
					 | 
					
						
						
							
							WIP
						
						
						
						
						
						
					 | 
					
						2014-09-16 13:31:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d05047b12
					 | 
					
						
						
							
							Basic edits
						
						
						
						
						
						
					 | 
					
						2014-07-18 15:27:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef71a97e57
					 | 
					
						
						
							
							renamed chapter to section [skip ci]
						
						
						
						
						
						
					 | 
					
						2014-05-05 15:11:50 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						38098b20fc
					 | 
					
						
						
							
							reorganized guide toc [skip ci]
						
						
						
						
						
						
					 | 
					
						2014-05-02 13:01:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |