Commit Graph
166 Commits
Author SHA1 Message Date
tianshujie c855db99a4 * Change the empty key to 0; 2023-11-21 14:07:23 +08:00
tanghucheng 89eca0a231 * Merge #615e993f4c,Finihs task #92288. 2023-11-03 02:17:26 -04:00
tanghucheng 3d9f13c436 * Merge #a50a745a41,Finish task #92289. 2023-11-03 01:56:50 -04:00
dingguodong be113c6c14 * Fix typo, rename storys to stories. 2023-09-27 08:59:09 +08:00
dingguodong 845382fded * Modify priList to avoid extra empty option occurs. 2023-09-01 10:21:03 +08:00
dingguodong 1937dbacae * Fix typo, rename attatch to attach. 2023-07-28 15:59:45 +08:00
chentao 44ceb7f049 * Add translation of URS for different languages within story module. 2023-07-06 15:57:54 +08:00
sunguangming 91cd3751b8 * Finish task #96496. 2023-07-05 10:30:33 +08:00
wangyidong 34f5737660 * Rewrite activate page. 2023-06-27 18:20:42 +08:00
wangyidong 70cf4fcf6b * Use modalHeader wg. 2023-06-27 15:08:40 +08:00
tianshujie 99f3ccee79 * Modify language item for product common. 2023-03-07 13:49:20 +08:00
tianshujie e1b6e852af * Unified filter label format. 2023-03-06 14:02:09 +08:00
tianshujie 9e4fa093d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 10:14:51 +08:00
liumengyi d410fe9931 * Fix bug #32466. 2023-02-28 09:15:40 +00:00
tianshujie 20b129e8c4 * Code for finish task #85504. 2023-02-27 14:11:40 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
孙广明 dc7d8a5500 Merge branch 'master' into 'sprint_273_79667'
# Conflicts:
#   module/story/lang/de.php
#   module/story/lang/en.php
#   module/story/lang/fr.php
#   module/story/lang/zh-cn.php
2022-12-15 05:30:51 +00:00
孙广明 c8fbb5633c Merge branch 'master_xieqiyu_79668' into 'master'
Master xieqiyu 79668

See merge request easycorp/zentaopms!6544
2022-12-14 06:14:49 +00:00
liuhong fd30e0a006 * Finish task #79667. 2022-12-14 04:49:43 +00:00
liuhong 95056fd6cd * draft code task #79667. 2022-12-14 04:09:51 +00:00
孙广明 6f584ec3c1 Merge branch 'sprint_273_79669' into 'master'
Sprint 273 79669

See merge request easycorp/zentaopms!6534
2022-12-14 01:33:28 +00:00
xieqiyu 8ac26c73c3 * Code for task#79668. 2022-12-13 22:05:32 +08:00
liuhong 64388b7ec3 * Finish task #7966* Finish task #79669. 2022-12-13 06:13:22 +00:00
liuhong 093826a152 * Adjust code task #79669. 2022-12-13 05:13:22 +00:00
liuhong 553a684afe * Finish task #79669. 2022-12-13 03:10:25 +00:00
lanzongjun 295bfadc5b * Finish Task #79671 2022-12-12 15:38:55 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
mayue 9b7c5be5ca * Finish feedback#130 and story#32666. 2022-12-08 14:46:33 +08:00
mayue f7c3965d57 * Fix bug #30373. 2022-12-01 14:23:39 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
xieqiyu bf01ea3844 * Modify tips of batch change plan. 2022-11-10 01:08:52 +00:00
xieqiyu f4b99792dd * Finish task#75317. 2022-11-09 03:19:33 +00:00
王怡栋 ce2eda09f8 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* finish task #75318#75327#75328

See merge request easycorp/zentaopms!6075
2022-11-08 07:36:39 +00:00
xieqiyu 0ddb613cdc * Finish task#75323. 2022-11-08 03:03:21 +00:00
lanzongjun bdfb04fabf * finish task #75318 2022-11-08 09:49:17 +08:00
xieqiyu 5467f11490 * Code for task#75325. Sync siblings when recall review. 2022-11-08 01:39:27 +00:00
xieqiyu 7f04f391e5 * Code for task#75325. Sync siblings when recall change. 2022-11-08 01:29:44 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
xieqiyu f01d68f80b * Code for task#75325. Finish submit review sync siblings. 2022-11-07 07:58:08 +00:00
xieqiyu d5f1e2a741 * Code for task#74151,#74155. 2022-11-03 02:02:38 +00:00
孙广明 dbef6bec02 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* task #74142

See merge request easycorp/zentaopms!5995
2022-11-02 09:10:34 +00:00
lanzongjun 73cf79584d * task #74142 code meeting fix 2022-11-02 17:06:37 +08:00
xieqiyu 4c99401fe5 * Code for task#74144,#74155. 2022-11-02 06:58:20 +00:00
孙广明 6d0b8a3917 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Fix code format.

See merge request easycorp/zentaopms!5979
2022-11-02 02:59:16 +00:00
tanghucheng 06ed61a897 * Fix code format. 2022-11-02 10:56:38 +08:00