 chaideqing
|
c75b9ca550
|
Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications
|
2021-12-02 15:46:40 +08:00 |
|
|
chaideqing
|
af6a88cba5
|
* add linkButton on productPlan card
|
2021-12-02 15:46:08 +08:00 |
|
|
Wenrui LI
|
24440ff526
|
* replace link title text with lang items.
|
2021-12-02 15:30:31 +08:00 |
|
|
Wenrui LI
|
fac5fc6b22
|
* remove console.log.
|
2021-12-02 15:22:12 +08:00 |
|
|
hufangzhou
|
4617c4218b
|
* Remove the unused code.
|
2021-12-02 15:14:46 +08:00 |
|
|
Wenrui LI
|
3898d35852
|
* fix unable to click on pager links in cards.
|
2021-12-02 15:00:18 +08:00 |
|
|
chaideqing
|
520639067c
|
Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications
|
2021-12-02 14:56:28 +08:00 |
|
|
chaideqing
|
57b31c8612
|
* modify card style when in xuanxuan notice
|
2021-12-02 14:56:05 +08:00 |
|
|
Tintin
|
f86a3bc6d9
|
* add close methods.
|
2021-12-02 13:39:12 +08:00 |
|
|
Tintin
|
600869034a
|
* remove unused style.
|
2021-12-02 13:23:11 +08:00 |
|
|
Wenrui LI
|
9763cd91df
|
* fix accessing object as array when assembling parent name key.
|
2021-12-02 11:29:41 +08:00 |
|
|
qixinzhi
|
e70a9157d2
|
* fix different screen scale cause element display different,use scroll bar
|
2021-12-02 11:08:41 +08:00 |
|
|
dingyongliang
|
27efa8931d
|
* delay execution of dom operations.
|
2021-12-02 10:13:57 +08:00 |
|
|
Wenrui LI
|
6c6c0aa49e
|
* add card url into notification subcontent.
|
2021-12-02 08:47:25 +08:00 |
|
|
Wenrui LI
|
ad1bd0603c
|
* fix notification title getting overridden by a default one.
|
2021-12-01 17:02:13 +08:00 |
|
|
Wenrui LI
|
3f4c94b3b7
|
* replace object count in title.
|
2021-12-01 16:50:07 +08:00 |
|
|
Wenrui LI
|
11512ead36
|
* actually merge notifications into one.
|
2021-12-01 16:35:09 +08:00 |
|
|
qixinzhi
|
8c7b6d05e1
|
* fix content encode
|
2021-12-01 15:47:30 +08:00 |
|
|
chaideqing
|
a3cbb05edd
|
Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications
|
2021-12-01 15:00:12 +08:00 |
|
|
chaideqing
|
45e127be6e
|
* add linkButton tips in card and card do not show cross scroll
|
2021-12-01 14:59:33 +08:00 |
|
|
Wenrui LI
|
b497a92c8e
|
* stuff notification inner contents together.
|
2021-12-01 14:52:37 +08:00 |
|
|
Wenrui LI
|
2536fdd15e
|
* include parent id in notification content, merge accordingly.
|
2021-12-01 14:28:35 +08:00 |
|
|
qixinzhi
|
92300af32e
|
* for mutiple notifucation condition
|
2021-12-01 11:16:52 +08:00 |
|
|
chaideqing
|
17ba1ea184
|
* add jump-link in xuanxuan_card which can jump to zentao_extension_page
|
2021-12-01 11:10:22 +08:00 |
|
|
chaideqing
|
ffb072e2e8
|
Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44853
|
2021-12-01 11:05:33 +08:00 |
|
|
Wenrui LI
|
64eb33ef49
|
Merge remote-tracking branch 'origin/sprint/168_sunhao/task44627' into sprint/168_xuan_notifications
|
2021-12-01 11:04:34 +08:00 |
|
|
Wenrui LI
|
6647fc9180
|
Merge remote-tracking branch 'origin/sprint/168_dingyongliang_44628' into sprint/168_xuan_notifications
|
2021-12-01 10:59:01 +08:00 |
|
|
chaideqing
|
de1a9ddd9b
|
Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857
|
2021-12-01 10:35:47 +08:00 |
|
|
Wenrui LI
|
a248424ca1
|
* do not wait for document ready to add showapp listener.
|
2021-12-01 10:22:29 +08:00 |
|
|
Lwrless
|
4aad07f95f
|
Merge remote-tracking branch 'origin/sprint/168_chaideqing_44857' into sprint/168_xuan_notifications
|
2021-12-01 10:17:48 +08:00 |
|
|
Lwrless
|
6f6266c448
|
* remove sender from xuan notification content.
|
2021-12-01 09:30:14 +08:00 |
|
|
Lwrless
|
3fe0e12c20
|
* fix notification grouping.
|
2021-11-30 16:57:54 +08:00 |
|
|
Lwrless
|
a5cf00f977
|
* fix message groups array.
|
2021-11-30 16:51:10 +08:00 |
|
|
Lwrless
|
2794215be7
|
* refactor, correct phpdoc.
|
2021-11-30 15:56:01 +08:00 |
|
|
Lwrless
|
6e7d7c55d0
|
* add merge xuan notification logic, task #44851.
|
2021-11-30 15:30:40 +08:00 |
|
|
李玉春
|
2051492640
|
Merge branch 'sprint/175_liumengyi_16924' into 'sprint/168'
* Fix bug #16924.
See merge request easycorp/zentaopms!675
|
2021-11-30 07:08:13 +00:00 |
|
|
liumengyi
|
569cc32446
|
* Fix bug #16924.
|
2021-11-30 14:59:49 +08:00 |
|
|
liumengyi
|
28e208cbcb
|
* Fix bug #16924.
|
2021-11-30 14:53:23 +08:00 |
|
|
Lwrless
|
68c86f76ce
|
Merge remote-tracking branch 'origin/sprint/168_qixinzhi_44856' into sprint/168_liwenrui_merge_notifications.
|
2021-11-30 14:49:42 +08:00 |
|
|
李玉春
|
649a23cbd0
|
Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168'
* Fix bug for task#45146.
See merge request easycorp/zentaopms!668
|
2021-11-30 06:43:55 +00:00 |
|
|
qixinzhi
|
d21f456703
|
* xuanxuan notification rewrite
|
2021-11-30 14:32:34 +08:00 |
|
|
Lwrless
|
87bdc8d75d
|
* extend notification related functions, and add placeholder mergeNotifications function.
|
2021-11-30 14:02:01 +08:00 |
|
|
孙广明
|
801c9ce3d0
|
Merge branch 'sprint/169' into sprint/168
|
2021-11-30 13:47:05 +08:00 |
|
|
liumengyi
|
0ac782bf1f
|
* Fix bug for task#45146.
|
2021-11-30 13:37:39 +08:00 |
|
|
Lwrless
|
adc254b1d0
|
* store xuan notification data inside notification content.
|
2021-11-30 13:18:15 +08:00 |
|
|
李玉春
|
392463cace
|
Merge branch 'sprint/168_sgm_45161' into 'sprint/168'
Sprint/168 sgm 45161
See merge request easycorp/zentaopms!641
|
2021-11-30 05:16:08 +00:00 |
|
|
李玉春
|
2d1e0bb3dc
|
Merge branch 'sprint/168_sgm_45160' into 'sprint/168'
* Finish task #45160.
See merge request easycorp/zentaopms!664
|
2021-11-30 05:15:34 +00:00 |
|
|
孙广明
|
e5a9358acd
|
Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'
Finish task #45106.
See merge request easycorp/zentaopms!649
|
2021-11-30 05:11:52 +00:00 |
|
|
孙广明
|
9e9c024982
|
* Adjust lang.
|
2021-11-30 13:10:51 +08:00 |
|
|
孙广明
|
d58fb3c8e7
|
* Add lang and comment.
|
2021-11-30 13:08:17 +08:00 |
|