Commit Graph
565 Commits
Author SHA1 Message Date
tanghucheng 087c4a37b1 * Code for lite story export. 2022-08-14 16:16:40 +08:00
刘刚 d6c7e4e50d Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #22376.

See merge request easycorp/zentaopms!4939
2022-08-12 02:58:15 +00:00
孙广明 77b27f5eb3 Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite

See merge request easycorp/zentaopms!4929
2022-08-12 00:14:12 +00:00
tanghucheng 81f8cdcd6d * Fix bug #26336. 2022-08-11 16:55:30 +08:00
liugang c1f71409f8 * Fix bug #22376. 2022-08-11 16:49:59 +08:00
liuyongkai fe65aba0de * Fix bug of the view of admin in lite 2022-08-11 06:41:57 +00:00
孙广明 fe0f69fc77 Merge branch 'lyk_64217' into 'master'
* Finish task #64217

See merge request easycorp/zentaopms!4844
2022-08-08 08:59:22 +00:00
王怡栋 7f6e2709d2 Merge branch 'master_xieqiyu_26113' into 'master'
* Fix bug#26113.

See merge request easycorp/zentaopms!4831
2022-08-08 08:45:32 +00:00
liuyongkai da82407e9d * Finish task #64217 2022-08-08 08:37:53 +00:00
tanghucheng 3ad6700786 * Fix bug #26111. 2022-08-08 11:59:27 +08:00
xieqiyu 03528bdfc9 * Fix bug#26113. 2022-08-08 10:10:12 +08:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
王怡栋 70d17e226b Merge branch 'sprint/master_zhouxudong_61442' into 'master'
* Finish task #61442.

See merge request easycorp/zentaopms!4611
2022-07-21 02:04:09 +00:00
zhouxudong a49f1b9961 * Finish task #61442. 2022-07-21 01:38:12 +00:00
zhouxudong 106788fa59 * Finish task #61442. 2022-07-20 06:22:59 +00:00
tianshujie 75ecda8852 * Fix bug #25486. 2022-07-20 14:15:52 +08:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
王怡栋 70bd6eaa5e Merge branch 'sprint/master_zhouxudong_25163' into 'master'
* Fix bug #25163 #25166 #25170.

See merge request easycorp/zentaopms!4513
2022-07-13 05:53:10 +00:00
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
liumengyi 37753f8f7e * Finish task #60476. 2022-07-13 13:31:22 +08:00
chaideqing 69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
王怡栋 e3a045ac61 Merge branch 'sprint/master_zhouxudong_59748' into 'master'
Sprint/master zhouxudong 59748

See merge request easycorp/zentaopms!4366
2022-07-06 01:40:46 +00:00
刘刚 7450daec93 Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.

See merge request easycorp/zentaopms!4343
2022-07-05 07:02:00 +00:00
liuruogu 667b4fcd1a * Finish task #59641. 2022-07-05 06:39:10 +00:00
zhouxudong 4a08503448 * Finish task #59748. 2022-07-05 06:22:40 +00:00
zhouxudong 994ca59405 * Finish task #59748. 2022-07-05 02:50:25 +00:00
王怡栋 38bd35f650 Merge branch 'sprint/212_hufangzhou_59538' into 'master'
* Finish task #59538.

See merge request easycorp/zentaopms!4330
2022-07-05 02:10:23 +00:00
hufangzhou 52bbc84bb4 * Finish task #59538. 2022-07-05 10:06:06 +08:00
tanghucheng e0964ba777 * Fix bug #24708. 2022-07-04 16:56:09 +08:00
wangyidong 236243284a * unlink files. 2022-07-04 14:16:52 +08:00
wangyidong c88aa6b8f1 Merge branch 'zentaomax35' 2022-07-04 14:16:06 +08:00
王怡栋 2df50ce39f Merge branch 'fixbug' into 'master'
* Fix bug for workflow.

See merge request easycorp/zentaopms!4305
2022-07-01 05:01:51 +00:00
tanghucheng dbfc1e6dac * Fix bug for workflow. 2022-07-01 12:24:52 +08:00
lanzongjun dd30f6354b * fix bug #24071 2022-07-01 11:28:58 +08:00
lanzongjun 8bc8979c20 * fix bug #24071 2022-07-01 10:59:06 +08:00
zhouxudong 130e376976 * Fix bug. 2022-07-01 02:41:58 +00:00
王怡栋 e8f578dfce Merge branch 'sprint/master_lanzongjun_fixbug' into 'sprint/zentaomax35'
* fix bug #23996

See merge request easycorp/zentaopms!4278
2022-06-30 08:34:44 +00:00
lanzongjun 7caab2be4d * fix bug #23996 2022-06-30 16:11:31 +08:00
王怡栋 04ca0ff10c Merge branch '35_fixbug' into 'sprint/zentaomax35'
* Fix bug #23353.

See merge request easycorp/zentaopms!4275
2022-06-30 07:43:22 +00:00
tanghucheng 69539dbac4 * Fix bug #23353. 2022-06-30 15:40:48 +08:00
王怡栋 d8094cba31 Merge branch 'sprint/workflow' into 'master'
* Add openedApproval config.

See merge request easycorp/zentaopms!4268
2022-06-30 07:06:32 +00:00
wangyuting2 20ef9ee98e * Add openedApproval config. 2022-06-30 14:38:45 +08:00
王怡栋 92ff918d26 Merge branch 'sprint/master_fixbug_202207' into 'master'
* fix bug #23954

See merge request easycorp/zentaopms!4254
2022-06-30 04:04:17 +00:00
lanzongjun b953f00253 * fix bug #23954 2022-06-30 11:28:00 +08:00
lanzongjun a8358b6ba5 * fix bug #23954 2022-06-30 11:27:04 +08:00
王怡栋 33502862c2 Merge branch 'fixbug' into 'master'
* Code for lite html hook.

See merge request easycorp/zentaopms!4250
2022-06-30 03:24:16 +00:00
王怡栋 a0175bb7b6 Merge branch 'sprint/workflow' into 'master'
* Hide open approval for lite workflow.

See merge request easycorp/zentaopms!4252
2022-06-30 03:23:28 +00:00
tanghucheng c896e5ac6f * Code for lite html hook. 2022-06-30 11:22:53 +08:00
wangyuting2 8d43bd7bdc * Hide open approval for lite workflow. 2022-06-30 11:08:16 +08:00