Commit Graph

1415 Commits

Author SHA1 Message Date
Yagami
d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
leiyong
c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
holan20180123
e024d848e1 * Finish task #8089. 2020-09-30 14:10:20 +08:00
tianshujie98
ffc66d3f17 * Fix bug #3508. 2020-09-27 09:50:31 +08:00
qiyu-xie
c9784f6939 * Fix bug#3516. 2020-09-25 14:35:24 +08:00
holan20180123
4b1c0ced7b * Finish task #7932. Fix bug #3422. 2020-09-23 13:55:32 +08:00
holan20180123
6b2a0ff721 * Finish task #8021. Fix bug #2550. 2020-09-21 16:59:42 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
holan20180123
9c3d71fd04 * Fix bug 7914. 2020-09-16 11:02:30 +08:00
tianshujie98
0d3d4f5e2e * Fix comment. 2020-09-07 13:32:44 +08:00
tianshujie98
7fd5c7d55c * Fix bug #3442. 2020-09-04 13:48:19 +08:00
Yagami
9ef26b6538 * Fix code logic. 2020-09-03 15:13:37 +08:00
holan20180123
e7cbe56f26 * Adjust batchCreate testcase. 2020-08-31 17:39:26 +08:00
holan20180123
7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
holan20180123
a72a033748 * Finish task #7717. 2020-08-31 09:07:19 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
6cdef8d7d3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-18 14:11:53 +08:00
z
be28a89aea * fix bug for flow. 2020-08-18 14:09:30 +08:00
holan20180123
efb74c9aaf Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-17 09:23:37 +08:00
holan20180123
8e964d56a1 * Fix bug #3365. 2020-08-17 09:21:19 +08:00
qiyu-xie
03c00910ae Fix bug #3342 2020-08-14 08:10:19 +08:00
tianshujie98
595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
tianshujie98
fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98
ac56db1998 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:51:15 +08:00
tianshujie98
2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
z
9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
tianshujie98
548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
z
ae84a5dc24 * code for task #7600. 2020-08-05 16:33:57 +08:00
qiyu-xie
76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z
9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
z
e9cfd48d18 * adjust for refreshPage and set closed for member. 2020-07-27 13:28:33 +08:00
holan20180123
657620244b * Finish task #7515,7516,7517,7518,7524,7525,7526. 2020-07-25 11:59:55 +08:00
leiyong
ac90d68b4c * Fix bug. 2020-07-24 02:22:31 -07:00
z
96980aee50 * adjust for canSearch flow field. 2020-07-22 17:06:16 +08:00
z
21fcb26e30 * adjust for create from import. 2020-07-22 09:05:05 +08:00
holan20180123
edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00
holan20180123
3cba60eb57 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-17 17:19:47 +08:00
holan20180123
f574524f3f * Finish task #7407. 2020-07-17 17:19:12 +08:00
tianshujie98
a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
leiyong
0dddf6deda * Finish task#7346. 2020-07-14 02:02:13 -07:00
holan20180123
bbaf3c038e * Finish task #7406. 2020-07-14 16:23:14 +08:00
chenfei
2034b6ff8f * Fix bug #2988. 2020-07-08 14:40:24 +08:00
chenfei
48e1b9becc * Fix bug #3217. 2020-07-06 15:20:59 +08:00
z
9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
sgm0422
ec7511df35 * Merge showimport to 15.x. 2020-07-02 14:32:05 +08:00
z
36dfb8eb36 * adjust code. 2020-07-01 17:47:54 +08:00
z
3a391ea836 * finish task #7277. 2020-06-22 14:30:52 +08:00
z
807fa3c58a * finish task #7273. 2020-06-22 10:59:10 +08:00
z
d05924db17 * finish task #7279. 2020-06-19 15:01:22 +08:00