Commit Graph
138 Commits
Author SHA1 Message Date
zenggang 3b87d63a4b * Fix bug #24663 2022-07-01 02:59:20 +00:00
zenggang 3ea6077270 * Code for task#57907 2022-06-24 06:11:23 +00:00
zenggang f5071a43eb * Code for task#57907 2022-06-23 01:26:21 +00:00
zenggang 5bad1b3167 * Code for task #57907 2022-06-22 01:26:42 +00:00
zenggang b761aa029b * Finish task #57907 2022-06-21 02:50:55 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyidong 50ec57b390 * code for story #32387. 2022-05-12 19:04:44 +08:00
孙广明 700b2d6bb1 Merge branch 'master' into 'liyuchun_fixbug_22074'
# Conflicts:
#   lib/filter/filter.class.php
2022-04-28 10:34:02 +00:00
liyuchun 83fa4afc83 * Fix bug #17968. 2022-04-28 09:02:44 +00:00
tianshujie 7f7a50ea12 * Fix bug #2795. 2022-04-28 11:02:38 +08:00
王怡栋 b3cca161cc * adjust for install page in lite. 2022-03-18 09:49:05 +08:00
tanghucheng fb78d74984 * Fix bug. 2022-03-11 15:48:25 +08:00
tanghucheng c81a8d5edf * Fix bug. 2022-03-11 15:21:29 +08:00
tanghucheng cd84fb4d54 * Fix bug. 2022-03-11 15:09:17 +08:00
hufangzhou bf119b5cb8 * Hide the other products. 2022-01-14 14:48:24 +08:00
zenggang e7f819ac53 * Adjust code variable name 2021-10-11 01:16:15 +00:00
zenggang bf16a12c7b * Fix bug#15439 2021-10-09 01:05:07 +00:00
zenggang 57b48dd406 * Code for bug#15365 2021-09-28 11:20:05 +08:00
liyuchun 6f9a5c7e67 * Finish task #42155. 2021-09-03 14:37:28 +08:00
liyuchun 58577bb42c * Code for task #42154. 2021-09-03 14:15:05 +08:00
王怡栋 003f03589c * finish task #42159. 2021-09-02 16:47:50 +08:00
liyuchun f81ac5db58 * Code for task #41764. 2021-08-26 16:27:53 +08:00
holan20180123 31c72cbbe9 * Finish task #41768. 2021-08-23 09:29:32 +08:00
holan20180123 1ae0fcda04 * Adjsut page style of install. 2021-07-20 16:13:54 +08:00
qiyu-xie 2c27035699 * Adjust code. 2021-07-16 11:22:56 +08:00
zenggang 0cbd7bd2b8 finish task #40019 2021-07-12 01:37:50 +00:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123 a6b21d74b7 * Finish task #3591. 2020-11-23 16:23:20 +08:00
tianshujie98 48e4e31a30 * Finish task #8397. 2020-11-18 10:33:34 +08:00
hufangzhou 8acfd6867f * Finish task#8205. 2020-11-12 10:49:33 +08:00
holan20180123 0c6e4dd435 * Finish task #8220. 2020-11-06 16:23:50 +08:00
Yagami 478d51813f * Add sql. 2020-11-02 16:17:57 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 53679403e7 * Finish task#8068. 2020-09-30 14:51:58 +08:00
holan20180123 cb4b68c14b * Finish task #7997. 2020-09-17 14:38:14 +08:00
holan20180123 4ce98a6eb1 * Finish task 7997. 2020-09-17 14:36:40 +08:00
Yagami 3965976022 * Code for task #7632. 2020-08-17 15:31:44 +08:00
Yagami 0ee24ac23c * Hidden product. 2020-08-03 13:42:48 +08:00
wangyidong 67b96b8cb3 * add btn-wide class for btn on install and upgrade page. 2019-11-29 10:06:55 +08:00
wangyidong abd68e9428 * code for task #6337. 2019-09-05 09:38:12 +08:00
wangyidong 6652663389 * code for task #6226. 2019-08-22 16:44:36 +08:00
wangyidong 336e6e2e30 * finish task #6246. 2019-08-21 10:09:14 +08:00
wangyidong ad844896d3 * code for task #6178. 2019-08-08 18:48:09 +08:00
wangyidong 1d317c5fb3 * finish task #5278. 2019-02-20 18:01:00 +08:00
Yagami 4820641b36 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-20 15:54:37 +08:00
Yagami 6efbe82455 * Finish task #5309. 2019-02-20 15:53:47 +08:00
wangyidong 7bcd62dfdc * finish task #5279. 2019-02-20 14:34:22 +08:00
dajiao007 cb13c64e9c * modify english labels 2018-07-09 09:39:49 +08:00
Catouse 92bafeedcd * fix icon class name. 2018-05-23 10:27:45 +08:00