Commit Graph
17755 Commits
Author SHA1 Message Date
z 7bca29aeec * code for task #7469. 2020-07-23 15:59:18 +08:00
z 36dfa2641c Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 15:37:32 +08:00
z 01690a133a + add xuanxuan standard file. 2020-07-23 15:37:05 +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
Catouse 5ee732bb22 * bug #2973, task #7470, fix point hit detection not work as expected. 2020-07-23 10:50:22 +08:00
z 227ccdd17d * finish task #7372. 2020-07-23 09:32:23 +08:00
Catouse 07919c6710 * task #7448, bug #2915, fix content not save after delete row in kindeditor. 2020-07-22 22:09:07 +08:00
Catouse a6714b6180 * task #7479, bug #2953, fix selectable in table not work as expected. 2020-07-22 21:35:12 +08:00
Catouse d3f9939525 * task #7347, bug #3267, handle the case where the user enters a non-number in searchbox to prevent server error. 2020-07-22 17:55:37 +08:00
Catouse bb6f8e994c * task #7347, bug #3267, handle the case where the user enters a non-number in searchbox to prevent server error. 2020-07-22 17:50:39 +08:00
Catouse 073db145cf * task #7443, bug #2987, fix insert row in merged cell not work as expected in kindeditor. 2020-07-22 17:39:59 +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 229b3e2cec Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-22 16:47:21 +08:00
Catouse 4ea90f2f70 * task #7483, bug #2925, fix insert cell error in kindeditor. 2020-07-22 16:34:34 +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
chenfei 5a96e8a5a5 * Finish task #7411. 2020-07-22 09:26:49 +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
leiyong 192abdb348 * Adjust code. 2020-07-20 22:50:26 -07:00
holan20180123 05ba543c23 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-21 10:09:22 +08:00
holan20180123 ee2165bf06 * Finish task #7459. 2020-07-21 10:08:56 +08:00
leiyong bf7fc5a53b * Finish task#7350. 2020-07-20 17:20:29 -07:00
sgm0422 e4059ed259 * Fix sql. 2020-07-20 17:14:48 +08:00
chenfei 78888f1f81 * Adjust order in roadmap. 2020-07-20 15:46:49 +08:00
z 2a4b6bb2fc Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-20 15:11:32 +08:00
z 55dc4e1d29 * adjust for edit testreport. 2020-07-20 15:10:55 +08:00
z 0864ced439 * change for php7.2 2020-07-20 15:10:33 +08:00
z cac3322a8d * adjust for workflow. 2020-07-20 15:09:41 +08:00
leiyong a509bcdab0 *Finish task#7379. 2020-07-20 00:03:23 -07:00
leiyong a454abf6da Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-20 00:02:58 -07:00
chenfei 87fd8cbc27 * Finish task #7436. 2020-07-20 14:30:20 +08:00
leiyong 926f246386 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-19 23:20:55 -07:00
tianshujie98 eeea421cf9 * Finish task #7487,7488. 2020-07-20 13:13:41 +08:00
leiyong 99690d0544 * Finish task#7379. 2020-07-19 20:29:32 -07:00
chenfei b2f7a2ee17 * Finish task #7401. 2020-07-20 11:23:04 +08:00
holan20180123 bb1d677e25 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-20 10:39:59 +08:00
holan20180123 edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00