 tianshujie
|
eedcc1aed5
|
* Modify code logic.
|
2021-11-09 10:28:16 +08:00 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
|
王怡栋
|
bda2e7576b
|
Merge branch 'sprint/170_xieqiyu_43919' into 'sprint/170'
Finish task#43919.
See merge request easycorp/zentaopms!324
|
2021-11-05 07:48:03 +00:00 |
|
|
xieqiyu
|
f7d99dd38c
|
* Add lang item.
|
2021-11-05 15:37:08 +08:00 |
|
|
hufangzhou
|
925094f331
|
Merge branch 'sprint/170_xieqiyu_43919' into sprint/170
|
2021-11-05 14:59:16 +08:00 |
|
|
胡方舟
|
21cd984c78
|
Merge branch 'sprint/170' into 'sprint/170_xieqiyu_43919'
# Conflicts:
# db/zentao.sql
|
2021-11-05 06:56:47 +00:00 |
|
|
xieqiyu
|
7992f18ea3
|
* Code for task#43919. Modify review questions.
|
2021-11-05 14:50:15 +08:00 |
|
|
xieqiyu
|
8b7616a626
|
* Code for task#43919. Add lang and main default.
|
2021-11-05 13:48:09 +08:00 |
|
|
孙广明
|
5812a1e510
|
Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task #43903
See merge request easycorp/zentaopms!319
|
2021-11-05 03:22:17 +00:00 |
|
|
孙广明
|
dbf4a5cff6
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!320
|
2021-11-05 03:20:38 +00:00 |
|
|
tianshujie
|
0fa14065b2
|
* Modify the constant name of the branch trunk.
|
2021-11-05 11:20:22 +08:00 |
|
|
mayue
|
1fbae29f29
|
* Fix bug #15688.
|
2021-11-05 10:53:36 +08:00 |
|
|
tianshujie
|
fcfa4a9064
|
* Add all options in the branch drop-down.
|
2021-11-05 09:25:47 +08:00 |
|
|
tianshujie
|
1ae57e792b
|
* Modify language item of branch lang file.
|
2021-11-05 09:22:36 +08:00 |
|
|
tianshujie
|
0e3d64843e
|
* Restore code.
|
2021-11-05 09:08:25 +08:00 |
|
|
tianshujie
|
6cb70ab01d
|
* Finish task #43903.
|
2021-11-05 08:59:55 +08:00 |
|
|
孙广明
|
7377b40c00
|
Merge branch 'sprint/170_mayue_15690' into 'sprint/170'
* Fix bug #15690.
See merge request easycorp/zentaopms!316
|
2021-11-05 00:58:50 +00:00 |
|
|
mayue
|
2ee7793126
|
* Fix bug #15690.
|
2021-11-05 08:55:33 +08:00 |
|
|
xieqiyu
|
d74ce66445
|
* Code for task#43919.
|
2021-11-05 08:45:34 +08:00 |
|
|
李玉春
|
9285f2424f
|
Merge branch 'sprint/170_zhouxin_43876' into 'sprint/170'
Finish task #43876.
See merge request easycorp/zentaopms!315
|
2021-11-04 09:42:56 +00:00 |
|
|
李玉春
|
d7ac642f3d
|
Merge branch 'sprint/170_songchenxuan_43917' into 'sprint/170'
* Finish task 43917
See merge request easycorp/zentaopms!314
|
2021-11-04 09:42:14 +00:00 |
|
|
李玉春
|
8c28cf76e9
|
Merge branch 'sprint/170_dingna_task_43913' into 'sprint/170'
* Adjust code for task#43913.
See merge request easycorp/zentaopms!317
|
2021-11-04 09:40:50 +00:00 |
|
|
root
|
d6361de047
|
* Finish task 43917
|
2021-11-04 17:38:34 +08:00 |
|
|
dingna
|
708957c6b2
|
* Adjust code for task#43913.
|
2021-11-04 17:37:26 +08:00 |
|
|
mayue
|
150a1395e1
|
* Fix bug #15690.
|
2021-11-04 17:30:11 +08:00 |
|
|
root
|
24c8e0948d
|
* Finish task 43917
|
2021-11-04 17:24:52 +08:00 |
|
|
zhouxin
|
23b7e471d2
|
Finish task $43876.
|
2021-11-04 17:16:16 +08:00 |
|
|
李玉春
|
f14b5910fe
|
Merge branch 'sprint/170_dingna_task_43913' into 'sprint/170'
* Finish task#43913.
See merge request easycorp/zentaopms!307
|
2021-11-04 08:29:24 +00:00 |
|
|
dingna
|
ccabbde1e0
|
* Adjust code for task#43913.
|
2021-11-04 16:21:59 +08:00 |
|
|
dingna
|
4f30e04c95
|
* Adjust code for task#43913.
|
2021-11-04 16:18:02 +08:00 |
|
|
dingna
|
966abc3d55
|
* Adjust code for task#43913.
|
2021-11-04 16:06:08 +08:00 |
|
|
tianshujie
|
e893c7f6c3
|
* Add upgrade sql.
|
2021-11-04 15:42:39 +08:00 |
|
|
王怡栋
|
7f9a50407a
|
Merge branch 'sprint/170_sunhao/fix_task41233' into 'sprint/170'
* Task #41233, fix open in new tab on pressed ctrl key not work as expected and improve perf.
See merge request easycorp/zentaopms!287
|
2021-11-04 07:22:55 +00:00 |
|
|
王怡栋
|
f0c33b07e4
|
Merge branch 'sprint/170_liugang/fix_fullscreen_bug' into 'sprint/170'
* Fix that can't toggle fullscreen mode in IE11.
See merge request easycorp/zentaopms!303
|
2021-11-04 07:21:45 +00:00 |
|
|
dingna
|
421cb2dfa8
|
* Adjust code for task#43913.
|
2021-11-04 14:48:51 +08:00 |
|
|
dingna
|
0afeb5620a
|
* Adjust code for task#43913.
|
2021-11-04 14:45:40 +08:00 |
|
|
李玉春
|
b4905cdf02
|
Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170'
* Modify variable error.
See merge request easycorp/zentaopms!311
|
2021-11-04 06:32:57 +00:00 |
|
|
tianshujie
|
50ad0453f6
|
* Modify variable error.
|
2021-11-04 14:25:33 +08:00 |
|
|
孙广明
|
6f5e1b75f7
|
Merge branch 'sprint/170_zhouxin_43877' into 'sprint/170'
Sprint/170 zhouxin 43877
See merge request easycorp/zentaopms!308
|
2021-11-04 06:23:51 +00:00 |
|
|
李玉春
|
9d359fa387
|
Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Add the last plan lang item.
See merge request easycorp/zentaopms!309
|
2021-11-04 05:44:25 +00:00 |
|
|
hufangzhou
|
d8baf1d3fa
|
* Add the last plan lang item.
|
2021-11-04 13:42:51 +08:00 |
|
|
zhouxin
|
8fe8ad90af
|
Finish task 43877.
|
2021-11-04 13:22:09 +08:00 |
|
|
dingna
|
638903f5c4
|
* Finish task#43913.
|
2021-11-04 13:21:43 +08:00 |
|
|
孙广明
|
4f5e19fc66
|
Merge branch 'sprint/170_zhengrunyu_43915' into 'sprint/170'
*Finish task #43915.
See merge request easycorp/zentaopms!297
|
2021-11-04 05:14:47 +00:00 |
|
|
zhengrunyu
|
64d4d04c7e
|
*Finish task #43915.
|
2021-11-04 13:13:10 +08:00 |
|
|
zhouxin
|
c3558d6b75
|
Finish task #43877.
|
2021-11-04 13:12:17 +08:00 |
|
|
zhengrunyu
|
01a7ed9151
|
*Finish task #43915.
|
2021-11-04 13:09:02 +08:00 |
|
|
zhengrunyu
|
5b47d67d93
|
*Finish task #43915.
|
2021-11-04 13:05:19 +08:00 |
|
|
李玉春
|
b60cdf29e2
|
Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Finish task #43899.
See merge request easycorp/zentaopms!305
|
2021-11-04 05:04:03 +00:00 |
|
|
hufangzhou
|
af5b6ff489
|
* Finish task #43899.
|
2021-11-04 11:48:22 +08:00 |
|