Commit Graph
14789 Commits
Author SHA1 Message Date
holan20180123 ca73b53436 * Finish task #7613. 2020-08-07 17:31:13 +08:00
holan20180123 28af4d63da * Finish task #7613. 2020-08-07 17:29:16 +08:00
holan20180123 5755239f21 * Finish task #7612. 2020-08-07 17:28:45 +08:00
holan20180123 99e92ac05f * Finish task #7611. 2020-08-07 17:27:54 +08:00
z f3a5fc4ef9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 17:22:21 +08:00
z 9d7a93bda5 * fix error. 2020-08-06 17:21:39 +08:00
z d1d918334a * fix bug #3337. 2020-08-06 17:21:19 +08:00
tianshujie98 f423abddca * Finish task #7577. 2020-08-06 17:13:45 +08:00
qiyu-xie 217b456bf9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 16:29:16 +08:00
qiyu-xie 904543b48f * Fix bug #3324. 2020-08-06 16:28:08 +08:00
Catouse dc04c92b2c * task #7563, bug #2481, refresh table statistic information after unlink bug or story in plan page. 2020-08-06 16:13:08 +08:00
tianshujie98 da4222a8f4 * Fix bug #2564. 2020-08-06 15:56:25 +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 2e98ef6a16 * adjust style. 2020-08-06 15:46:49 +08:00
z b753e06149 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:32:27 +08:00
z 6aca289707 * finish task #7585. 2020-08-06 15:28:46 +08:00
holan20180123 9b1a053f26 * Finish task #7560. 2020-08-06 14:26:07 +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
holan20180123 6109e9c55a * Finish task #7566. 2020-08-06 14:07:52 +08:00
holan20180123 6050a025c6 * Fix bug #3335. 2020-08-06 14:06:44 +08:00
z b1cd0ed599 * code for task #7600. 2020-08-06 13:36:41 +08:00
z 8511ff7596 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 11:01:36 +08:00
z 9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
z 01fada7c12 * finish task #7585. 2020-08-06 10:58:54 +08:00
z 952c013eca * fix for getModuleOwner. 2020-08-06 10:51:43 +08:00
Catouse c2b35db7d1 * fix picker undefined error in some pages without import picker js. 2020-08-06 10:48:30 +08:00
tianshujie98 bb3658ecf8 * Fix bug #2504. 2020-08-05 17:58:17 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98 a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
z ae84a5dc24 * code for task #7600. 2020-08-05 16:33:57 +08:00
qiyu-xie e81a736150 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-05 11:18:34 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
tianshujie98 ae1a3396ba Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 09:41:47 +08:00
tianshujie98 7dc09c5374 * Finish task #7584. 2020-08-05 09:29:53 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z bb3ad790d0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-04 14:02:28 +08:00
z cbaa60d87f * code for task #7595. 2020-08-04 13:39:09 +08:00
holan20180123 cdd728328c Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-03 15:49:21 +08:00
holan20180123 c92cc316d0 * Finish task #7568. 2020-08-03 15:48:52 +08:00
holan20180123 e1fc3eed58 * Finish task #7575. 2020-08-03 15:48:15 +08:00
tianshujie98 99aa236209 #Finish task #7562. 2020-08-03 15:41:26 +08:00
z e5e1002f8a * Fixed security hole. 2020-08-03 15:03:51 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
holan20180123 ead7c9b8fd Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-31 16:28:50 +08:00
holan20180123 c351b21b76 * Finish task #7571. 2020-07-31 15:53:40 +08:00
z bf58755bc6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-31 13:05:23 +08:00
z ea9c4eceb5 * fix bug. 2020-07-31 11:11:22 +08:00
tianshujie98 2e19ada004 *Adjust requiredModules. 2020-07-30 17:31:22 +08:00