Commit Graph
16333 Commits
Author SHA1 Message Date
wangyidong 8897e5ab4e * finish task #6434. 2019-10-14 09:36:01 +08:00
wangyidong 89e99f4745 * code for task #6466. 2019-10-12 16:19:12 +08:00
wangyidong 4ba3b39498 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-12 16:02:54 +08:00
wangyidong 5f5ab186af * finish task #6439. 2019-10-12 16:02:33 +08:00
Yagami 650ff48474 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-12 15:40:57 +08:00
Yagami a11601eaff * Finish task #6459. 2019-10-12 15:40:25 +08:00
wangyidong 71e90595da * finish task #6441. 2019-10-12 15:08:29 +08:00
wangyidong 4cbd15766f Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-12 14:52:14 +08:00
wangyidong 2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
Yagami f4375dc9f0 * Finish task #6457. 2019-10-12 13:56:51 +08:00
Yagami 6f0586038b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-12 11:09:55 +08:00
Yagami 908d70ef34 * Finish task #6452. 2019-10-12 11:08:39 +08:00
wangyidong 219dbdb7f3 * finish task #6446. 2019-10-12 10:44:40 +08:00
wangyidong b4ac34cfe4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-12 10:29:08 +08:00
wangyidong da2a9751dc * finish task #6447. 2019-10-12 10:28:02 +08:00
Yagami 26bd0e996f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-12 10:25:45 +08:00
Yagami 727c6f4fce * Finish task #6451. 2019-10-12 10:09:27 +08:00
wangyidong b58151d72d Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-12 10:01:41 +08:00
wangyidong fc97ecc2da * finish task #6466. 2019-10-12 10:01:16 +08:00
Yagami c0497a7935 * Finish task #6448. 2019-10-12 09:41:40 +08:00
Yagami 19e5590541 * Finish task #6408. 2019-10-11 16:26:46 +08:00
Yagami 98ac711d6d * Finish task #6406. 2019-10-11 15:02:51 +08:00
Yagami e0a667b5f8 * Finish task #6405. 2019-10-11 14:20:22 +08:00
Yagami 7116b062ea * Finish task #6403. 2019-10-11 13:29:19 +08:00
Yagami 55139fc899 * Finish task #6396. 2019-10-11 10:10:46 +08:00
Yagami 03f04777e2 * Finish task #6395. 2019-10-11 09:15:37 +08:00
Yagami 90f304a3fc * Finish task #6394. 2019-10-10 15:50:55 +08:00
Yagami b16752383d * Finish task #6392. 2019-10-10 14:39:46 +08:00
Yagami 8f10dc718a * Finish task #6391. 2019-10-10 13:56:43 +08:00
Yagami 59af2053bc * Finish task #6386. 2019-10-10 11:26:32 +08:00
Yagami fe47c0600a * Finish task #6381. 2019-10-09 16:49:09 +08:00
Yagami 4dd4fb8ea5 * Finish taks #6385. 2019-10-09 16:05:36 +08:00
Yagami 1821853a9f * Finish task #6384. 2019-10-09 10:00:16 +08:00
Yagami 2433ce4b44 * Finish task #6382. 2019-10-08 14:34:42 +08:00
wangyidong 54eaa0d545 * check timestamp for check entry token. 2019-09-25 15:00:08 +08:00
wangyidong 8dfe360c5c * adjust for computeHours4Multiple when update task. 2019-09-25 08:51:01 +08:00
wangyidong 09c04815ea * add changelog. zentaopms_11.6.3_20190924 2019-09-24 10:41:04 +08:00
wangyidong c3cd2b7af7 * fix bug #2722. 2019-09-24 10:07:45 +08:00
wangyidong e41a21b408 * fix bug #2766. 2019-09-24 09:17:49 +08:00
wangyidong a3ba864944 * add new version and upgrade. 2019-09-23 17:02:10 +08:00
wangyidong 0a0ce92796 * fix bug. 2019-09-23 16:26:54 +08:00
wangyidong 8177758b87 * fix bug #2007. 2019-09-20 16:30:23 +08:00
wangyidong 8100b669d2 * adjust th width. 2019-09-20 15:27:48 +08:00
wangyidong 82b0d31096 * fix bug #2775. 2019-09-20 15:27:03 +08:00
wangyidong 8ebd5c0d64 * fix bug #2757. 2019-09-20 15:25:51 +08:00
wangyidong 5fd54d028a Merge branch 'master' of github.com:easysoft/zentaopms 2019-09-19 14:27:07 +08:00
wangyidong 9fc841dada * adjust for en lang. 2019-09-19 14:26:49 +08:00
wangyidong 729f73fe05 * add appendExec method for upgrade. 2019-09-19 14:26:01 +08:00
wangyidong b6a3307e41 * remove htmlspecialchars_decode for html block. 2019-09-19 14:24:40 +08:00
wangyidong 003f68c25d * adjust for convertEncoding. 2019-09-19 14:20:48 +08:00