Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
30,654 Commits 2 Branches 292 Tags
9e9dcf653dc29c42f90813ca2df4e6f288e7eecc
Commit Graph
930 Commits
Author SHA1 Message Date
王怡栋 f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun 39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明 8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085' 
# Conflicts:
#   module/story/model.php
 2021-11-29 07:26:45 +00:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
zhujinyong be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +08:00
zhengrunyu b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
zhujinyong 4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
王怡栋 11e5d04bf7 * fix bug #16439. 2021-11-23 13:47:12 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
王怡栋 7cc9e9f875 * code for task #44308. 2021-11-17 09:59:39 +08:00
zhouxin e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00
李玉春 d75156dd74 Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170' 
* Finish task #43918.

See merge request easycorp/zentaopms!361
 2021-11-09 06:00:23 +00:00
root 397fb3e152 Finish task #43918. 2021-11-09 13:58:39 +08:00
root 782d1114bf Finish task #43918. 2021-11-09 13:47:30 +08:00
root 44c44f11d1 Finish task #43918. 2021-11-09 13:25:52 +08:00
root f23ff798b9 Finish task #43918. 2021-11-09 13:23:37 +08:00
root 627ba8e493 Finish task #43918. 2021-11-09 13:18:44 +08:00
root fdc54380ee * Finish task #43918. 2021-11-09 13:08:58 +08:00
root ab5ee93bc3 * Finish task #43918. 2021-11-09 11:26:25 +08:00
root 33539633d7 * Finish task #43918. 2021-11-09 10:35:17 +08:00
root b9dc220fd9 * Finish task #43918 2021-11-09 08:35:27 +08:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00
孙广明 791be24fb7 * Remove unused code. 2021-11-08 13:27:17 +08:00
孙广明 869faaeaaa * Remove unused code. 2021-11-08 13:26:26 +08:00
孙广明 3965d5339b * Finish task #44002, #44003... 2021-11-08 13:12:25 +08:00
孙广明 143abdf45b * Fix an error. 2021-11-08 11:02:11 +08:00
孙广明 f9978c4841 * Code for task #44005. 2021-11-04 17:07:37 +08:00
mayue c916df0117 * Fix bug #15780. 2021-11-03 15:05:44 +08:00
mayue be67b785b3 * Fix bug #15780. 2021-11-03 14:50:48 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
reneeteng cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
mayue ef9821f709 *Fix a bug #15793. 2021-10-28 10:10:04 +08:00
mayue 60afff4fcd *Fix a bug #15793. 2021-10-28 10:04:55 +08:00
mayue a2a8552221 *Fix a bug #15793. 2021-10-28 09:52:35 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
王怡栋 001ca0ef8f * code for task #43347. 2021-10-26 15:39:46 +08:00
hufangzhou c576e60197 * Compatible with pro version in mobile. 2021-10-19 17:36:13 +08:00
xieqiyu e9b614a72b * Fix bug#15561. 2021-10-18 16:37:36 +08:00
王怡栋 351b07352b Merge branch '15.6' into sprint/167 2021-10-18 08:53:13 +08:00
Hao Sun 1fbf34f9bc * Task #43181, bug #15371, fix nest toggle in program table not work when close program dialog first time. 2021-10-15 15:31:30 +08:00
xieqiyu 5697ba482a * Fix bug#15543. 2021-10-15 14:13:41 +08:00
王怡栋 8ee2811723 Merge branch '15.6' into sprint/167 2021-10-15 13:11:52 +08:00
xieqiyu 8e38b12360 * Code for bug#14879. 2021-10-15 08:06:44 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00