Commit Graph

455 Commits

Author SHA1 Message Date
jajasper
fabd02ef52 * Fix bug #1484 of integrate zdoo. 2020-11-27 17:01:47 +08:00
holan20180123
e41208725d Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-27 11:30:17 +08:00
holan20180123
8d04de9dd6 * Modify the login time permission judgment. 2020-11-27 11:28:05 +08:00
z
124bbb2e8b * adjust for X-Frame-Options. 2020-11-26 13:53:44 +08:00
holan20180123
378d6245e8 * Finish task #8376. 2020-11-18 15:17:30 +08:00
holan20180123
557a5d5d62 * Finish task #8387. 2020-11-18 14:04:34 +08:00
holan20180123
d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
hufangzhou
55df1f202b * Finish task#8387. 2020-11-18 09:09:16 +08:00
holan20180123
9e7d7aa91a * Finish task #8388. 2020-11-17 16:39:10 +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
5ca98d0eee * Finish task #8194. 2020-11-16 09:13:06 +08:00
holan20180123
95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
holan20180123
728ff92cf6 * Finish task #8194. 2020-11-12 11:25:05 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
547ecde44d * Finish task #8194. 2020-11-11 16:11:27 +08:00
holan20180123
09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
holan20180123
35ecdc8290 * Remove duplicate query code. 2020-10-21 09:31:28 +08:00
holan20180123
b849999023 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-10 16:57:05 +08:00
holan20180123
02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
z
12820bf546 * fix for task #8091. 2020-10-09 11:43:18 +08:00
z
1af3353ae1 * adjust notice. 2020-10-09 11:02:01 +08:00
z
3d0ccb781d * finish task #8091. 2020-10-09 09:13:29 +08:00
z
4262f4c782 * finish task #8051. 2020-09-30 20:34:53 +08:00
leiyong
b60e13adff * Finish task#8076. 2020-09-30 14:16:17 +08:00
z
a7b7d8da4a * fix bug for set https. 2020-09-30 13:36:49 +08:00
holan20180123
72ad194da7 * Finish task #7951. 2020-09-28 09:04:07 +08:00
holan20180123
ed523a1442 * Finish task #7951. Fix bug 3369. 2020-09-28 08:54:14 +08:00
z
2a6e021191 * finish task #7986. 2020-09-24 13:24:46 +08:00
z
93581b34b4 * add new version. 2020-09-15 09:52:17 +08:00
z
c2c14a88c9 * code for task #7799. 2020-09-08 13:50:08 +08:00
z
8e2f4654c4 * finish task #7795. 2020-09-03 16:32:39 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z
cb7931251b * finish task #7535. 2020-07-27 09:29:31 +08:00
z
9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z
480b7df59d * finish task #7533. 2020-07-24 20:41:06 +08:00
z
cac3322a8d * adjust for workflow. 2020-07-20 15:09:41 +08:00
chenfei
7768b040d4 * Finish task #7383. 2020-07-17 16:39:49 +08:00
leiyong
59d6baede0 * Fix jenkins password cannot contain @. 2020-07-16 14:37:21 +08:00
z
a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
chenfei
7cd810d3d1 * Fix bug #3255. 2020-07-09 13:57:20 +08:00
z
5907a27f8f * finish task #7278. 2020-06-19 16:43:08 +08:00
z
ceea9745a1 * finish task #7261. 2020-06-17 14:15:16 +08:00
wangyidong
7a9cc4070a * fix for security weaknesses. 2020-05-28 09:52:41 +08:00
wangyidong
9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
wangyidong
928147ac91 * finish task #6891. 2020-02-20 15:09:25 +08:00
wangyidong
5d97280b3a * Fix error. 2020-02-11 15:12:58 +08:00
wangyidong
6a91d77a31 * adjust code. 2020-02-11 12:04:24 +08:00
wangyidong
616d01b015 * fix bug. 2020-02-05 17:30:21 +08:00
wangyidong
6fc074f237 * code for task #9812. 2020-02-04 17:34:13 +08:00