Commit Graph
1751 Commits
Author SHA1 Message Date
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
xieqiyu 4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +08:00
孙广明 f689432ec8 Merge branch 'sprint/zentaopms262_mayue_bug#29958' into 'master'
* Fix bug #29958.

See merge request easycorp/zentaopms!6275
2022-11-22 02:19:26 +00:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
Yagami ae9764ebd1 * Finish task #77013. 2022-11-22 09:30:28 +08:00
tianshujie 31246ae5e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-17 15:41:26 +08:00
xieqiyu 679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
xieqiyu 2a7493ac78 * Fix bug#29896. 2022-11-16 15:48:18 +08:00
tianshujie 28929b11a8 * Add active style of search program. 2022-11-15 17:42:27 +08:00
tianshujie 08e8bfea06 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-15 17:07:27 +08:00
daitingting 8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
tianshujie 86ccf6cc62 * Add a sort selection style. 2022-11-14 15:45:33 +08:00
tianshujie 7bbcbae12e * Fixed issue with more button render icons. 2022-11-14 14:20:11 +08:00
tianshujie 16d055bf8d * Finish task #76108. 2022-11-14 13:49:28 +08:00
tianshujie 1a097d73eb * Finish task #75690. 2022-11-14 10:37:21 +08:00
tianshujie feb9f2cfa9 * Add table sorting function. 2022-11-11 15:49:49 +08:00
tianshujie 718817d9fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 14:48:03 +08:00
tianshujie eaa13a4fbf * Add an delay icon to the program list. 2022-11-11 13:22:41 +08:00
tianshujie 0544c75976 * Modify the project list name display question. 2022-11-11 09:20:55 +08:00
tianshujie 84d69fca51 * Finish task #73291. 2022-11-11 08:45:30 +08:00
tianshujie b544c67d26 * Add a jump link for the name. 2022-11-10 14:49:44 +08:00
tianshujie 2e2127c53a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-10 13:30:26 +08:00
tianshujie 70239d4330 * Action button to add data table. 2022-11-10 13:24:46 +08:00
tianshujie f37ca78f61 * Add actions of program list. 2022-11-10 10:07:26 +08:00
tianshujie 3e2cfa01d7 * Add batchEdit function of program list. 2022-11-10 09:42:59 +08:00
tianshujie 0ad559a413 * Finish task #73291. 2022-11-09 17:16:43 +08:00
tianshujie 51a786f73d * Finish task #73291. 2022-11-08 14:33:53 +08:00
孙广明 78b1d5b847 Merge branch 'cyy_bug' into 'master'
* Modify secondary menu error.

See merge request easycorp/zentaopms!6078
2022-11-08 04:26:00 +00:00
caoyanyi 8570e9a061 * Modify secondary menu error. 2022-11-08 11:47:57 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie c9c2927202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-08 08:32:35 +08:00
caoyanyi abe3332930 * Fix bug #29224, 29094. 2022-11-03 14:56:55 +08:00
caoyanyi b907f44f56 Merge branch 'master' into zin 2022-11-03 13:00:20 +08:00
tianshujie 9a4b253718 * Change the color of the program name when hover. 2022-11-03 09:11:33 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
tianshujie 2bd3ae9c67 * Adjust button class for zui3. 2022-11-02 10:32:04 +08:00
tianshujie a7fcbec59a * Adjust actionBar for zui3. 2022-11-02 10:06:39 +08:00
tianshujie df07120acf Merge branch 'zin' of https://gitlab.zcorp.cc/easycorp/zentaopms into zui3_dev 2022-11-02 08:44:38 +08:00
tianshujie 06712268b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-02 08:44:24 +08:00
tianshujie 5127bcec3a * Add comment of zin. 2022-11-02 08:42:00 +08:00
daitingting 8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting 219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
tianshujie 86e76aef33 * Add comment of zin and program. 2022-11-01 12:10:43 +08:00
tianshujie d15ed1e77d * Modify the progress field of the program. 2022-11-01 08:37:15 +08:00
tianshujie c51a1b9233 * Finish task #74082. 2022-10-31 16:58:31 +08:00
daitingting dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
wangyidong d1f11b72d8 * fix bug #29065. 2022-10-28 14:08:53 +08:00
wangyidong 9f18188062 * fix bug #29062. 2022-10-28 13:13:01 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong ce74f027b4 * adjust for show all projects. 2022-10-27 08:27:52 +08:00