Commit Graph
14976 Commits
Author SHA1 Message Date
yfl 1f8899a848 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-17 09:39:25 +08:00
yfl 25294fc6e4 * task #7840 2019-04-17 09:38:10 +08:00
Yagami 204390100d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-17 08:50:54 +08:00
Yagami 91d16c04ee * Code for traingoal. 2019-04-17 08:50:26 +08:00
reneteng 9c46bf4aa6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-16 15:17:46 +08:00
Catouse 58a5ce3d92 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-16 11:29:08 +08:00
Catouse e8420fc3a7 * refactor codes. 2019-04-16 11:29:01 +08:00
Catouse 3b8f222328 * fix lastComment editor not work after reverse history list. 2019-04-16 11:28:19 +08:00
yfl e110d289e5 * team except feedback 2019-04-15 16:54:08 +08:00
yfl 57205959d7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 16:53:25 +08:00
Yagami 3639a74cb7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 16:33:38 +08:00
Yagami 58761b1d45 * Fix width for doc view. 2019-04-15 16:33:05 +08:00
reneeteng 590112e66c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 15:42:22 +08:00
yfl 396e7f42d7 * task #7863 2019-04-15 13:55:54 +08:00
Yagami c534d4602c * Code for task #7805. 2019-04-15 10:50:21 +08:00
reneeteng b9dc6d629b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 09:23:53 +08:00
reneeteng d29d77ac06 * Lang changed. 2019-04-15 09:23:02 +08:00
Yagami c72ff92d48 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-12 14:38:11 +08:00
Yagami bfcb9f536a * Fix locate after create todo. 2019-04-12 14:37:27 +08:00
yfl 2b922b2a31 * Task #7859 2019-04-12 13:59:36 +08:00
yfl eec411e145 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-12 10:24:39 +08:00
yfl 8b77b8cd4b * task #7860 2019-04-12 10:23:59 +08:00
Yagami a321266757 * Code for task #7807. 2019-04-12 09:40:07 +08:00
Yagami 0cd90d123f * Code for task #7807. 2019-04-12 09:28:28 +08:00
Yagami 21e65f670c * Code for task #7820. 2019-04-11 14:04:22 +08:00
yfl 550c5168c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-11 13:13:55 +08:00
yfl 14eb93ef75 * Task # 7894 2019-04-11 13:13:19 +08:00
Yagami 36602c4d9b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-11 10:49:30 +08:00
Yagami 8bd5e075d1 * Fix parent task button. 2019-04-11 10:49:00 +08:00
yfl 1165403070 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-11 08:52:43 +08:00
yfl 7a75a922f1 * Fix Bug 2019-04-11 08:52:06 +08:00
reneeteng a391f110c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-10 15:22:48 +08:00
reneeteng 676ddf02bf * Lang change. 2019-04-10 15:22:19 +08:00
Yagami c56b754028 * Delete biz lang. 2019-04-10 14:07:40 +08:00
Yagami 2c800ede78 * Finish task #7801. 2019-04-10 11:07:08 +08:00
Yagami f21b0ad11b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-10 10:39:58 +08:00
Yagami 263fcd1bbc * Add feedback to todo. 2019-04-10 10:39:35 +08:00
reneeteng fcf101fa3c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:48:19 +08:00
reneeteng b557a8c45a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:47:33 +08:00
wangyidong 95b66f9229 * fix bug. 2019-04-09 12:01:42 +08:00
wangyidong b554bea1d3 * adjust for change block. 2019-04-08 15:20:53 +08:00
yfl 289fc113b4 * backup button loading 2019-04-08 11:15:18 +08:00
chenfei bee17125ad * Prepare for upgrade 11.4.1 zentaopms_11.4.1_20190406 2019-04-06 13:49:21 +08:00
chenfei 2384b7f713 * Adjust custom header to be convenient to extend. 2019-04-04 16:16:39 +08:00
Yagami 585ad591d9 * Fix icon. 2019-04-04 16:06:36 +08:00
wangyidong 1d000c9edc Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-04 14:53:40 +08:00
wangyidong 559095ff58 * adjust children actions for task-view page in modal. 2019-04-04 14:52:29 +08:00
Yagami b1f2a64f8e * Fix table style. 2019-04-04 14:33:18 +08:00
Yagami 490d692b8c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-04 14:15:52 +08:00
Yagami f7e7d32ef9 * Fix text center. 2019-04-04 14:14:22 +08:00