Commit Graph
178 Commits
Author SHA1 Message Date
Hao Sun ad6295d942 * zin: move event binding code to default js scope 2023-04-24 13:17:13 +08:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
Hao Sun 55d56c4081 * zin: refactor 2023-04-21 22:52:36 +08:00
Hao Sun df7c67f362 * zin: refactor 2023-04-19 11:49:12 +08:00
Hao Sun 1c9fa5a02a * zin: optimize page program-create UI. 2023-04-19 08:35:50 +08:00
Hao Sun f31599fd8b * zin: refactor 2023-04-10 15:49:21 +08:00
陈涛 fcc2b973ad * zin: add translation to program module 2023-04-10 13:36:01 +08:00
Hao Sun 74e9763a16 * zin: refactor 2023-04-07 10:13:53 +08:00
liumengyi 8cad561792 * Fix bug #32444. 2023-02-27 08:37:57 +00:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
tianshujie 86ccf6cc62 * Add a sort selection style. 2022-11-14 15:45:33 +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 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 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie d6d008daaa * Finish task #73291. 2022-10-25 14:55:31 +08:00
tianshujie 66552bba1b * Finish task #73291. 2022-10-25 13:45:42 +08:00
wangyidong 1a9aca53c0 * code for task #73471. 2022-10-25 11:30:40 +08:00
tianshujie 875ac851b4 * Fix bug #28460. 2022-10-11 15:07:12 +08:00
tianshujie f080000984 * Finish task #71905. 2022-10-10 14:14:33 +08:00
曹延义 3911275e4f * Modify click style. 2022-09-30 13:36:56 +08:00
曹延义 250a75c1de * Adjust code. 2022-09-30 13:13:52 +08:00
曹延义 e1212f0160 * Fix bug #28201. 2022-09-30 09:58:11 +08:00
曹延义 b232a4eb68 * Modify batch edit project for program page. 2022-09-28 14:45:20 +08:00
曹延义 d231cad850 * Modify batch edit style. 2022-09-28 14:32:19 +08:00
曹延义 46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08:00
曹延义 ca5110623e * Add project checkbox style. 2022-09-28 10:09:32 +08:00
tianshujie e553730c29 * Finish task #70202. 2022-09-23 16:33:56 +08:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
zhouxudong faf66f2d63 * Optimization task #64888. 2022-08-19 07:51:38 +00:00
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
xieqiyu bd18594c80 * Code for task#63579. 2022-08-10 15:09:57 +08:00
xieqiyu 2f6d225550 * Code for task#62851. 2022-08-10 13:55:03 +08:00
zhouxudong 266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
xieqiyu 9c4f3f0ee1 * Code for task#62851. 2022-08-10 13:32:15 +08:00
xieqiyu e6bd15a63a * Code for task#63581. 2022-08-10 10:25:58 +08:00
zhouxudong 01c75c8370 * Finish task. 2022-08-09 15:08:33 +00:00
zhouxudong 8750b265c1 * Finish task. 2022-08-09 13:05:50 +00:00
zhouxudong 808d01aa17 * Finish task. 2022-08-09 09:43:34 +00:00
zhouxudong 6f8f9b52e9 * Finish task. 2022-08-09 07:31:10 +00:00
zhouxudong 90e0daf6c0 * Finish task. 2022-08-09 06:32:29 +00:00
zhouxudong 3cc9977663 * Finisha task. 2022-08-09 05:49:27 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong c68f271328 * Finish task 62581. 2022-08-07 13:55:38 +00:00