Commit Graph
25220 Commits
Author SHA1 Message Date
qiyu-xie 9d4e2a4dd1 * Fix a bug. 2021-07-13 15:26:19 +08:00
tianshujie98 e23de07bee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 15:17:16 +08:00
tianshujie98 132d5484f9 * Adjust code. 2021-07-13 15:17:04 +08:00
qiyu-xie da283bc32d * Fix a bug. 2021-07-13 15:17:02 +08:00
tianshujie98 8c6f5898ea * Fix an error. 2021-07-13 15:00:40 +08:00
qiyu-xie 7fd8cdf8fd * Finish task#40013. 2021-07-13 14:49:29 +08:00
Yagami bc40429ad6 * Fix details. 2021-07-13 14:49:22 +08:00
tianshujie98 690980d60a * Fix an error. 2021-07-13 14:41:02 +08:00
hufangzhou 51eb6980c1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:23:03 +08:00
hufangzhou 7626959450 * Adjust the label background color. 2021-07-13 14:22:59 +08:00
王怡栋 65a43e49a3 Merge branch '15.0' into 'master'
* update picker js.

See merge request easycorp/zentaopms!4
2021-07-13 06:18:45 +00:00
hufangzhou d11e847832 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:11:37 +08:00
hufangzhou 09b2caf838 * Adjust the project order in project drop menu. 2021-07-13 14:11:32 +08:00
wangyidong 637acf434a * adjust for show image. 2021-07-13 14:10:27 +08:00
tianshujie98 e2f6101340 * Add start and end date judgment. 2021-07-13 14:00:34 +08:00
holan20180123 2e8884d86c * Fix bug #13585. 2021-07-13 13:51:21 +08:00
tianshujie98 1926cb7ad9 * Fix bug #13579. 2021-07-13 13:41:57 +08:00
qiyu-xie f689717078 * Add permissions to the executive Kanban. 2021-07-13 13:41:21 +08:00
tianshujie98 6977cf91ed * Add select all. 2021-07-13 13:38:14 +08:00
Yagami 7ef07b30ba * Finish task #40113. 2021-07-13 13:37:44 +08:00
hufangzhou dafebe5d95 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:33:34 +08:00
hufangzhou e007087966 * Finish task #39999. 2021-07-13 13:33:14 +08:00
wangyidong c523e60eb0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:30:15 +08:00
wangyidong 503815289a * finish task #40114. 2021-07-13 13:29:50 +08:00
Yagami 4a025a7452 * Finish task #40128. 2021-07-13 13:14:17 +08:00
holan20180123 bf07567ff0 * Fix bug #13584. 2021-07-13 13:13:44 +08:00
Yagami 58b3372e4d * Fix user-deny lang. 2021-07-13 13:05:08 +08:00
holan20180123 a527cb5b5e * Adjust batch edit products. 2021-07-13 13:03:49 +08:00
qiyu-xie d8e8be9e4f * Finish task#40013. 2021-07-13 11:32:48 +08:00
qiyu-xie 6c598c245a * Finish task#40009. 2021-07-13 11:24:28 +08:00
wangyidong 6078ae465f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 10:26:36 +08:00
wangyidong ba2c8018d6 * fix for update userview. 2021-07-13 10:24:57 +08:00
hufangzhou 230193cbf4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 10:16:19 +08:00
hufangzhou f30d5627d5 * Task #39998: Adjust the tab active in project drop menu. 2021-07-13 10:16:05 +08:00
holan20180123 5d3bce55af Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 10:12:26 +08:00
tianshujie98 309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
holan20180123 6e235a0e6a * Finish task #40015. 2021-07-13 10:10:37 +08:00
holan20180123 a14b1c8711 * Finish task #40004. 2021-07-13 10:02:40 +08:00
wangyidong 71d91cdc54 * fix error. 2021-07-13 09:52:53 +08:00
wangyidong 0cba64db6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 09:39:25 +08:00
wangyidong 9d95d960e5 * finish task #40005. 2021-07-13 09:38:27 +08:00
tianshujie98 106ffc839e * Finish task #40011. 2021-07-12 16:34:59 +08:00
Yagami cea7d733f5 * Fix details. 2021-07-12 16:27:54 +08:00
hufangzhou 28744fa822 * Finish task #39998. 2021-07-12 16:04:48 +08:00
Hao Sun 9267c1e6b1 * hide program item in search list in drop menu. 2021-07-12 15:47:38 +08:00
Yagami ad4e5f7c44 * Finish task #40134. 2021-07-12 15:43:16 +08:00
Hao Sun c12c6c3873 * fix list style in drop menu. 2021-07-12 15:43:07 +08:00
tianshujie98 867452258d * Fix bug. 2021-07-12 15:40:29 +08:00
tianshujie98 bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
Yagami 2ba786263c * Finish task #40104. 2021-07-12 14:09:25 +08:00