 hufangzhou
|
dc8fcc9484
|
* Merge 18.4 into master.
|
2023-05-05 09:26:04 +08:00 |
|
|
wangyidong
|
901fc68f3c
|
* adjust for change bizVersion to edition.
|
2023-04-24 17:00:52 +08:00 |
|
|
Hao Sun
|
ed31bffa6c
|
Merge branch 'zin_merge'
# Conflicts:
# framework/base/control.class.php
# framework/control.class.php
|
2023-04-23 19:44:40 +08:00 |
|
|
鲁飞
|
045289d4c7
|
* Support PHP8.1.
|
2023-04-23 11:21:09 +00:00 |
|
|
Hao Sun
|
2bcc9bdbf4
|
Merge branch 'zin_dev'
# Conflicts:
# module/common/lang/zh-cn.php
# module/product/lang/de.php
# module/product/lang/en.php
# module/product/lang/fr.php
# module/product/lang/zh-cn.php
# module/program/js/browse.js
# module/program/lang/de.php
# module/program/lang/en.php
# module/program/lang/fr.php
# module/program/lang/zh-cn.php
# module/project/config.php
# module/project/lang/de.php
# module/project/lang/en.php
# module/project/lang/fr.php
# module/project/lang/zh-cn.php
# module/search/view/buildform.html.php
# module/task/control.php
|
2023-04-23 19:20:45 +08:00 |
|
|
wangyuting2
|
e4c3846cca
|
* Fix bug #30351.
|
2023-02-09 14:47:26 +08:00 |
|
|
tianshujie
|
15b9176f8d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2023-01-03 16:52:49 +08:00 |
|
|
tianshujie
|
c201a0e478
|
* Finish task #79634.
|
2022-12-13 14:47:28 +08:00 |
|
|
liugang
|
08748eb7d4
|
Merge branch 'guanxiying/zentaopms-master'
|
2022-11-23 10:09:31 +08:00 |
|
|
tianshujie
|
c9c2927202
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2022-11-08 08:32:35 +08:00 |
|
|
鲁飞
|
95d10ea6d3
|
* Fix call api error.
|
2022-11-04 02:51:20 +00:00 |
|
|
Guan Xiying
|
ec23b692df
|
* Extend the loadZen function to be compatible with the codes merged
from ZDOO.
|
2022-10-26 11:19:50 +08:00 |
|
|
Guan Xiying
|
646e61e3db
|
* Revert the loadModel function.
|
2022-10-26 11:07:19 +08:00 |
|
|
Guan Xiying
|
5498c0872b
|
* Cann't call the member variables of a class in the magic method.
|
2022-10-20 11:00:11 +08:00 |
|
|
Guan Xiying
|
86df3868fb
|
* Refactor the magic method to support call static method. Only static
methods of classes declared in a zen file or an ext zen file or a tao
file or an ext tao file can be called.
|
2022-10-20 10:28:35 +08:00 |
|
|
Guan Xiying
|
1cbb4546fd
|
* If the method is callable return its result else trigger error.
|
2022-10-20 10:25:46 +08:00 |
|
|
Guan Xiying
|
eb43521900
|
* Add the loadExtension function to load the extension of zen.
|
2022-10-20 10:18:48 +08:00 |
|
|
Guan Xiying
|
12ad262e1d
|
* Rename the $taoClass to the $zenClass.
|
2022-10-19 16:40:22 +08:00 |
|
|
Guan Xiying
|
f84694aa7c
|
Simplify the codes to load the zen file by the loadModel function.
|
2022-10-19 16:39:54 +08:00 |
|
|
Guan Xiying
|
66d76e5d65
|
* Fix error if the zen file doesn't exist.
|
2022-10-19 10:15:59 +08:00 |
|
|
zhujinyong
|
f507abf379
|
* Init zin.
|
2022-10-19 10:15:30 +08:00 |
|
|
Guan Xiying
|
01ac19f6e5
|
* Fix bug of load zen and tao.
|
2022-10-18 17:19:18 +08:00 |
|
|
Guan Xiying
|
8d961926a4
|
* Adjust the comments.
|
2022-10-18 16:45:52 +08:00 |
|
|
Guan Xiying
|
b9b8b6e584
|
* Add functions to call the methods declared in the zen files and the tao files.
|
2022-10-18 16:32:26 +08:00 |
|
|
Guan Xiying
|
3008099976
|
* Load the zen file and the tao file.
|
2022-10-18 16:31:24 +08:00 |
|
|
Guan Xiying
|
3e953772b9
|
* Refactor codes to extend the export fields and the editor fields by workflow.
|
2022-10-18 16:01:56 +08:00 |
|
|
wangyuting2
|
964e64efe1
|
* Finish task #63892.
|
2022-08-10 14:14:56 +08:00 |
|
|
daitingting
|
e06b64e997
|
* Add fetchModule to distinguish rawModule.
|
2022-07-06 08:42:21 +00:00 |
|
|
tanghucheng
|
72d05c14df
|
* Fix bug #23228.
|
2022-06-09 16:40:16 +08:00 |
|
|
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 |
|