Commit Graph
679 Commits
Author SHA1 Message Date
王怡栋 f5d4dfc9ad * code for task #49356. 2022-03-09 10:53:08 +08:00
王怡栋 da92204f31 * code for lite version. 2022-03-07 09:59:56 +08:00
孙广明 04b8ba2360 * Rename var. 2022-03-01 08:26:01 +08:00
孙广明 10679fa684 * Add upgrade. 2022-02-22 14:32:47 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
朱金勇 211596a0ab Merge branch 'sprint/scx_addlang' into 'master'
Add translate lang.

See merge request easycorp/zentaopms!1799
2022-02-15 04:00:47 +00:00
王怡栋 98c6d7b2b1 * code for task #48840. 2022-02-15 09:42:47 +08:00
hufangzhou aaeeaf1743 * Add the new version. 2022-02-15 08:47:29 +08:00
songchenxuan eb7147bf23 Add translate lang. 2022-02-14 17:28:59 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
xieqiyu 8efd4a500b * Fix bug: activatecard and finishcard add to openmethods. 2022-01-27 16:39:34 +08:00
zhujinyong a69e209afa * Fix link for lite. 2022-01-27 10:55:50 +08:00
hufangzhou b0ab0f8ae4 * Add the new version. 2022-01-26 13:47:00 +08:00
xieqiyu 2838e9dc76 * Modify import drop menu. 2022-01-24 16:28:00 +08:00
zhujinyong 822ff427ea * Set version. 2022-01-23 21:06:55 +08:00
孙广明 6d2212e7e0 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #47977.

See merge request easycorp/zentaopms!1503
2022-01-19 09:32:12 +00:00
liumengyi 9ef522cc46 * Modify code format. 2022-01-19 17:24:15 +08:00
liumengyi c8b5ceed87 * Finish task #47977. 2022-01-19 16:58:34 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
王怡栋 bd824458e3 * add edition. 2022-01-19 09:07:40 +08:00
孙广明 fff984acf4 * Add upgrade logic. 2022-01-17 10:42:02 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
caoyanyi e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00
孙广明 0afb843ef5 * Refactor kanban code. 2022-01-12 11:23:05 +08:00
hufangzhou d0cfa7531e * Add the new version. 2022-01-11 09:19:47 +08:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08: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
孙广明 65f31e5b01 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18245.

See merge request easycorp/zentaopms!1278
2022-01-06 02:40:14 +00:00
zhouxin 735c0eae85 Fix bug #18245. 2022-01-06 02:37:08 +00:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liyuchun adc4c9ad98 * Fix bug #18088. 2021-12-31 10:23:49 +08:00
xieqiyu ed73332c41 * Modify the problems. 2021-12-30 17:17:46 +08:00
xieqiyu 5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
tianshujie 593cabd96c * Modify variable name. 2021-12-27 17:20:47 +08:00
tianshujie 27319feba9 * Finish task #46657. 2021-12-27 17:11:29 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
王怡栋 2eac7ba0d1 * adjust for get repo rules api. 2021-12-21 17:42:38 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
王怡栋 56437f6418 Merge branch 'master' into 'apiext'
# Conflicts:
#   config/routes.php
2021-12-17 09:58:59 +00:00
王怡栋 b96a5b286d * adjust for task #46002. 2021-12-17 13:03:56 +08:00
王怡栋 1a66159617 * code for task #46002. 2021-12-17 08:47:23 +08:00
孙广明 d75774cafc Merge branch 'kanban' into 'sprint/177_tianshujie_card'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-12-13 08:11:03 +00:00
tianshujie 6a894bc7fb * Finish task #45829. 2021-12-13 15:37:33 +08:00
孙广明 557afc06ef * Code for task #45819. 2021-12-13 14:42:56 +08:00
孙广明 9824f4c6ac * Code for task #45818. 2021-12-09 14:11:49 +08:00
zhujinyong b6cfb2a715 + Add repos api. 2021-12-09 11:07:58 +08:00