Commit Graph
466 Commits
Author SHA1 Message Date
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
leiyong c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
holan20180123 d0f2c2992f * Determine if id is a number. 2020-10-19 16:50:04 +08:00
holan20180123 84b0506fff * Finish task #12756. 2020-10-19 16:15:36 +08:00
tianshujie98 36a1d27c32 * Edit comment. 2020-10-12 11:43:06 +08:00
tianshujie98 a7d9aa4cfa * Edit comment. 2020-10-12 11:40:56 +08:00
tianshujie98 046241fa2c * Delete comment. 2020-10-10 17:17:41 +08:00
tianshujie98 2d46ae29d2 * Add notes. 2020-10-10 17:09:48 +08:00
tianshujie98 294b3e0ccf * Add notes. 2020-10-10 16:56:20 +08:00
tianshujie98 677fa52863 * Revert submission. 2020-10-09 08:31:30 +08:00
tianshujie98 f7911a7013 * Revert submission. 2020-10-09 08:27:33 +08:00
tianshujie98 2661667379 * Finish task #7957. 2020-09-30 13:22:47 +08:00
tianshujie98 9980b2fc7f * Finish task #7957. 2020-09-30 13:13:08 +08:00
hufangzhou 770971a9c3 * Finish bug#3486. 2020-09-28 13:49:22 +08:00
qiyu-xie 262b5b2520 * Remove the templateID field from the bug module. 2020-09-25 15:19:51 +08:00
qiyu-xie bbe2fb689a * Remove the templateID field from the bug module. 2020-09-25 15:17:04 +08:00
tianshujie98 31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
tianshujie98 ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +08:00
tianshujie98 b106d3a95e * Finish task #8009. 2020-09-23 11:10:28 +08:00
tianshujie98 d39955eb24 * Finish task #8009. 2020-09-23 11:04:55 +08:00
Yagami ffaf91d467 * Rename program to PRJ. 2020-09-22 15:10:11 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
tianshujie98 1d7a38ab4e * Finish task #7957. 2020-09-16 09:28:02 +08:00
tianshujie98 47b04f91b8 * Delete newline. 2020-09-16 08:53:47 +08:00
tianshujie98 e6fdef3c77 * Finish task #7957. 2020-09-16 08:46:44 +08:00
tianshujie98 5df1ab65db * Fix bug #3457. 2020-09-14 10:10:29 +08:00
tianshujie98 1c02bd9377 * Fix bug #3457. 2020-09-14 10:04:31 +08:00
tianshujie98 9809766e12 * Fix bug #3457. 2020-09-14 09:52:14 +08:00
tianshujie98 b9e61a1852 * Fix bug #3457. 2020-09-11 16:53:16 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z ba32604be6 * fix for flow. 2020-08-31 15:17:40 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami 1f2f21e44b * Adjust code style. 2020-08-29 13:20:50 +08:00
z 505ed7c1bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:54:46 +08:00
z 4f47220347 * finish task #7698. 2020-08-27 13:54:23 +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
chenfeiCF 586f34b10f * Add toTask field to datatable. 2020-08-21 07:18:54 +00: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
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
holan20180123 794534a0a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 14:10:22 +08:00
holan20180123 6f0fe410ad * Finish task #7596. 2020-08-06 14:08:32 +08:00
z 952c013eca * fix for getModuleOwner. 2020-08-06 10:51:43 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
holan20180123 c92cc316d0 * Finish task #7568. 2020-08-03 15:48:52 +08:00
chenfei ba57175628 * Finish task #7523. 2020-07-27 08:07:21 +08:00
holan20180123 78e714df92 * Finish task #7361. 2020-07-23 15:49:13 +08:00
chenfei dd3486e6d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 16:28:47 +08:00