Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 7 insertions, 4 deletions

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 3387de8c..4612e3a7 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -6,8 +6,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { MatSliderModule } from '@angular/material/slider';
 import { MatIconModule } from '@angular/material/icon';
 
-import {NgChartsModule} from 'ng2-charts';
-
+import { NgChartsModule } from 'ng2-charts';
+import { Ng2SearchPipeModule } from 'ng2-search-filter';
 import { AppComponent } from './app.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component';
@@ -35,6 +35,7 @@ import { ScatterchartComponent } from './scatterchart/scatterchart.component';
 import { BarchartComponent } from './barchart/barchart.component';
 import { NotificationsComponent } from './_elements/notifications/notifications.component';
 import { DatatableComponent } from './_elements/datatable/datatable.component';
+import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component';
 
 @NgModule({
   declarations: [
@@ -59,7 +60,8 @@ import { DatatableComponent } from './_elements/datatable/datatable.component';
     ScatterchartComponent,
     BarchartComponent,
     NotificationsComponent,
-    DatatableComponent
+    DatatableComponent,
+    FilterDatasetsComponent
   ],
   imports: [
     BrowserModule,
@@ -72,7 +74,8 @@ import { DatatableComponent } from './_elements/datatable/datatable.component';
     ReactiveFormsModule,
     MatSliderModule,
     MatIconModule,
-    NgChartsModule
+    NgChartsModule,
+    Ng2SearchPipeModule
   ],
   providers: [],
   bootstrap: [AppComponent]