Commit Graph

609 Commits

Author SHA1 Message Date
pengfei.zhou
852a953d87 Merge branch 'cli_master' into combine 2019-12-21 22:11:58 +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
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
王劲鹏
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
王劲鹏
58aab26193 update rollup & rollup plugin node resolve & ws 2019-12-20 11:18:23 +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
王劲鹏
001eb4a963 remove qml & use qwidget 2019-12-18 17:35:37 +08:00
pengfei.zhou
5615804c0a Merge branch 'master' of github.com:doric-pub/doric-cli 2019-12-18 15:38:22 +08:00
pengfei.zhou
130f15b6b0 update rollup config 2019-12-18 15:29:01 +08:00
王劲鹏
ad04078f88 add super node & view node 2019-12-17 17:05:57 +08:00
pengfei.zhou
feb322ec8d fix setBorder wont invalidate view 2019-12-16 15:37:34 +08:00
王劲鹏
b785685802 add bridge call native 2019-12-14 18:28:04 +08:00
pengfei.zhou
f1f35493fb feat:debug activity use noactionbar theme 2019-12-14 17:15:20 +08:00
pengfei.zhou
5ad12f6ec7 Merge branch 'master' of github.com:doric-pub/doric-js 2019-12-14 16:31:26 +08:00
pengfei.zhou
6b8e37fb66 add comments 2019-12-14 16:31:10 +08:00
pengfei.zhou
4bc81a9ca9 rename layoutconfig 2019-12-14 16:24:58 +08:00
王劲鹏
327148b01e update deps 2019-12-14 15:39:59 +08:00
王劲鹏
0dcb28d855 update deps 2019-12-14 15:38:33 +08:00
pengfei.zhou
919ec7aeb7 Merge branch 'master' of code.aliyun.com:Doric/doric-js 2019-12-14 11:31:34 +08:00
pengfei.zhou
75fe22290a feat:change animator api 2019-12-14 11:31:19 +08:00
王劲鹏
fe1a556ad8 add shader plugin register 2019-12-14 11:30:12 +08:00
王劲鹏
5ca6c19e20 fix compilation 2019-12-14 10:10:33 +08:00
王劲鹏
ed2a1326fc h & cpp split 2019-12-14 10:04:17 +08:00
王劲鹏
4610e71f42 code format 2019-12-13 17:48:37 +08:00
王劲鹏
3fdedb6240 add context holder & registry & bridge 2019-12-13 17:45:27 +08:00
pengfei.zhou
75547d1117 Merge branch 'master' of code.aliyun.com:Doric/doric-Android 2019-12-13 14:39:18 +08:00
pengfei.zhou
129415d526 feat:update lib 2019-12-13 14:39:06 +08:00
王劲鹏
5dea8b64e6 add flow layout load more 2019-12-13 14:32:59 +08:00
王劲鹏
a069cd7178 potential es6 -> es5 code robust 2019-12-13 14:32:39 +08:00
王劲鹏
c896bfc64c implement android flow layout load more 2019-12-13 14:31:50 +08:00
pengfei.zhou
f9ff72c2ed Merge branch 'master' of code.aliyun.com:Doric/doric-Android 2019-12-12 17:32:19 +08:00
pengfei.zhou
a8397c0bf2 feat:add getLocationOnScreen 2019-12-12 17:32:16 +08:00
pengfei.zhou
fb47613b89 Merge branch 'master' of code.aliyun.com:Doric/doric-js 2019-12-12 17:31:26 +08:00
pengfei.zhou
5601dfd0ca feat:add getLocationOnScreen 2019-12-12 17:31:09 +08:00
王劲鹏
64fb425f01 add native bridge function signature 2019-12-12 17:29:35 +08:00
yao
ee40fb4f91 add image Blur 2019-12-12 16:57:55 +08:00
yao
6adcf11d18 add image Blur 2019-12-12 16:57:30 +08:00
王劲鹏
4a9e00b2ac update .gitignore 2019-12-12 16:17:44 +08:00
王劲鹏
f88b454e9e change log prefix 2019-12-12 16:10:01 +08:00
王劲鹏
883fac4f36 update rollup 2019-12-12 11:56:14 +08:00