mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-21 19:37:28 +00:00
Merge branch '10.0'
This commit is contained in:
@@ -78,7 +78,7 @@ class Notification extends React.Component {
|
||||
return (<NoticeItem key={item.id} noticeItem={item} onNoticeItemClick={this.onNoticeItemClick}/>);
|
||||
})}
|
||||
</ul>
|
||||
<a href={siteRoot + 'notification/list/'} className="view-all">{gettext('See All Notifications')}</a>
|
||||
<a href={siteRoot + 'notice/list/'} className="view-all">{gettext('See All Notifications')}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@@ -671,7 +671,7 @@ urlpatterns = [
|
||||
re_path(r'^api/v2.1/admin/invitations/(?P<token>[a-f0-9]{32})/$', AdminInvitation.as_view(), name='api-v2.1-admin-invitation'),
|
||||
|
||||
path('avatar/', include('seahub.avatar.urls')),
|
||||
path('notification/', include('seahub.notifications.urls')),
|
||||
path('notice/', include('seahub.notifications.urls')),
|
||||
path('contacts/', include('seahub.contacts.urls')),
|
||||
path('group/', include('seahub.group.urls')),
|
||||
path('options/', include('seahub.options.urls')),
|
||||
|
Reference in New Issue
Block a user