262 Commits
Author SHA1 Message Date
zuiidea 33d4f1679e Merge branch '4.2-dev' 2017-04-28 16:42:59 +08:00
zuiidea 37dd7d011e merge 2017-04-28 16:42:31 +08:00
zuiidea 5641cc61c4 user mocj 2017-04-28 16:34:08 +08:00
zuiidea 30f14769f0 responsive 2017-04-27 20:40:47 +08:00
zuiidea 1b7c076057 filters 2017-04-27 20:26:30 +08:00
zuiidea fbd0fcb5c4 user detail 2017-04-27 17:59:39 +08:00
zuiidea 19ee8eacce user API restful 2017-04-27 17:29:50 +08:00
zuiidea 0b0c7c3f91 update some texts and configs 2017-04-27 14:40:36 +08:00
HeChengjun 1a58dcac95 修正 arrayToTree 函数中 children 拼写错误 2017-04-26 16:16:35 +08:00
zuiidea 2869ead7bd Merge pull request #215 from zuiidea/4.2-dev
fix
2017-04-25 12:34:10 +08:00
zuiidea 25f7a65897 fix 2017-04-25 12:32:42 +08:00
zuiidea 75e6284873 Merge pull request #214 from zuiidea/4.2-dev
Menu defaultSelected
2017-04-25 12:19:03 +08:00
zuiidea 5fbb1b338a Menu defaultSelected 2017-04-25 12:09:20 +08:00
HeChengjun a4922c7541 menu.js line 96 : lineChart -> barChart 2017-04-24 17:17:10 +08:00
zuiidea 4566171265 Merge pull request #209 from zuiidea/4.2-dev
hot update
2017-04-24 10:10:55 +08:00
zuiidea 6c48480031 hot update 2017-04-24 10:09:10 +08:00
zuiidea 3401215d41 Merge pull request #202 from zuiidea/4.2-dev
fix userInfo
2017-04-21 18:37:36 +08:00
zuiidea 7284cad8aa fix userInfo 2017-04-21 18:36:35 +08:00
zuiidea b5423129f7 Merge pull request #198 from zuiidea/4.2-dev
4.2 dev
2017-04-21 10:49:31 +08:00
zuiidea 4c6deb49d3 fix menu open 2017-04-21 10:47:55 +08:00
zuiidea b6c3cb8a53 rebuild bread,menu,router 2017-04-20 19:26:17 +08:00
zuiidea cfd0172204 error message 2017-04-19 19:10:20 +08:00
zuiidea 4a694b6df8 fix prop-types 2017-04-18 09:56:15 +08:00
ZealotuS 69fbb4742e fix mock error caused by invalid username 2017-04-15 18:13:56 +08:00
zuiidea 4f673b6e3a merge 2017-04-14 19:47:33 +08:00
zuiidea 3fa7ee9e01 update README 2017-04-14 19:38:28 +08:00
zuiidea b0f790ffaf update theme 2017-04-14 18:55:19 +08:00
zuiidea 4cf25852da userlogin 2017-04-14 11:45:00 +08:00
zuiidea 688d411dc1 request demo 2017-04-14 10:16:37 +08:00
zuiidea d5e763febc underline 2017-04-13 19:06:00 +08:00
zuiidea b03f2ac89c users 2017-04-13 19:00:32 +08:00
zuiidea 28efa1a67b mock 2017-04-13 18:31:48 +08:00
zuiidea a9ff576958 login 2017-04-10 23:33:10 +08:00
zuiidea f7616d524b update request 2017-04-01 17:53:06 +08:00
zuiidea 45d7abfbf4 fix bug 2017-04-01 16:46:32 +08:00
zuiidea c2c0ce0267 adjust 2017-04-01 15:25:45 +08:00
zuiidea d25b1cb5dc mock login 2017-04-01 14:47:42 +08:00
zuiidea 83f71c7d3e roadhog first commit 2017-04-01 12:04:03 +08:00
zuiidea 0be85a93b9 Merge pull request #158 from zuiidea/4.0-dev
user permissions
2017-03-31 20:31:50 +08:00
zuiidea 6c4733ff82 user permissions 2017-03-31 20:28:34 +08:00
zuiidea f121b8884c Update skin.less 2017-03-30 11:47:26 +08:00
pmg1989 73bcc3901a fix modal form bug 2017-03-29 15:52:14 +08:00
zuiidea a5cb3c6fce fix some bugs 2017-03-28 20:50:02 +08:00
zuiidea e1a6f41192 dashboard 2017-03-27 20:27:58 +08:00
zuiidea a85277ea82 adjust components DataTable 2017-03-27 15:09:36 +08:00
zuiidea 47c1fdcaff adjust request 2017-03-27 14:41:01 +08:00
zuiidea f595f04a53 modify request 2017-03-24 20:32:27 +08:00
zuiidea d3c4912df3 requestPage 2017-03-24 19:25:17 +08:00
zuiidea 22c6365129 update request 2017-03-24 14:49:23 +08:00
zuiidea 8227e61b64 delete extra layout filefold 2017-03-24 12:04:40 +08:00