Commit Graph
15552 Commits
Author SHA1 Message Date
Yagami 25ffb0c220 * Adjust holiday modal style. 2020-09-02 14:43:38 +08:00
Yagami 9d1a30a3d6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 13:59:15 +08:00
Yagami 3cb808bd22 * Adjust holiday modal style. 2020-09-02 13:58:32 +08:00
qiyu-xie d21075c1ba *Fix custom module lang. 2020-09-02 13:57:11 +08:00
tianshujie98 49ea5179a6 * Edit comment. 2020-09-02 13:48:05 +08:00
Yagami 6cf9958aec * Code for task #7812. 2020-09-02 11:29:32 +08:00
Yagami 3bf3187bfe Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 11:28:04 +08:00
Yagami a1f4a8e7bb * Finish task #7812. 2020-09-02 11:27:34 +08:00
qiyu-xie 4c7e7ae2e5 *Add design module resource. 2020-09-02 11:09:15 +08:00
qiyu-xie 0086f2d069 *Fix common module lang. 2020-09-02 10:19:09 +08:00
hufangzhou fa93c2e670 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 10:02:27 +08:00
hufangzhou 80caf5e0b1 * Fix bug#3426 2020-09-02 10:02:11 +08:00
holan20180123 9737d1bff2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 10:00:44 +08:00
holan20180123 f2d571b28d * Fix ajax get program menu. 2020-09-02 09:59:35 +08:00
tianshujie98 08f823ce95 * Modify design dynamics. 2020-09-02 09:51:16 +08:00
qiyu-xie 4f8a19baf2 *Fix block module lang. 2020-09-02 09:03:52 +08:00
tianshujie98 94ca22e92c * Modify format and design delete issues. 2020-09-02 08:57:18 +08:00
hufangzhou f88cccac65 * Adjust block code. 2020-09-01 18:37:45 +08:00
tianshujie98 a6029d430f * Modify bottom refresh. 2020-09-01 17:48:12 +08:00
z ab578b96b1 * fix error. 2020-09-01 17:15:30 +08:00
tianshujie98 89bbfdfe22 * Modify pagination. 2020-09-01 16:54:47 +08:00
tianshujie98 2593f6cc3b * Modify pagination. 2020-09-01 16:52:11 +08:00
tianshujie98 494c995fcb * Delete redundant variables. 2020-09-01 16:30:27 +08:00
tianshujie98 9eba15e15a * Edit comment. 2020-09-01 16:18:27 +08:00
holan20180123 9406ae4b07 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 15:47:51 +08:00
holan20180123 20a09be88e * Finish task #7734. 2020-09-01 15:47:03 +08:00
z 2a613daf36 Merge branch 'master' of github.com:easysoft/zentaopms 2020-09-01 15:35:20 +08:00
z 0c3d54efef * finish task #7739. 2020-09-01 15:34:52 +08:00
tianshujie98 5eb536073e *Fix bug #3420. 2020-09-01 15:14:13 +08:00
Yagami 7bf4e88a56 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 15:09:25 +08:00
z e5d6cab545 * finish task #7741. 2020-09-01 14:47:42 +08:00
z defb5f4f1a Merge branch 'master' of github.com:easysoft/zentaopms 2020-09-01 14:45:16 +08:00
z 0a6056ceac * finish task #7761,7766. 2020-09-01 14:44:09 +08:00
qiyu-xie 075713b538 *Fix misc module lang. 2020-09-01 14:32:03 +08:00
Yagami 2045857098 * Finish task #7728. 2020-09-01 14:28:26 +08:00
qiyu-xie 477d5a0bed *Fix common module lang. 2020-09-01 14:27:19 +08:00
qiyu-xie c5c9d0c155 *Fix user module lang. 2020-09-01 14:04:16 +08:00
qiyu-xie 819c806aa8 *Fix story module lang. 2020-09-01 13:57:15 +08:00
qiyu-xie 7c8f2c1d4e *Fix project module lang. 2020-09-01 13:54:11 +08:00
holan20180123 814bea0cd3 * Adjust track and edit for risk module. 2020-09-01 13:43:38 +08:00
holan20180123 1032d4a749 * Finish task #7747. 2020-09-01 13:40:39 +08:00
holan20180123 12f4e5ead3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 13:27:30 +08:00
holan20180123 718b5835d1 * Finish task #7753. 2020-09-01 13:26:59 +08:00
qiyu-xie 3d9bc3a0c9 *Fix my module lang. 2020-09-01 13:22:39 +08:00
qiyu-xie 75b03bc73c *Fix group module lang. 2020-09-01 13:17:30 +08:00
Yagami 5c51b144cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 04:03:10 +00:00
qiyu-xie 1106371757 *Fix custom module lang. 2020-09-01 11:32:07 +08:00
tianshujie98 2f194aabd9 * Adjust lang/en.php 2020-09-01 11:31:14 +08:00
tianshujie98 f01ccecad8 * Add comments and date judgments. 2020-09-01 11:08:04 +08:00
qiyu-xie 798f834946 *Fix holiday module lang. 2020-09-01 11:03:45 +08:00