fix bug: fix timeline frontend bug
Merge branch 'development'