Commit Graph

133 Commits

Author SHA1 Message Date
wangyuting2
58c08b95a6 * Fix print extend fields bug. 2022-05-12 14:10:10 +08:00
wangyuting2
d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
daitingting
0fba3427af * Build operate menu for productplan module. 2022-05-11 01:39:53 +00:00
王怡栋
d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2
248683c67d * Merge code. 2022-05-10 16:36:06 +08:00
wangyuting2
fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
朱金勇
e431b802f4 Merge branch 'zentaocloud/dingguodong' into 'master'
* Add codes for saas extension.

See merge request easycorp/zentaopms!3303
2022-05-10 07:44:31 +00:00
daitingting
deb8d170a7 * Build operate menu for product. 2022-05-10 05:44:25 +00:00
dingguodong
39b77f36b6 * Add codes for saas extension. 2022-05-10 13:24:06 +08:00
wangyuting2
dceb7ba183 * Optimize code. 2022-05-09 17:09:24 +08:00
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2
103f3a21c6 * Adjust return value. 2022-05-09 16:18:12 +08:00
wangyuting2
e86f32df24 * Adjust feedback menu. 2022-05-09 15:58:02 +08:00
wangyuting2
45ae4de775 * Do task 53548. 2022-05-09 09:20:01 +08:00
wangyuting2
d29cf03d41 * Merge lib dao code. 2022-05-07 13:11:44 +08:00
wangyuting2
3d4374964a * Merge zdoo framework. 2022-05-07 09:52:16 +08:00
wangyidong
668637fc18 * adjust for web page. 2022-04-25 15:20:05 +08:00
王怡栋
b9ebcd6944 * code for bug #21655. 2022-04-15 11:20:28 +08:00
王怡栋
f52e4a8a82 * code for bug #18161. 2022-04-12 14:21:07 +08:00
孙广明
d058c26177 * Remove unused code. 2022-03-16 15:48:03 +08:00
孙广明
5cae6e943c * Finish task #50323. 2022-03-07 08:54:42 +08:00
王怡栋
ebb6c3be60 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-04 15:06:01 +08:00
王怡栋
b19ff4c180 * adjust for flow. 2022-03-04 15:05:34 +08:00
孙广明
202df229b0 * Code for force upgrade. 2022-03-04 09:42:19 +08:00
tianshujie
75ba14eb95 * Fix bug #20298. 2022-03-03 17:05:35 +08:00
王怡栋
9acdcb0abf * adjust for check flow require field. 2022-03-03 16:11:10 +08:00
孙广明
42624e0427 * Add upgrade logic. 2022-03-02 14:10:59 +08:00
tanghucheng
ccc11c4e4b * Hide preference and tutorial. 2022-02-28 15:18:57 +08:00
zhujinyong
08ea97263f * Fix hook files of xuan. 2022-02-25 17:37:10 +08:00
tianshujie
38ebc359e6 * Modify the code logic. 2022-02-23 17:02:03 +08:00
tianshujie
e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
zhujinyong
b4c3ec0a9c * Refactoring for extension. 2022-01-10 22:39:54 +08:00
王怡栋
9b9c95ca54 * adjust for check requiredField for flow. 2022-01-06 11:56:07 +08:00
王怡栋
9b51c138dc * adjust for multilingual api. 2021-11-09 08:47:24 +08:00
王怡栋
08f1d594c0 * adjust for task #42835. 2021-09-28 09:24:33 +08:00
dingguodong
7ba0c35e35 * Correct the misspelled word. 2021-09-13 10:45:02 +08:00
sgm0422
501bb4afaf * Finish task #41730. 2021-08-27 14:46:44 +08:00
wangyidong
fdc8ed02fa * fix bug for richtext in flow. 2021-07-08 13:10:59 +08:00
Yagami
7a4dd087a1 * Finish task #38791. 2021-07-05 09:28:49 +08:00
wangyidong
e0068f3bdc * adjust for flow. 2021-04-07 14:45:44 +08:00
zhujinyong
d966b2e214 * Ajdust openApp logic. 2021-03-31 16:07:11 +08:00
zhujinyong
6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
Yagami
f44f079b91 * Add default preference. 2021-01-28 10:38:40 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
z
24e55f7d2f * fix bug for validater. 2020-11-11 14:45:45 +08:00
Yagami
ce494052c5 * Fix my menu and framework control. 2020-09-10 13:47:40 +08:00
z
1096a6678d * adjust for flow. 2020-07-15 17:31:48 +08:00
z
75fe055826 * finish task #11727. 2020-07-13 16:15:35 +08:00