 liuruogu
|
11d08e8620
|
* Finish task #69103.
|
2022-09-19 01:43:12 +00:00 |
|
|
liuruogu
|
d7f589a54c
|
* Finish task #69017.
|
2022-09-19 00:55:59 +00:00 |
|
|
liuruogu
|
cfc214c776
|
* Finish task #69017.
|
2022-09-16 07:42:20 +00:00 |
|
|
刘刚
|
78dd40f73a
|
Merge branch 'sprint/239_liugang_68997' into 'zentaopms_239'
* Finish task #68997.
See merge request easycorp/zentaopms!5371
|
2022-09-16 03:59:49 +00:00 |
|
|
liugang
|
8248051b39
|
* Finish task #68997.
|
2022-09-16 11:55:52 +08:00 |
|
|
刘刚
|
8e6c073454
|
Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Finish task #69013.
See merge request easycorp/zentaopms!5368
|
2022-09-16 03:49:44 +00:00 |
|
|
liuruogu
|
b8d30bed93
|
* Fix bug for lang.
|
2022-09-16 03:21:31 +00:00 |
|
|
liuruogu
|
f602db8d9d
|
* Finish task #69013.
|
2022-09-16 03:06:31 +00:00 |
|
|
刘刚
|
9823d3abfa
|
Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Light menu.
See merge request easycorp/zentaopms!5367
|
2022-09-16 02:55:58 +00:00 |
|
|
liuruogu
|
8319c90e58
|
* Modify menu of project.
|
2022-09-16 02:52:20 +00:00 |
|
|
liuruogu
|
788741caf8
|
* Light menu.
|
2022-09-16 02:45:28 +00:00 |
|
|
liuruogu
|
34bfa0e423
|
* Light menu.
|
2022-09-16 02:43:34 +00:00 |
|
|
刘刚
|
9818a2e0e0
|
Merge branch 'sprint/239_liugang_fixbug_27489' into 'zentaopms_239'
Sprint/239 liugang fixbug 27489
See merge request easycorp/zentaopms!5362
|
2022-09-16 01:30:03 +00:00 |
|
|
liugang
|
34960baa7f
|
* Fix bug of call undefined object.
|
2022-09-16 09:26:33 +08:00 |
|
|
liugang
|
eac5fa5ba3
|
* Fix bug #27489.
|
2022-09-16 09:25:48 +08:00 |
|
|
刘刚
|
9187aac29e
|
Merge branch 'sprint/239_liuruogu_task#69013' into 'zentaopms_239'
* Finish task #69013.
See merge request easycorp/zentaopms!5360
|
2022-09-16 01:24:19 +00:00 |
|
|
liuruogu
|
fed9a781e9
|
* Use global lang.
|
2022-09-16 01:23:07 +00:00 |
|
|
liuruogu
|
19d3a1948d
|
* Finish task #69013.
|
2022-09-16 01:13:03 +00:00 |
|
|
liuruogu
|
234cf3ff97
|
* Finish task #69013.
|
2022-09-16 01:05:29 +00:00 |
|
|
sunguangming
|
3a7ed76456
|
Merge branch 'sgm_69027' into zentaopms_239
|
2022-09-16 08:53:20 +08:00 |
|
|
刘刚
|
9d835d0ada
|
Merge branch 'sprint/239_liuruogu_task#69013' into 'zentaopms_239'
* Finsih task #69013.
See merge request easycorp/zentaopms!5358
|
2022-09-16 00:46:33 +00:00 |
|
|
孙广明
|
ac994fc477
|
Merge branch 'zentaopms_239' into 'sgm_69027'
# Conflicts:
# db/update17.6.1.sql
|
2022-09-16 00:46:21 +00:00 |
|
|
liuruogu
|
8296ebbb9f
|
* Finsih task #69013.
|
2022-09-15 08:49:10 +00:00 |
|
|
liuruogu
|
17392ef1ac
|
* Finsih task #69013.
|
2022-09-15 08:45:57 +00:00 |
|
|
刘刚
|
688616ada3
|
Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'
* Finish task #69007,69008.
See merge request easycorp/zentaopms!5353
|
2022-09-15 07:31:52 +00:00 |
|
|
tanghucheng
|
c58ef703a4
|
* Finish task #69007.
|
2022-09-15 15:25:25 +08:00 |
|
|
刘刚
|
14abc47b69
|
Merge branch 'sprint/239_liuruogu_task69016' into 'zentaopms_239'
* Finish task #69016.
See merge request easycorp/zentaopms!5352
|
2022-09-15 07:19:36 +00:00 |
|
|
liuruogu
|
39b1e8ae45
|
* Finish task #69016.
|
2022-09-15 07:08:49 +00:00 |
|
|
tanghucheng
|
dcadbc9b34
|
* Finish task #69008.
|
2022-09-15 14:51:38 +08:00 |
|
|
刘刚
|
34d3ca587c
|
Merge branch 'sprint/239_liugang_fixbug_27489' into 'zentaopms_239'
* Fix bug #27489.
See merge request easycorp/zentaopms!5351
|
2022-09-15 06:44:15 +00:00 |
|
|
刘刚
|
e5e73460e1
|
Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'
* Finish task #69009.69010.
See merge request easycorp/zentaopms!5350
|
2022-09-15 06:43:45 +00:00 |
|
|
liugang
|
f76ecb4897
|
* Fix bug #27489.
|
2022-09-15 14:37:25 +08:00 |
|
|
tanghucheng
|
3d05710c9f
|
Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng
|
2022-09-15 14:29:52 +08:00 |
|
|
刘刚
|
b38486c649
|
Merge branch 'sprint/239_liugang_changeNameOfShadowProduct' into 'zentaopms_239'
* Change the rule to create the shadow product's name.
See merge request easycorp/zentaopms!5348
|
2022-09-15 06:24:59 +00:00 |
|
|
tanghucheng
|
9b62747396
|
* Finish task #69009.
|
2022-09-15 14:24:08 +08:00 |
|
|
liugang
|
00857783d7
|
* Change the rule to create the shadow product's name.
|
2022-09-15 13:52:12 +08:00 |
|
|
刘刚
|
f5712fd636
|
Merge branch 'sprint/238_liugang_68994' into 'zentaopms_239'
* Finish task #68994.
See merge request easycorp/zentaopms!5344
|
2022-09-15 05:47:09 +00:00 |
|
|
刘刚
|
99b4fb6e13
|
Merge branch 'sprint/239_liuruogu_task69016' into 'zentaopms_239'
* Finish task #69016.
See merge request easycorp/zentaopms!5343
|
2022-09-15 05:47:01 +00:00 |
|
|
liugang
|
3a6bc7c768
|
* Finish task #68994.
|
2022-09-15 13:44:54 +08:00 |
|
|
liuruogu
|
cc80ff7209
|
* Finish task #69016.
|
2022-09-15 05:14:16 +00:00 |
|
|
刘刚
|
02de591f31
|
Merge branch 'sprint/239_liugang_fixStyle' into 'zentaopms_239'
* Display the products and the plans on the edit page of the project module if...
See merge request easycorp/zentaopms!5342
|
2022-09-15 05:13:01 +00:00 |
|
|
liuruogu
|
04824e964b
|
* Finish task #69016.
|
2022-09-15 05:12:30 +00:00 |
|
|
liugang
|
fefdfe5b49
|
* Adjust the vertical align.
|
2022-09-15 13:07:43 +08:00 |
|
|
liugang
|
93b221c6a6
|
* Display the products and the plans on the edit page of the project module if the project has product.
|
2022-09-15 13:06:23 +08:00 |
|
|
liugang
|
042a9a97c3
|
* Display the project type on the edit page of the project module.
|
2022-09-15 13:05:14 +08:00 |
|
|
刘刚
|
1eb6dd7805
|
Merge branch 'sprint/239_liuruogu_task69016' into 'zentaopms_239'
* Finish task #69016.
See merge request easycorp/zentaopms!5339
|
2022-09-15 02:50:39 +00:00 |
|
|
刘刚
|
a03b09c04e
|
Merge branch 'sprint/239_liuruogu_task69018' into 'zentaopms_239'
* Do task #69018.
See merge request easycorp/zentaopms!5338
|
2022-09-15 02:49:31 +00:00 |
|
|
liuruogu
|
04cd8275fe
|
* Finish task #69016.
|
2022-09-15 02:42:40 +00:00 |
|
|
liuruogu
|
8d46cc5019
|
* Do task #69018.
|
2022-09-15 02:01:00 +00:00 |
|
|
liuruogu
|
ea62645622
|
* Do task #69018.
|
2022-09-15 01:43:27 +00:00 |
|