Commit Graph
3740 Commits
Author SHA1 Message Date
Wenrui LI 614f530249 * tweak project create for lite, task #47148. 2022-01-11 10:05:26 +08:00
李玉春 05ec5dad47 Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!1301
2022-01-06 08:01:30 +00:00
mayue 1980e18d38 * Optimize code. 2022-01-06 16:00:28 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
liumengyi 42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
mayue fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
zhouxin 7c1d29f971 Fix bug. 2022-01-06 05:12:36 +00:00
zhouxin b74b175a9a Do some little change. 2022-01-06 05:01:18 +00:00
朱金勇 cb699a9f5a Merge branch 'sprint/181_tianshujie_lang' into 'master'
* Modify the English language item of the currency.

See merge request easycorp/zentaopms!1277
2022-01-06 04:53:49 +00:00
李玉春 a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
#   module/project/config.php
2022-01-06 04:01:16 +00:00
zhouxin 0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00
李玉春 0943f58b83 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1282
2022-01-06 03:27:12 +00:00
zhouxin 520f6077bd Add testtask and release table. 2022-01-06 03:25:52 +00:00
zhouxin 05192bdb3e Fix bug. 2022-01-06 03:21:03 +00:00
tianshujie 5929a4fc32 * Modify the English language item of the currency. 2022-01-06 10:35:25 +08:00
zhouxin ee431f18e3 Fix bug #18199. 2022-01-05 05:09:08 +00:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
孙广明 a2bd7cfcf3 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18199.

See merge request easycorp/zentaopms!1266
2022-01-05 05:15:13 +00:00
孙广明 2ad05dd024 Merge branch 'sprint/180_hufangzhou_closeModel' into 'master'
* Compatible with Firefox browser.

See merge request easycorp/zentaopms!1262
2022-01-05 05:11:43 +00:00
hufangzhou 4d78e4b9d3 * Compatible with Firefox browser. 2022-01-05 10:54:34 +08:00
mayue 15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
李玉春 d7a9f2fd67 Merge branch 'sprint/180_mayue_46526' into 'sprint/180'
* Finish task #46526.

See merge request easycorp/zentaopms!1249
2022-01-04 07:32:59 +00:00
mayue 1d28df0e30 * Optimize code. 2022-01-04 15:27:07 +08:00
mayue 0cd9411371 * Finish task #46526. 2022-01-04 10:28:53 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
zhujinyong e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +08:00
Hao Sun 1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
孙广明 286c772523 Merge branch 'sprint/180_xieqiyu_46543' into 'sprint/180'
* Modify the problems.

See merge request easycorp/zentaopms!1214
2021-12-30 09:26:57 +00:00
xieqiyu ed73332c41 * Modify the problems. 2021-12-30 17:17:46 +08:00
Hao Sun dff300cf88 * Task #46524, refactor user selector for page "project/managemembers". 2021-12-30 17:02:32 +08:00
Hao Sun d41525719b * refactor. 2021-12-30 17:01:49 +08:00
mayue 64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
孙广明 355665690b Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674

See merge request easycorp/zentaopms!1195
2021-12-30 08:15:39 +00:00
zhouxin 50dabf7bd7 Refactor method checkCanChangeModel. 2021-12-30 08:09:50 +00:00
Hao Sun 4d2010f2be * fix setRole not work. 2021-12-30 15:38:21 +08:00
zhouxin e9231b595a Change configuration file. 2021-12-30 07:16:28 +00:00
孙广明 9ccf3099a0 Merge branch 'sprint/32_zhouxin_46679' into 'master'
Finish task #46679 and fix a bug.

See merge request easycorp/zentaopms!1194
2021-12-30 06:44:16 +00:00
Hao Sun d8153ee358 * refactor. 2021-12-30 14:27:53 +08:00
zhouxin 344682bf7b Delete createguide of kanban,change cmmi to waterfall. 2021-12-30 06:25:22 +00:00
zhouxin 05a75e7039 Finish task #46674. 2021-12-30 05:50:50 +00:00
mayue 9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
songchenxuan c560dc7048 *Delete swp file. 2021-12-30 09:41:33 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
朱金勇 7953a80a5e Merge branch 'sprint/180_songchenxuan_46531' into 'sprint/180'
*Finish task #46531.

See merge request easycorp/zentaopms!1172
2021-12-29 08:58:28 +00:00
zhouxin 2e79c5f869 Finish task #46679 and fix a bug. 2021-12-29 03:49:17 +00:00
hufangzhou 2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
mayue 3aeb86e36d * Finish task #46526. 2021-12-28 15:22:08 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00