Commit Graph
487 Commits
Author SHA1 Message Date
YouWei Zhao 9ee85323df editor实现$range以及细节调整 2018-03-10 13:27:13 +08:00
YouWei Zhao 20fc1f6b53 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-10 12:12:08 +08:00
Zhang Chen 15c3e17b86 Merge pull request #70 from zhaouv/v2.0-editor-20180304
editor细节优化
2018-03-10 00:34:19 +08:00
YouWei Zhao 38842a7200 editor细节优化 2018-03-09 22:50:59 +08:00
Zhang Chen 882446c442 Merge pull request #69 from zhaouv/v2.0-editor-20180304
表格css以及编辑细节调整
2018-03-09 21:12:22 +08:00
oc 93ee7f0415 Remove Storage 2018-03-09 21:11:58 +08:00
YouWei Zhao 8e3c1b5c67 表格css以及编辑细节调整 2018-03-09 20:46:34 +08:00
oc 79f0854371 bgm 2018-03-08 23:21:33 +08:00
oc f557aaf553 x 2018-03-08 23:17:31 +08:00
oc 3c5e41842e BGM 2018-03-08 23:04:13 +08:00
Zhang Chen 6e1d4b61e8 Merge pull request #68 from zhaouv/v2.0-editor-20180304
editor前端上切换模式
2018-03-08 19:30:45 +08:00
YouWei Zhao e578fba8f0 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into v2.0-editor-20180304 2018-03-08 19:27:05 +08:00
ckcz123 5103a84187 update server 2018-03-08 19:25:28 +08:00
YouWei Zhao a695dcd6cf editor前端上切换模式 2018-03-08 19:00:20 +08:00
Zhang Chen c57f3072bb Merge pull request #67 from zhaouv/v2.0-editor-20180304
blockly改为弹窗
2018-03-07 22:47:28 +08:00
YouWei Zhao 05982bfaf4 issue #57
#57
2018-03-07 22:44:57 +08:00
YouWei Zhao 39db1cd235 blockly改为弹窗 2018-03-07 17:35:15 +08:00
YouWei Zhao 3a62dee1ba Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-06 13:28:24 +08:00
oc dc2993e40d Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-05 19:37:40 +08:00
oc 66117ebf08 Support Callback in Editor 2018-03-05 19:37:21 +08:00
Zhang Chen ac29908604 Merge pull request #65 from zhaouv/v2.0-editor-20180304
Update blockly
2018-03-05 10:56:42 +08:00
YouWei Zhao ddd43a1dbc Update blockly 2018-03-05 09:50:08 +08:00
oc 3ca7c95231 load mod 2018-03-04 12:59:33 +08:00
Zhang Chen fcc71dcf7f Merge pull request #64 from zhaouv/v2.0-editor-20180304
调整 editor.file & editor.mode
2018-03-04 12:54:07 +08:00
YouWei Zhao df89fd0b7c 调整 editor.file & editor.mode 2018-03-04 11:11:52 +08:00
oc 2f5caae07c Support Reborn 2018-03-03 23:48:46 +08:00
oc dcce32f931 Support Reborn 2018-03-03 23:46:21 +08:00
oc f97495a6b6 Support Reborn 2018-03-03 23:34:10 +08:00
oc e5ab7bd0ce Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-03 22:48:41 +08:00
oc 43681581e0 1 2018-03-03 22:47:48 +08:00
Zhang Chen 646572f5d8 Merge pull request #63 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
2018-03-03 22:11:36 +08:00
YouWei Zhao 2653b602ee merge 2018-03-03 21:59:00 +08:00
YouWei Zhao 2dd694bcfa add weather in comment.js 2018-03-03 21:56:12 +08:00
YouWei Zhao e79da81d50 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227 2018-03-03 21:37:53 +08:00
ckcz123 0974656ad1 Restructure 2018-03-03 21:07:26 +08:00
Zhang Chen 00d697af31 Fix Bug 2018-03-03 21:05:29 +08:00
Zhang Chen 890001a9dc Merge pull request #62 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
2018-03-03 15:01:16 +08:00
YouWei Zhao 68c516d41d Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227
# Conflicts:
#	libs/events.js
2018-03-03 15:00:11 +08:00
ckcz123 4e69b4ee10 Win End 2018-03-02 21:02:04 +08:00
oc b1d9144e52 Add Mid License 2018-03-02 13:01:47 +08:00
YouWei Zhao 8c484d84d9 fix bug 2018-03-01 16:00:38 +08:00
ckcz123 90b36b3d27 Fix Small Bug 2018-02-28 21:04:27 +08:00
Zhang Chen 7148bc11e5 Merge pull request #59 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
2018-02-28 20:26:56 +08:00
YouWei Zhao 2f50978612 Update blockly 2018-02-28 20:25:53 +08:00
YouWei Zhao b48b361a15 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 2018-02-28 20:15:09 +08:00
YouWei Zhao e39e49613c Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227 2018-02-28 20:13:16 +08:00
ckcz123 4d6f50d46e Long Press 2018-02-28 20:10:04 +08:00
ckcz123 6707e7eca0 Long Press 2018-02-28 20:02:40 +08:00
YouWei Zhao 5da6ad56d0 Update blockly 2018-02-28 17:59:03 +08:00
YouWei Zhao e3c0792028 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 2018-02-28 16:47:57 +08:00