Commit Graph
468 Commits
Author SHA1 Message Date
Wenrui LI a702b7cf5b * remove score menus from lite vision, task #51309. 2022-03-21 15:48:51 +08:00
Zongjun Lan 3d05fdb119 * fix task #51306,#51304 2022-03-21 14:50:58 +08:00
王怡栋 01abf2d1c6 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2373
2022-03-18 06:59:17 +00:00
唐胡成 8f7328c7b2 Update lite.php 2022-03-18 06:41:49 +00:00
唐胡成 ec401cf865 Update lite.php 2022-03-18 06:40:32 +00:00
唐胡成 26e52edd7c Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
#   extension/lite/kanban/ext/lang/en/lite.php
#   extension/lite/kanban/ext/lang/zh-cn/lite.php
2022-03-18 06:36:42 +00:00
tanghucheng ad7b6144f9 * Fix bug. 2022-03-18 14:35:02 +08:00
tanghucheng bbec29d361 * Fix bug. 2022-03-18 14:30:34 +08:00
Zongjun Lan 4f658421dc * add en lang 2022-03-18 13:32:22 +08:00
Zongjun Lan 09cedab84e Merge branch 'sprint/master_lanzongjun_fixbug_lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug_lite 2022-03-18 10:51:07 +08:00
Zongjun Lan b3bb1036b9 * fix bug #20922 2022-03-18 10:50:56 +08:00
王怡栋 b7ffb3134b Merge branch 'master' into 'sprint/master_lanzongjun_fixbug_lite'
# Conflicts:
#   extension/lite/install/ext/lang/zh-cn/lite.php
2022-03-18 02:15:23 +00:00
Zongjun Lan 4c8a7a3eae * fix bug #20905 2022-03-18 10:11:22 +08:00
Zongjun Lan 2435d84cdc * fix bug #20905 2022-03-18 10:06:04 +08:00
王怡栋 897ae6e1b2 Merge branch 'sprint/master_lanzongjun_fixbug_nopermission' into 'master'
* fix bug no permisssion

See merge request easycorp/zentaopms!2347
2022-03-18 01:51:46 +00:00
王怡栋 7216dbd7c9 Merge branch 'sprint/master_tanghucheng_install' into 'master'
* Adjust for lite install.

See merge request easycorp/zentaopms!2354
2022-03-18 01:51:05 +00:00
王怡栋 7638020fad Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-18 09:49:48 +08:00
王怡栋 b3cca161cc * adjust for install page in lite. 2022-03-18 09:49:05 +08:00
tanghucheng ab74b5b58d * Fix bug#20897. 2022-03-18 09:43:20 +08:00
Zongjun Lan 9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08:00
孙广明 19d86da89f Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20712,20800.

See merge request easycorp/zentaopms!2313
2022-03-18 01:21:20 +00:00
tanghucheng 99a61f79ee * Adjust for lite install. 2022-03-18 09:00:32 +08:00
Zongjun Lan 3fefbe3699 * fix bug no permisssion 2022-03-17 17:32:55 +08:00
Zongjun Lan 15cb78764d * fix bug no permisssion 2022-03-17 17:18:00 +08:00
Zongjun Lan 59840351e3 * fix bug no permisssion 2022-03-17 17:17:22 +08:00
Zongjun Lan ff2d0cc99f * fix bug no permisssion 2022-03-17 16:44:22 +08:00
tanghucheng bc67d443e2 * Fix bug #20712,20800. 2022-03-16 16:21:12 +08:00
王怡栋 22406348f6 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20787

See merge request easycorp/zentaopms!2306
2022-03-16 07:14:08 +00:00
Zongjun Lan 3b66cf35f2 * fix bug #20787 2022-03-16 14:37:42 +08:00
王怡栋 092c020b32 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20692

See merge request easycorp/zentaopms!2272
2022-03-15 08:42:55 +00:00
孙广明 69c22ecbf3 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20779,20782,20783.

See merge request easycorp/zentaopms!2275
2022-03-15 08:34:33 +00:00
tanghucheng 88230cd949 * Fix bug #20779,20782,20783. 2022-03-15 15:49:25 +08:00
Zongjun Lan 114416d345 * fix bug #20692 2022-03-15 15:36:07 +08:00
王怡栋 2acf7fd44e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20760,#20761,#20762,#20763

See merge request easycorp/zentaopms!2267
2022-03-15 07:24:22 +00:00
hufangzhou 0ead3997b7 * Fix bug #20735. 2022-03-15 14:31:43 +08:00
Zongjun Lan 3a090c6034 * fix bug #20760,#20761,#20762,#20763 2022-03-15 13:55:46 +08:00
王怡栋 2ae8b25fa9 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20754,20776,20759.

See merge request easycorp/zentaopms!2262
2022-03-15 03:27:08 +00:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
王怡栋 6e9d75f2bd Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20741,20737,20734,20733.

See merge request easycorp/zentaopms!2254
2022-03-15 01:11:38 +00:00
tanghucheng 75ab5773c4 * Fix bug #20741,20737,20734,20733. 2022-03-15 09:08:14 +08:00
王怡栋 c5d1d463a8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20703,#19430

See merge request easycorp/zentaopms!2235
2022-03-15 00:58:13 +00:00
Zongjun Lan e9806c290e * fix bug #19430 2022-03-14 16:42:46 +08:00
孙广明 2e83840675 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #19820,20528.

See merge request easycorp/zentaopms!2233
2022-03-14 08:03:51 +00:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
tanghucheng d32f3d2664 * Fix bug #19820,20528. 2022-03-14 14:51:03 +08:00
孙广明 87458bc808 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.

See merge request easycorp/zentaopms!2223
2022-03-14 02:13:14 +00:00
tanghucheng a25fd822bd * Fix bug #20702,20698,20642. 2022-03-14 09:55:44 +08:00
孙广明 04493aa3af Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for feedback.

See merge request easycorp/zentaopms!2219
2022-03-14 00:33:41 +00:00
tanghucheng f90bdb2a0c * Fix bug for feedback. 2022-03-14 08:32:03 +08:00
Zongjun Lan af893de5d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-03-11 15:06:54 +08:00