fix conflicts merge linting
No related branches found
No related tags found
Showing
- .eslintrc.js 55 additions, 10 deletions.eslintrc.js
- Dockerfile 1 addition, 1 deletionDockerfile
- README.md 5 additions, 0 deletionsREADME.md
- babel.config.js 1 addition, 1 deletionbabel.config.js
- package-lock.json 3332 additions, 2369 deletionspackage-lock.json
- package.json 9 additions, 9 deletionspackage.json
- src/App.vue 124 additions, 84 deletionssrc/App.vue
- src/assets/js/formset_handlers.js 0 additions, 49 deletionssrc/assets/js/formset_handlers.js
- src/assets/js/map-util.js 34 additions, 38 deletionssrc/assets/js/map-util.js
- src/assets/js/utils.js 8 additions, 8 deletionssrc/assets/js/utils.js
- src/assets/js/vector_tile_fix.js 198 additions, 199 deletionssrc/assets/js/vector_tile_fix.js
- src/assets/resources/semantic-ui-2.4.2/semantic.min.css 0 additions, 5 deletionssrc/assets/resources/semantic-ui-2.4.2/semantic.min.css
- src/assets/styles/base.css 9 additions, 0 deletionssrc/assets/styles/base.css
- src/axios-client.js 8 additions, 8 deletionssrc/axios-client.js
- src/components/Dropdown.vue 64 additions, 42 deletionssrc/components/Dropdown.vue
- src/components/ImportTask.vue 44 additions, 28 deletionssrc/components/ImportTask.vue
- src/components/Pagination.vue 19 additions, 13 deletionssrc/components/Pagination.vue
- src/components/Projects/DropdownMenuItem.vue 49 additions, 49 deletionssrc/components/Projects/DropdownMenuItem.vue
- src/components/Projects/ProjectsMenu.vue 200 additions, 132 deletionssrc/components/Projects/ProjectsMenu.vue
- src/components/Projects/SearchProjects.vue 6 additions, 6 deletionssrc/components/Projects/SearchProjects.vue
Loading
Please register or sign in to comment