Merge pull request #3270 from crazyserver/MOBILE-3881

MOBILE-3881 timeline: Concatenate loaded more events

Author: dpalou

src/addons/block/timeline/components/events/events.ts

@@ -76,6 +76,7 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
                         events: eventsByDay[dayTimestamp],
                     };
                 });
+                this.loadingMore = false;
             } else {
                 this.empty = true;
             }

src/addons/block/timeline/components/timeline/timeline.ts

@@ -164,7 +164,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     protected async fetchMyOverviewTimeline(afterEventId?: number): Promise<void> {
         const events = await AddonBlockTimeline.getActionEventsByTimesort(afterEventId, this.searchText);
 
-        this.timeline.events = events.events;
+        this.timeline.events = afterEventId ? this.timeline.events.concat(events.events) : events.events;
         this.timeline.canLoadMore = events.canLoadMore;
     }