 chaideqing
|
e50dbc5be3
|
* code review
|
2022-10-18 09:39:39 +08:00 |
|
|
李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
|
李玉春
|
90b695432b
|
Merge branch 'sprint/247_tianshujie_72323' into 'master'
* Finish task #72323.
See merge request easycorp/zentaopms!5767
|
2022-10-17 09:23:58 +00:00 |
|
|
tianshujie
|
bc72a89801
|
* Finish task #72374.
|
2022-10-17 16:59:43 +08:00 |
|
|
tianshujie
|
e05f1e7f89
|
* Finish task #72374.
|
2022-10-17 16:58:30 +08:00 |
|
|
tianshujie
|
016125ea7c
|
* Finish task #72324.
|
2022-10-17 16:55:39 +08:00 |
|
|
tianshujie
|
4245745bec
|
* Finish task #72351.
|
2022-10-17 16:31:40 +08:00 |
|
|
tianshujie
|
f4fdd2c320
|
* Finish task #72323.
|
2022-10-17 16:19:42 +08:00 |
|
|
tianshujie
|
f9b2fd0aff
|
* Fix bug #28531.
|
2022-10-17 15:46:56 +08:00 |
|
|
王怡栋
|
79b98536c1
|
Merge branch 'bug_28542' into 'master'
* Fix bug#28542
See merge request easycorp/zentaopms!5758
|
2022-10-17 06:52:40 +00:00 |
|
|
tianshujie
|
bafc9a6020
|
* Fix bug #28528.
|
2022-10-17 13:54:11 +08:00 |
|
|
zenggang
|
3237e4e752
|
* Fix bug#28542
|
2022-10-17 05:22:40 +00:00 |
|
|
王怡栋
|
4a3c7b3587
|
Merge branch 'sprint/rce' into 'master'
* fix function can rce
See merge request easycorp/zentaopms!5756
|
2022-10-17 05:21:49 +00:00 |
|
|
柴德庆
|
ea7eea68d8
|
* refactor
|
2022-10-17 05:20:01 +00:00 |
|
|
王怡栋
|
384e836f7e
|
Merge branch 'master_28532' into 'master'
*Fix bug #28532.
See merge request easycorp/zentaopms!5754
|
2022-10-17 05:17:46 +00:00 |
|
|
王怡栋
|
83f79a4874
|
Merge branch 'sprint/cdq_refactor' into 'master'
* refactor ->loadModel('bug')->lang to ->app->loadLang('bug')
See merge request easycorp/zentaopms!5751
|
2022-10-17 05:17:05 +00:00 |
|
|
tianshujie
|
80b66aea5c
|
* Fix bug #28490.
|
2022-10-17 11:12:48 +08:00 |
|
|
tianshujie
|
a16db808d2
|
* Fix bug #28488.
|
2022-10-17 10:56:26 +08:00 |
|
|
chaideqing
|
f01a04b242
|
* fix function can rce
|
2022-10-17 10:28:26 +08:00 |
|
|
liuhong
|
0e77b9f5e9
|
*Fix bug #28532.
|
2022-10-17 01:10:49 +00:00 |
|
|
李玉春
|
ce56365e07
|
Merge branch 'sprint/wangzemei/fix28395' into 'master'
* Fix the problem that the button is not shown
See merge request easycorp/zentaopms!5753
|
2022-10-16 23:56:27 +00:00 |
|
|
wangzemei
|
478bbcc87c
|
* Fix bug #28447
|
2022-10-14 17:21:37 +08:00 |
|
|
wangzemei
|
6aad1dacac
|
* Fix the problem that the button is not shown
|
2022-10-14 14:57:17 +08:00 |
|
|
曹延义
|
1e6ad814be
|
Merge branch 'master' into cyy_optimize
|
2022-10-14 13:25:38 +08:00 |
|
|
王怡栋
|
22a5c56590
|
Merge branch 'bug_28514' into 'master'
* Fix bug#28514
See merge request easycorp/zentaopms!5748
|
2022-10-14 04:18:07 +00:00 |
|
|
王怡栋
|
af516229bb
|
Merge branch 'bug_28518' into 'master'
* Fix bug#28518
See merge request easycorp/zentaopms!5749
|
2022-10-14 04:17:35 +00:00 |
|
|
曹延义
|
1929b943c2
|
* Code for story #38730.
|
2022-10-14 09:58:09 +08:00 |
|
|
chaideqing
|
361040cc94
|
* refactor ->loadModel('bug')->lang to ->app->loadLang('bug')
|
2022-10-14 09:19:28 +08:00 |
|
|
王怡栋
|
900f1f42dc
|
Merge branch 'feedback_1077' into 'master'
* Code for feedback #1077
See merge request easycorp/zentaopms!5743
|
2022-10-14 00:41:43 +00:00 |
|
|
王怡栋
|
edf6de9fe9
|
Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499
See merge request easycorp/zentaopms!5741
|
2022-10-14 00:39:49 +00:00 |
|
|
王怡栋
|
72fb595f02
|
Merge branch 'story_37168' into 'master'
* Finish story#37168.
See merge request easycorp/zentaopms!5738
|
2022-10-14 00:17:47 +00:00 |
|
|
王怡栋
|
92b2e2c022
|
Merge branch 'sprint/feedback_1066' into 'master'
Sprint/feedback 1066
See merge request easycorp/zentaopms!5740
|
2022-10-14 00:16:16 +00:00 |
|
|
zenggang
|
c7086c8d77
|
* Fix bug#28518
|
2022-10-13 07:50:54 +00:00 |
|
|
zenggang
|
fa7624efbd
|
* Fix bug#28514
|
2022-10-13 07:44:06 +00:00 |
|
|
朱金勇
|
2721b934bf
|
Merge branch 'sprint/fix-92' into 'master'
* Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null.
See merge request easycorp/zentaopms!5745
|
2022-10-13 04:13:42 +00:00 |
|
|
李玉春
|
beeba2ec80
|
Merge branch 'cyy_bug' into 'master'
* Modify product plan js error.
See merge request easycorp/zentaopms!5744
|
2022-10-13 03:09:56 +00:00 |
|
|
李玉春
|
81ca878b03
|
Merge branch 'sprint/244_tianshujie_70498' into 'master'
Sprint/244 tianshujie 70498
See merge request easycorp/zentaopms!5730
|
2022-10-13 03:09:37 +00:00 |
|
|
Lufei
|
261c3a0217
|
* Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null.
|
2022-10-13 10:36:39 +08:00 |
|
|
曹延义
|
c6f8e04711
|
* Modify product plan js error.
|
2022-10-13 09:02:30 +08:00 |
|
|
李玉春
|
8624143bcc
|
Merge branch 'cyy_app' into 'master'
* Add user info data return.
See merge request easycorp/zentaopms!5737
|
2022-10-13 00:58:13 +00:00 |
|
|
李玉春
|
3de060e49b
|
Merge branch 'sprint/gfl_28333' into 'master'
Sprint/gfl 28333
See merge request easycorp/zentaopms!5732
|
2022-10-13 00:56:21 +00:00 |
|
|
李玉春
|
1b90b9c82c
|
Merge branch 'sprint/247_wzm_important' into 'master'
* fix bug 28395 && change important theme color
See merge request easycorp/zentaopms!5731
|
2022-10-13 00:53:30 +00:00 |
|
|
zenggang
|
fa83b54f4d
|
* Code for feedback #1077
|
2022-10-12 08:56:08 +00:00 |
|
|
曹延义
|
4312630747
|
* Fix bug #28132.
|
2022-10-12 16:27:01 +08:00 |
|
|
guofeilong
|
c46cf29a2c
|
* fix bug * 28499
|
2022-10-12 07:52:09 +00:00 |
|
|
曹延义
|
4a1cb6551b
|
* Fix bug #28
52.#
|
2022-10-12 15:45:02 +08:00 |
|
|
曹延义
|
95cb77cbd5
|
* Modify line width.
|
2022-10-12 15:39:54 +08:00 |
|
|
曹延义
|
a64f141e7b
|
* Modify story page style.
|
2022-10-12 15:36:05 +08:00 |
|
|
chaideqing
|
7dd705342c
|
* fix No bug-lang in open source version
|
2022-10-12 15:34:48 +08:00 |
|
|
曹延义
|
704de9685b
|
* Modify stage list data.
|
2022-10-12 13:16:40 +08:00 |
|