Commit Graph
14678 Commits
Author SHA1 Message Date
leiyong da5249b3c7 * Finish task#7549. 2020-07-25 20:50:38 -07: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 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 11f71b3cf4 * fix table setting button now show after hot refresh table. 2020-07-24 09:30:35 +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
chenfei b832868f2c * Move tip lang item to bizext. 2020-07-23 16:12:49 +08:00
z e390ad4ab9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 15:59:55 +08:00
z 7bca29aeec * code for task #7469. 2020-07-23 15:59:18 +08:00
holan20180123 8522665fdb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-23 15:53:47 +08:00
holan20180123 78e714df92 * Finish task #7361. 2020-07-23 15:49:13 +08:00
z 36dfa2641c Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 15:37:32 +08:00
chenfei 852b4e5231 * Finish task #7365. 2020-07-23 14:39:39 +08:00
chenfei e022121f09 * Finish task #7401. 2020-07-23 13:24:37 +08:00
z be145c47e6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 13:02:53 +08:00
z 2f6f314865 * code for task #7426. 2020-07-23 13:01:56 +08:00
Catouse 38a7d60b21 * task #7414, bug #3095, fix file manager not work on upload images in kindeditor. 2020-07-23 11:08:25 +08:00
z 13a7e4802b * finish task #7426. 2020-07-23 11:04:02 +08:00
z 227ccdd17d * finish task #7372. 2020-07-23 09:32:23 +08:00
z 0391faec8d Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-22 17:06:51 +08:00
z 96980aee50 * adjust for canSearch flow field. 2020-07-22 17:06:16 +08:00
chenfei b7e6ca6467 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-22 16:28:41 +08:00
chenfei 893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
leiyong c1b08303ba * Adjust code. 2020-07-21 20:18:53 -07:00
tianshujie98 1f0aeacf8b * Finish task #7348. 2020-07-22 10:06:48 +08:00
z 266a87d40b Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-22 09:06:40 +08:00
z ffabfbfbba * adjust for svn path has space. 2020-07-22 09:05:41 +08:00
z 21fcb26e30 * adjust for create from import. 2020-07-22 09:05:05 +08:00
holan20180123 6c0eb72b10 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-21 17:46:30 +08:00
holan20180123 236a99519e * Finish task #7374. 2020-07-21 17:46:01 +08:00
reneeteng 6e08756f0b * Minor change in lang files. 2020-07-21 14:25:47 +08:00