 朱金勇
|
b90e78d4c9
|
Merge branch 'sprint/165_liyuchun_42859' into 'sprint/165'
* Finish task #42859，modify the syntax of Notification.
See merge request easycorp/zentaopms!47
|
2021-10-10 12:08:18 +00:00 |
|
|
liyuchun
|
5945717a55
|
* Fix bug #42859.
|
2021-10-09 15:22:57 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
朱金勇
|
ff09127219
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.
See merge request easycorp/zentaopms!41
|
2021-10-09 01:32:30 +00:00 |
|
|
王怡栋
|
0fa52d3318
|
* adjust for review code.
|
2021-10-09 09:29:10 +08:00 |
|
|
朱金勇
|
85fb57086c
|
Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165'
*Finish task #42867
See merge request easycorp/zentaopms!43
|
2021-10-09 01:21:22 +00:00 |
|
|
朱金勇
|
4e0207d7e4
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang
See merge request easycorp/zentaopms!40
|
2021-10-09 01:10:05 +00:00 |
|
|
tianshujie
|
07bbef9251
|
* Modify language item.
|
2021-10-08 13:58:22 +08:00 |
|
|
tianshujie
|
33ec8312e3
|
* Finish task #42867.
|
2021-10-08 13:50:25 +08:00 |
|
|
王怡栋
|
88a5c5d207
|
* fix loophole.
|
2021-10-08 10:35:38 +08:00 |
|
|
zenggang
|
77a9b33191
|
* Adjust code style
|
2021-10-08 02:27:50 +00:00 |
|
|
zenggang
|
189bc062b3
|
* Fix bug#15363
|
2021-09-30 16:17:48 +08:00 |
|
|
王怡栋
|
a14fc4e7f9
|
* finish task #42848.
|
2021-09-30 15:49:24 +08:00 |
|
|
zenggang
|
cc28a1a037
|
* Fix bug#14382
|
2021-09-30 14:53:36 +08:00 |
|
|
zenggang
|
f139f00e61
|
* Task 42862,previously committed to the master branch, now resubmit to the 165 branch
|
2021-09-30 11:19:05 +08:00 |
|
|
王怡栋
|
5ab6b223ba
|
* fix loophole.
|
2021-09-30 11:03:06 +08:00 |
|
|
孙浩
|
73d16a8128
|
Merge branch 'sprint/165_sunhao/theme_blue' into 'sprint/165'
Update theme blue and improve style of table list in product/all.
See merge request easycorp/zentaopms!30
|
2021-09-29 05:23:46 +00:00 |
|
|
孙浩
|
77e4283f2c
|
Merge branch 'sprint/165_sunhao/bug14748' into 'sprint/165'
Bug #14748, task #42858, fix the submit button was still clickable after the form submitted to server.
See merge request easycorp/zentaopms!25
|
2021-09-29 05:23:21 +00:00 |
|
|
王怡栋
|
ee39f52c2e
|
* finish task #42846.
|
2021-09-29 11:51:17 +08:00 |
|
|
zenggang
|
3efa133827
|
* Fix bug#15278
|
2021-09-29 10:59:27 +08:00 |
|
|
zenggang
|
5d37062ad6
|
* Fix bug#15359
|
2021-09-29 10:46:07 +08:00 |
|
|
Guan Xiying
|
610ab20e9e
|
* Add public keywords to define helper::cd function.
|
2021-09-28 16:28:38 +08:00 |
|
|
朱金勇
|
8ef308be2f
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368
See merge request easycorp/zentaopms!35
|
2021-09-28 08:11:15 +00:00 |
|
|
zenggang
|
d4ddac562d
|
* Add code annotation
|
2021-09-28 15:56:43 +08:00 |
|
|
朱金勇
|
d31182c9f0
|
Merge branch 'sprint/165_sunguangming' into 'sprint/165'
* Fix bug #15335.
See merge request easycorp/zentaopms!33
|
2021-09-28 07:49:28 +00:00 |
|
|
朱金勇
|
79a020c0f5
|
Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.
See merge request easycorp/zentaopms!36
|
2021-09-28 07:46:19 +00:00 |
|
|
朱金勇
|
98f93d563d
|
Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165'
* Finish task #42867.
See merge request easycorp/zentaopms!28
|
2021-09-28 07:42:48 +00:00 |
|
|
tianshujie
|
353bef2e83
|
* Finish task #42867.
|
2021-09-28 15:38:34 +08:00 |
|
|
朱金勇
|
aa86fdea50
|
Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.
See merge request easycorp/zentaopms!38
|
2021-09-28 07:37:30 +00:00 |
|
|
朱金勇
|
fa879ae303
|
Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.
See merge request easycorp/zentaopms!39
|
2021-09-28 07:35:23 +00:00 |
|
|
朱金勇
|
1173e8b65d
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong
See merge request easycorp/zentaopms!37
|
2021-09-28 07:31:10 +00:00 |
|
|
tianshujie
|
4f977efaeb
|
* Finish task #42854.
|
2021-09-28 13:14:32 +08:00 |
|
|
liyuchun
|
9b5a28392b
|
* Finish task #42854.
|
2021-09-28 12:31:59 +08:00 |
|
|
zenggang
|
57b48dd406
|
* Code for bug#15365
|
2021-09-28 11:20:05 +08:00 |
|
|
王怡栋
|
08f1d594c0
|
* adjust for task #42835.
|
2021-09-28 09:24:33 +08:00 |
|
|
dingna
|
5b5ae6dfdd
|
* Finish task #42827.
|
2021-09-27 16:21:26 +08:00 |
|
|
王怡栋
|
1c7301c929
|
* Save session with tab for project.
|
2021-09-27 16:04:03 +08:00 |
|
|
王怡栋
|
47c0876b9d
|
* fix bug #15389.
|
2021-09-27 16:03:40 +08:00 |
|
|
zenggang
|
336a4e5951
|
* Fix bug#15368
|
2021-09-27 15:32:22 +08:00 |
|
|
朱金勇
|
1bf1ac1156
|
Merge branch 'sprint/165_test' into 'sprint/165'
* Copy common folder to tmp.
See merge request easycorp/zentaopms!34
|
2021-09-27 07:30:03 +00:00 |
|
|
zhujinyong
|
1cf925a37c
|
* Copy common folder to tmp.
|
2021-09-27 15:27:29 +08:00 |
|
|
tianshujie
|
c5e340855d
|
* Finish task #42867.
|
2021-09-27 15:12:59 +08:00 |
|
|
王怡栋
|
f30eb20fbd
|
* code for task #42835.
|
2021-09-27 14:50:09 +08:00 |
|
|
朱金勇
|
978cfdbdc8
|
Merge branch 'sprint/165_test' into 'sprint/165'
* Init test framework
See merge request easycorp/zentaopms!32
|
2021-09-27 06:47:51 +00:00 |
|
|
孙广明
|
eada128988
|
* Fix bug #15335.
|
2021-09-27 14:32:33 +08:00 |
|
|
Hao Sun
|
0f2c519651
|
* Update theme blue and improve style of table list in product/all.
|
2021-09-27 14:29:45 +08:00 |
|
|
zhujinyong
|
f1151c37c7
|
* Adjust code for test demo.
|
2021-09-27 14:05:51 +08:00 |
|
|
tianshujie
|
5e0068701e
|
* Finish task #42867.
|
2021-09-27 13:55:09 +08:00 |
|
|
zhujinyong
|
e059381d7d
|
* Supply multiple config files.
|
2021-09-27 02:52:35 +08:00 |
|
|
朱金勇
|
452d4d8605
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang
See merge request easycorp/zentaopms!27
|
2021-09-26 09:47:55 +00:00 |
|