Commit Graph

289 Commits

Author SHA1 Message Date
李玉春
38f5ab4145 Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
#   module/execution/control.php
#   module/message/config.php
2021-12-02 05:04:29 +00:00
孙广明
4b94092737 * Finish task #45162. 2021-12-02 09:24:01 +08:00
tianshujie
da240630e5 * Fix bug #16963. 2021-12-01 10:01:39 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liyuchun
e43ea2001f * Fix bug #16523. 2021-11-22 10:44:00 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
tianshujie
1d87bcb08b * Fix bug #14890. 2021-09-03 10:50:31 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
liyuchun
6a93618b84 * Code for task #41764. 2021-08-30 09:43:13 +08:00
tianshujie98
f8074fdafb * Finish task #41800. 2021-08-25 10:45:33 +08:00
tianshujie98
3e86bf4da9 * Finish task #41226. 2021-08-12 16:14:56 +08:00
holan20180123
992ad08c17 * Fix bug #11743. 2021-04-01 15:39:24 +08:00
hufangzhou
b5794a7a81 * Fix bug #11159. 2021-03-30 10:41:54 +08:00
tianshujie98
33bcb0922e * Finish task #36438. 2021-03-09 17:28:23 +08:00
holan20180123
017a21b95b * Finish task #36475. 2021-03-08 09:48:02 +08:00
tianshujie98
951c76cd85 * Fix release problems. 2021-03-08 09:05:33 +08:00
tianshujie98
7c2817b892 * Distinguish project execution from release module. 2021-03-04 14:38:29 +08:00
hufangzhou
bb1c8b8e01 * Adjust the release table style. 2021-01-28 09:36:05 +08:00
leiyong
a8f6ba8bc4 * Adjust code. 2021-01-27 09:49:49 +08:00
tianshujie98
e9f68f8b9d * Adjust width. 2021-01-25 15:11:55 +08:00
tianshujie98
4e2236c817 * Finish task #9093. 2021-01-25 14:54:22 +08:00
qiyu-xie
db6acf2cf2 * Modify the milestone icon for the release. 2021-01-20 13:24:47 +08:00
Yagami
dafb68b70c * Code for hour unit. 2021-01-18 10:49:39 +08:00
holan20180123
a431691425 * Remove build field from release of product. 2020-12-23 13:43:25 +08:00
holan20180123
9ad2d2617e * Finish task #8785. 2020-12-22 17:19:21 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
qiyu-xie
41f8d0fbd3 * Fix bug#3678. 2020-12-03 11:21:44 +08:00
qiyu-xie
fec2bc506e * Fix bug#3678. 2020-12-03 11:00:29 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123
d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123
bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
holan20180123
97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
c241b1051f * Finish task #8194. 2020-11-11 13:32:01 +08:00
holan20180123
8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123
09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98
593aab8967 * Adjust code style. 2020-10-28 11:30:20 +08:00
z
f802c93bde * finish task #12675. 2020-09-29 08:54:28 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
Yagami
bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
tianshujie98
595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
Catouse
35e78313a0 * task #7591, auto refresh table statistic and pager after delete items. 2020-08-06 17:26:00 +08:00
holan20180123
794534a0a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 14:10:22 +08:00
holan20180123
6f0fe410ad * Finish task #7596. 2020-08-06 14:08:32 +08:00
z
9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
z
01fada7c12 * finish task #7585. 2020-08-06 10:58:54 +08:00