pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						98b3d419ff
					 | 
					
						
						
							
							rename dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 23:01:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						47b8d8b9a4
					 | 
					
						
						
							
							Merge branch 'demo_master' into combine
						
						
						
						
						
						
					 | 
					
						2019-12-21 22:18:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						852a953d87
					 | 
					
						
						
							
							Merge branch 'cli_master' into combine
						
						
						
						
						
						
					 | 
					
						2019-12-21 22:11:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						5fcba0a28b
					 | 
					
						
						
							
							rename dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 22:07:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						7641aabc45
					 | 
					
						
						
							
							Merge branch 'qt_master' into combine
						
						
						
						
						
						
					 | 
					
						2019-12-21 22:02:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						6b68d8472c
					 | 
					
						
						
							
							rename dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 21:56:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						f21732f551
					 | 
					
						
						
							
							rename dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 21:55:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						e8a9b77186
					 | 
					
						
						
							
							Merge branch 'js_master' into combine
						
						
						
						
						
						
					 | 
					
						2019-12-21 21:50:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						9b5fbedfca
					 | 
					
						
						
							
							move dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 21:37:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						55334a11b2
					 | 
					
						
						
							
							Merge branch 'android_master' into combine
						
						
						
						
						
						
					 | 
					
						2019-12-21 21:35:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						1d98479c07
					 | 
					
						
						
							
							rename dir
						
						
						
						
						
						
					 | 
					
						2019-12-21 20:17:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						2a0b33151b
					 | 
					
						
						
							
							rename dirs
						
						
						
						
						
						
					 | 
					
						2019-12-21 20:14:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						20ea0841bc
					 | 
					
						
						
							
							add image blur
						
						
						
						
						
						
					 | 
					
						2019-12-21 18:53:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						2f311f4c25
					 | 
					
						
						
							
							add image scale type
						
						
						
						
						
						
					 | 
					
						2019-12-21 18:48:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						65089091ec
					 | 
					
						
						
							
							add onLoad callback
						
						
						
						
						
						
					 | 
					
						2019-12-21 18:13:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						0ac97353f2
					 | 
					
						
						
							
							add shadow effects
						
						
						
						
						
						
					 | 
					
						2019-12-21 18:04:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						adf0077759
					 | 
					
						
						
							
							support corners
						
						
						
						
						
						
					 | 
					
						2019-12-21 17:49:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						689e2713f0
					 | 
					
						
						
							
							add ModalPlugin
						
						
						
						
						
						
					 | 
					
						2019-12-21 17:44:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						2bdcc3535b
					 | 
					
						
						
							
							feat:add scroller node
						
						
						
						
						
						
					 | 
					
						2019-12-21 16:57:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						6f2fd39f2c
					 | 
					
						
						
							
							feat:stack gravity and imagenode
						
						
						
						
						
						
					 | 
					
						2019-12-21 16:37:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						db4990696c
					 | 
					
						
						
							
							text alignment
						
						
						
						
						
						
					 | 
					
						2019-12-21 13:28:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						b5cb29ca03
					 | 
					
						
						
							
							Merge branch 'master' of github.com:doric-pub/doric-js
						
						
						
						
						
						
					 | 
					
						2019-12-21 12:41:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						fa3e902b31
					 | 
					
						
						
							
							define doric timer functions
						
						
						
						
						
						
					 | 
					
						2019-12-21 12:19:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						0beb8b8633
					 | 
					
						
						
							
							timer function
						
						
						
						
						
						
					 | 
					
						2019-12-21 12:14:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						f77b4a9bac
					 | 
					
						
						
							
							Stack's position to be relative by default so it's child can be anchored
						
						
						
						
						
						
					 | 
					
						2019-12-21 11:19:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						c8f3b5db00
					 | 
					
						
						
							
							use css flex and box to implement stack and vlayout and hlayout
						
						
						
						
						
						
					 | 
					
						2019-12-21 11:09:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						ef88d9c092
					 | 
					
						
						
							
							use flex
						
						
						
						
						
						
					 | 
					
						2019-12-20 21:26:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						0fe55fdec4
					 | 
					
						
						
							
							update vnode and hlayout
						
						
						
						
						
						
					 | 
					
						2019-12-20 17:56:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						e99ec29919
					 | 
					
						
						
							
							add vlayout and hlayout
						
						
						
						
						
						
					 | 
					
						2019-12-20 17:28:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						bc596a1a5e
					 | 
					
						
						
							
							add layoutconfig
						
						
						
						
						
						
					 | 
					
						2019-12-20 16:46:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						6706a57406
					 | 
					
						
						
							
							feat:width,height and padding border
						
						
						
						
						
						
					 | 
					
						2019-12-20 15:37:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						dac7b634cb
					 | 
					
						
						
							
							feat:add demo
						
						
						
						
						
						
					 | 
					
						2019-12-20 13:14:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						15d3a1cbf7
					 | 
					
						
						
							
							add custom callback for async result
						
						
						
						
						
						
					 | 
					
						2019-12-20 11:20:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						1d40c1e1e0
					 | 
					
						
						
							
							update rollup & chokidar
						
						
						
						
						
						
					 | 
					
						2019-12-20 11:20:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						c76274b762
					 | 
					
						
						
							
							update rollup & rollup plugin node resolve
						
						
						
						
						
						
					 | 
					
						2019-12-20 11:19:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						58aab26193
					 | 
					
						
						
							
							update rollup & rollup plugin node resolve & ws
						
						
						
						
						
						
					 | 
					
						2019-12-20 11:18:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						23b482806f
					 | 
					
						
						
							
							at least current can control background
						
						
						
						
						
						
					 | 
					
						2019-12-19 21:12:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						5d2e237d9f
					 | 
					
						
						
							
							add DoricViewNode
						
						
						
						
						
						
					 | 
					
						2019-12-19 20:45:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						7443e5c1c9
					 | 
					
						
						
							
							callback test
						
						
						
						
						
						
					 | 
					
						2019-12-19 20:24:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						3b287974ab
					 | 
					
						
						
							
							add async result
						
						
						
						
						
						
					 | 
					
						2019-12-19 19:54:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						5854d29b93
					 | 
					
						
						
							
							invoke shaderplugin success
						
						
						
						
						
						
					 | 
					
						2019-12-19 13:34:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						1b65fd5ba0
					 | 
					
						
						
							
							test context entity method success
						
						
						
						
						
						
					 | 
					
						2019-12-19 13:07:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						c2b8abeadb
					 | 
					
						
						
							
							add nativeBridge
						
						
						
						
						
						
					 | 
					
						2019-12-19 12:45:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						48d64fdf1e
					 | 
					
						
						
							
							add doric driver and context and soon
						
						
						
						
						
						
					 | 
					
						2019-12-19 11:52:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						25a6f08a96
					 | 
					
						
						
							
							add built in script
						
						
						
						
						
						
					 | 
					
						2019-12-19 10:58:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						ea781e43f9
					 | 
					
						
						
							
							rename
						
						
						
						
						
						
					 | 
					
						2019-12-19 10:52:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						f5f23f611e
					 | 
					
						
						
							
							add DoricVMElement
						
						
						
						
						
						
					 | 
					
						2019-12-19 10:51:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								王劲鹏
							
						 
					 | 
					
						
						
							
						
						001eb4a963
					 | 
					
						
						
							
							remove qml & use qwidget
						
						
						
						
						
						
					 | 
					
						2019-12-18 17:35:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						dce677e9a1
					 | 
					
						
						
							
							init commit
						
						
						
						
						
						
					 | 
					
						2019-12-18 16:12:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pengfei.zhou
							
						 
					 | 
					
						
						
							
						
						5615804c0a
					 | 
					
						
						
							
							Merge branch 'master' of github.com:doric-pub/doric-cli
						
						
						
						
						
						
					 | 
					
						2019-12-18 15:38:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |