Commit Graph
2004 Commits
Author SHA1 Message Date
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 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 859b836916 * adjust for ja lang. 2020-09-12 10:55:23 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +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 b1cd0ed599 * code for task #7600. 2020-08-06 13:36:41 +08:00
Catouse c2b35db7d1 * fix picker undefined error in some pages without import picker js. 2020-08-06 10:48:30 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
z 277ed6ca46 * fix dev-api and change zh-tw lang. 2020-07-28 08:42:29 +08:00
Catouse 7d1f51118f * task #7372, bug #3196, fix datatable line height in firefox. 2020-07-27 10:24:44 +08:00
tianshujie98 94f98fa13a * Finish task #7536,7557,7558. 2020-07-27 10:05:11 +08:00
z cb7931251b * finish task #7535. 2020-07-27 09:29:31 +08:00
z 4502545269 * revert datatable tr height. 2020-07-27 09:15:41 +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
Catouse 11f71b3cf4 * fix table setting button now show after hot refresh table. 2020-07-24 09:30:35 +08:00
z be145c47e6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 13:02:53 +08:00
Catouse 38a7d60b21 * task #7414, bug #3095, fix file manager not work on upload images in kindeditor. 2020-07-23 11:08:25 +08:00
z 227ccdd17d * finish task #7372. 2020-07-23 09:32:23 +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 a235dd7718 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-13 16:27:06 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
tianshujie98 a4b52c7e87 Finish task #7413,7394,7391,7384,7381. 2020-07-13 14:21:29 +08:00
z dd10375298 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-09 17:38:27 +08:00
z 95d668557e * fix error. 2020-07-09 17:38:04 +08:00
chenfei 7cd810d3d1 * Fix bug #3255. 2020-07-09 13:57:20 +08:00
z 7cd8ff8f4e Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-07 11:25:41 +08:00
z c43f0fd426 * adjust for zh-tw lang. 2020-07-07 11:24:23 +08:00
chenfei 604a766d01 * Fix bug #3192. 2020-07-07 10:03:51 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +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 65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00