Commit Graph

17808 Commits

Author SHA1 Message Date
z
cb7931251b * finish task #7535. 2020-07-27 09:29:31 +08:00
z
4502545269 * revert datatable tr height. 2020-07-27 09:15:41 +08:00
chenfei
ba57175628 * Finish task #7523. 2020-07-27 08:07:21 +08:00
holan20180123
196cb6304b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-26 23:44:30 +08:00
holan20180123
cb7ea554a4 * Finish task #7520. 2020-07-26 23:43:58 +08:00
chenfei
101e36e485 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-26 22:09:02 +08:00
chenfei
7c2e311ac0 * Finish task #7552. 2020-07-26 22:07:38 +08:00
chenfei
7e48d40719 * Finish task #7543. 2020-07-26 21:52:31 +08:00
holan20180123
52bf76aa88 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-26 21:42:57 +08:00
holan20180123
0d3b0b4384 * Finish task #7530. 2020-07-26 21:42:06 +08:00
chenfei
33db67ea2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-26 21:37:35 +08:00
holan20180123
87bd3143f3 * Finish task #7531. 2020-07-26 21:19:04 +08:00
holan20180123
d4d49466b4 * Finish task #7521. 2020-07-26 21:16:48 +08:00
holan20180123
605753a2cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-26 14:45:19 +08:00
holan20180123
69ffb2d3c4 * Finish task #7527. 2020-07-26 14:44:40 +08:00
leiyong
da5249b3c7 * Finish task#7549. 2020-07-25 20:50:38 -07:00
chenfei
29999a3689 * Finish task #7550. 2020-07-25 22:30:50 +08:00
chenfei
fe91f8c9d6 * Finish task #7556. 2020-07-25 22:16:40 +08:00
chenfei
2e568d4001 * Finish task #7545. 2020-07-25 22:14:11 +08:00
chenfei
6972e19d53 * Finish task #7522. 2020-07-25 22:13:30 +08:00
sgm0422
deb448d2bb * Finish task #7551. 2020-07-25 18:49:20 +08:00
holan20180123
97bfc8fd50 * Finish task #7547. 2020-07-25 12:19:12 +08:00
holan20180123
a9cf557fde Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-25 12:00:45 +08:00
holan20180123
657620244b * Finish task #7515,7516,7517,7518,7524,7525,7526. 2020-07-25 11:59:55 +08:00
z
39aa4b6b34 * finish task #7519. 2020-07-25 11:24:56 +08:00
z
deed071f8e * finish task #7539. 2020-07-25 11:03:33 +08:00
z
f4987f4a04 * code for task #7548. 2020-07-24 21:45:48 +08:00
z
9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z
d52b9c460a * finish task #7538. 2020-07-24 20:44:44 +08:00
z
480b7df59d * finish task #7533. 2020-07-24 20:41:06 +08:00
z
257afdf49e * finish task #7542. 2020-07-24 20:37:51 +08:00
z
821739f624 * finish task #7553. 2020-07-24 20:30:17 +08:00
z
a3f0f7ea58 * finish task #7555. 2020-07-24 20:23:42 +08:00
z
098dabfb11 * finish task #7559. 2020-07-24 20:01:22 +08:00
z
a641250d7b Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-24 19:44:30 +08:00
Catouse
7056013d6b * fix tooltip not correct after rename file in file input control.
see http://ranzhi.5upm.com/bug-view-1459.html
2020-07-24 15:57:56 +08:00
Catouse
841cb9eb1d * task #7373, bug #3191, fix table statistic information not update after dialog closed with datatable. 2020-07-24 09:30:35 +08:00
Catouse
11f71b3cf4 * fix table setting button now show after hot refresh table. 2020-07-24 09:30:35 +08:00
sgm0422
f4c3b232b6 * Revert sql. 2020-07-24 09:25:22 +08:00
z
f66fa8105c Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-24 09:14:23 +08:00
holan20180123
d4d0453a70 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-24 09:01:40 +08:00
holan20180123
0d0412133e * Fix bug #3199. 2020-07-24 09:00:51 +08:00
z
e3a73fe144 * adjust for flow with textarea. 2020-07-24 08:58:42 +08:00
Catouse
c0385c114b * task #7477, bug #2957, fix testtask table is empty after execute case in dialog. 2020-07-23 18:32:52 +08:00
Catouse
251e11f24d * task #7373, bug #3191, fix table statistic information not update after dialog closed. 2020-07-23 17:47:41 +08:00
Catouse
9f7a7c3a10 * task #7373, bug #3191, fix table statistic information not update after dialog closed. 2020-07-23 17:10:46 +08:00
z
1003f748d1 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 16:55:10 +08:00
z
1c8d874053 * code for task #7469. 2020-07-23 16:43:16 +08:00
Catouse
1374027cd1 * update kindeditor style. 2020-07-23 16:41:02 +08:00
chenfei
b832868f2c * Move tip lang item to bizext. 2020-07-23 16:12:49 +08:00