Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
61,140 Commits 2 Branches 292 Tags
528ac8edbc67bacb01cab4190af4e24892024909
Commit Graph
112 Commits
Author SHA1 Message Date
sunguangming 124fbbfa8d * Fix js error. 2023-06-27 09:25:28 +08:00
tianshujie a031ce11a3 * Code for task #95401. 2023-06-14 15:55:38 +08:00
caoyanyi 80d1876049 * Change form data get. 2023-06-13 16:51:10 +08:00
caoyanyi 678f19d961 * Change return value. 2023-06-13 14:08:03 +08:00
caoyanyi 845e6a95e9 * Change return value and param type. 2023-06-13 13:25:08 +08:00
caoyanyi be066ec03f * Change return value for branch create. 2023-06-13 13:25:07 +08:00
caoyanyi f8d57ecdf3 * Change method return value. 2023-06-10 11:05:12 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
lanzongjun 9746936437 * Finish Task #78664 2022-12-05 16:22:32 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
xieqiyu e5dcaf9f33 * Delete empty line. 2022-11-25 13:23:06 +08:00
xieqiyu 03705737f7 * Fix bug#30186. 2022-11-25 13:20:07 +08:00
lanzongjun f980579b0a * task #74142 2022-11-02 14:42:20 +08:00
daitingting 6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
王怡栋 1aa2f24efc Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of create project when select all branch.

See merge request easycorp/zentaopms!4470
 2022-07-12 07:00:55 +00:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
xieqiyu 74f38571af * Fix bug of create project when select all branch. 2022-07-01 13:54:38 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu c1bc3c7d41 * Fix bug of select main branch. 2022-06-01 20:44:31 +08:00
xieqiyu 5f5f721d19 * Finish task#55631. 2022-06-01 00:26:43 +08:00
xieqiyu 63032ffe42 * Fix bug#21936. 2022-04-22 15:57:57 +08:00
hufangzhou ddb4ab243a * Remove the unused code. 2022-04-18 15:00:51 +08:00
hufangzhou 281fa51fc1 * Fix bug #21822. 2022-04-18 14:58:06 +08:00
孙华伟 a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
xieqiyu 8aaaeafcb3 * Modify review code. 2022-04-07 17:22:15 +08:00
xieqiyu 1a59190992 * Fix bug#21550. 2022-04-07 17:09:41 +08:00
songchenxuan 7a9afd7052 *AjaxGetBranches function code format. 2022-03-24 15:39:35 +08:00
zhujinyong 1f8e1b0021 * Fix return print() -> return. 2022-02-22 09:35:25 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
孙广明 f5da2d8a21 Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master' 
* Finish task #46096.

See merge request easycorp/zentaopms!1095
 2021-12-23 03:32:01 +00:00
hufangzhou e1075ca205 * Finish task #46096. 2021-12-23 11:29:51 +08:00
孙广明 7bdb0499e9 Merge branch 'master' into 'sprint/178_songchenxuan_46100' 
# Conflicts:
#   module/productplan/view/batchedit.html.php
#   module/productplan/view/browse.html.php
 2021-12-23 02:46:03 +00:00
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
hufangzhou 5b0923a7a3 * Resolve the issue of merge branch. 2021-12-22 10:07:18 +08:00
hufangzhou 10c2f33c2b * Adjust the issue of merge branch. 2021-12-22 08:50:42 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 2809bc0b94 * Perfect details. 2021-12-21 15:42:26 +08:00
zhujinyong 5a1e31adf2 * Refactor getList of branch. 2021-12-21 14:53:05 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
xieqiyu b67911b304 * Pass the data of the merged branch. 2021-12-16 17:19:25 +08:00
xieqiyu b300ca39da * Change branch language for manage. 2021-12-16 11:09:02 +08:00
hufangzhou f02ca7df03 * Code for task #45756. 2021-12-15 08:40:25 +08:00
xieqiyu 5472859d6e * Code for task#45536. 2021-12-11 14:28:45 +08:00
mayue f92ba845a3 * Fix bug #16605. 2021-11-25 14:35:33 +08:00
mayue 36afb288d6 * Fix bug #16605. 2021-11-25 13:31:35 +08:00
mayue 1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00