Commit Graph

426 Commits

Author SHA1 Message Date
sgm0422
005eca6d81 * Hide some menu. 2020-05-19 19:13:14 +08:00
sgm0422
5dc4fbcec8 * Fix menu and program. 2020-05-18 16:46:40 +08:00
Yagami
d1e3e3184f * Fix menu. 2020-05-15 09:20:20 +08:00
Yagami
9f1e075c82 * Fix program module. 2020-05-14 14:39:52 +08:00
Yagami
2f249572f7 * Fix menu. 2020-05-14 10:14:02 +08:00
sgm0422
eee8e1d3de * Fix menu. 2020-05-13 20:50:19 +08:00
Yagami
9e1220be5f * Fix menu. 2020-05-13 17:05:27 +08:00
Yagami
d71d534a2a * Fix menu. 2020-05-13 16:31:10 +08:00
Yagami
6fe5f81780 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-12 17:29:57 +08:00
Yagami
9e131109d0 * Fix menu. 2020-05-12 14:30:57 +08:00
Yagami
27fc29b764 * Code for task #7121. 2020-05-08 08:51:32 +08:00
Yagami
6d1a047b02 * Finish task #7119. 2020-05-06 11:13:13 +08:00
Catouse
bf33d10b9d * task #7116, task #7127, task #7128, task #7130, implement new menu. 2020-05-05 17:20:44 +08:00
wangyidong
c9ce71628f * add priv for commitResult. 2020-04-03 09:01:47 +08:00
wangyidong
990e33afcc * add commit result interface. 2020-04-01 13:35:58 +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
wangyidong
3de40ee5b2 * finish task #2201. 2020-01-13 14:56:23 +08:00
wangyidong
e2efd30948 * fix bug for show annual data. 2020-01-07 08:49:09 +08:00
wangyidong
89329621d3 * adjust for annual data. 2020-01-06 16:50:15 +08:00
wangyidong
7af8e82c0d * code for upgrade. 2020-01-02 09:45:21 +08:00
chenfei
125e2375f8 * Adjust variable name. 2019-12-11 11:15:00 +08:00
wangyidong
168ce93203 * finish task #6620. 2019-12-05 17:00:08 +08:00
wangyidong
4988680449 * finish task #6577. 2019-11-26 13:49:20 +08:00
wangyidong
90122b67b9 * adjust code. 2019-11-26 11:03:45 +08:00
wangyidong
41c693d07a * finish task #6488. 2019-11-22 10:37:50 +08:00
wangyidong
6434e06342 * finish task #6539,6537. 2019-11-18 14:14:03 +08:00
Yagami
6a34209544 * Finish task #6481. 2019-11-14 10:44:43 +08:00
wangyidong
2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
Yagami
1821853a9f * Finish task #6384. 2019-10-09 10:00:16 +08:00
wangyidong
54eaa0d545 * check timestamp for check entry token. 2019-09-25 15:00:08 +08:00
wangyidong
b72f3f5db3 * code for tutorial. 2019-09-03 14:31:48 +08:00
wangyidong
981d69a87e * code for task #6310. 2019-09-03 13:18:55 +08:00
wangyidong
2b78f53283 * finish task #6310. 2019-09-03 13:17:45 +08:00
wangyidong
010e585550 * finish task #6176. 2019-08-14 08:59:39 +08:00
liugang
506aaa3d74 * Change sub status when status is changed and sub status is not set, and record the changes. 2019-08-06 18:05:31 +08:00
wangyidong
922800cb81 * change for task #8445. 2019-08-02 13:40:13 +08:00
liugang
5e32ee1081 * Add subStatus in lang files.
* Change sub status when status is changed and sub status is not set, and record the changes.
2019-07-30 10:10:10 +08:00
jinianlan
c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
jinianlan
aac0ce2554 * fix Bug #2656,#2653 2019-07-25 17:57:15 +08:00
jinianlan
0672bc7a0b * finish task #2656 2019-07-23 14:06:31 +08:00
wangyidong
2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wyd621
9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
Yagami
910ea1e96f * Fix details before release. 2019-06-25 09:33:56 +08:00
Yagami
2d73bfdd7d * Fix checkentry method. 2019-06-24 17:31:55 +08:00
Yagami
7b41c11c32 * Finish task #5804. 2019-06-21 14:08:23 +08:00