| 
						
					 | 
					
						
						
							
						
						79a9a70bc2
					 | 
					
						
						
							
							add blocktypes.json and fix blocks name
						
						
						
						
						
						
					 | 
					
						2018-04-09 11:46:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						101f5d7ccc
					 | 
					
						
						
							
							merge from 2.0.15
						
						
						
						
						
						
					 | 
					
						2018-03-23 13:37:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebc1f0ceaf
					 | 
					
						
						
							
							update block name
						
						
						
						
						
						
					 | 
					
						2017-09-26 14:53:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16e9af4792
					 | 
					
						
						
							
							fix doc structure-application-components
						
						
						
						
						
						
						
						翻译关于闭包引导的描述 
						
						
					 | 
					
						2017-09-23 10:43:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ed0fea789
					 | 
					
						
						
							
							merge from xiaoliushifu
						
						
						
						
						
						
					 | 
					
						2017-09-08 11:15:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6bbdada426
					 | 
					
						
						
							
							Fixed zh-CN docs [skip ci] (#14573)
						
						
						
						
						
						
					 | 
					
						2017-08-02 13:20:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7af578a139
					 | 
					
						
						
							
							check line nums
						
						
						
						
						
						
					 | 
					
						2016-07-05 07:29:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7fd063c8a9
					 | 
					
						
						
							
							add new files
						
						
						
						
						
						
					 | 
					
						2016-06-11 19:50:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						619a2328e3
					 | 
					
						
						
							
							Block types in the guide should not be translated in the code
						
						
						
						
						
						
						
						close #10384 
						
						
					 | 
					
						2015-12-14 03:58:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36bebbfefb
					 | 
					
						
						
							
							use id instead of name for anchor references in the guide
						
						
						
						
						
						
						
						fixes #7013 
						
						
					 | 
					
						2015-01-25 22:13:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						297d4a03c8
					 | 
					
						
						
							
							formatting content
						
						
						
						
						
						
					 | 
					
						2014-10-02 19:19:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cc4d9aacb
					 | 
					
						
						
							
							Merge branch 'master' of github.com:funson86/yii2 into funson
						
						
						
						
						
						
						
						Conflicts:
	docs/guide-zh-CN/structure-application-components.md
	docs/guide-zh-CN/structure-applications.md
	docs/guide-zh-CN/structure-entry-scripts.md
	docs/guide-zh-CN/structure-overview.md 
						
						
					 | 
					
						2014-10-02 18:50:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b30338fb2
					 | 
					
						
						
							
							translated structure-application-components.md.
						
						
						
						
						
						
					 | 
					
						2014-10-02 10:12:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc8ebf64e8
					 | 
					
						
						
							
							new translation
						
						
						
						
						
						
					 | 
					
						2014-09-30 17:02:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd4de81994
					 | 
					
						
						
							
							for check
						
						
						
						
						
						
					 | 
					
						2014-09-30 16:50:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb248554a0
					 | 
					
						
						
							
							copy files, prepare to translate.
						
						
						
						
						
						
					 | 
					
						2014-09-29 21:51:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |