Merge branch 'development' into database_download_middleware
Conflicts: src/libs/middlewares/query.js src/libs/routes/api.js src/libs/routes/spatial.js
Showing
- src/libs/app.js 12 additions, 0 deletionssrc/libs/app.js
- src/libs/convert/contractType.js 14 additions, 0 deletionssrc/libs/convert/contractType.js
- src/libs/db/query_exec.js 7 additions, 1 deletionsrc/libs/db/query_exec.js
- src/libs/middlewares/id2str.js 23 additions, 2 deletionssrc/libs/middlewares/id2str.js
- src/libs/middlewares/multiQuery.js 16 additions, 0 deletionssrc/libs/middlewares/multiQuery.js
- src/libs/middlewares/query.js 4 additions, 3 deletionssrc/libs/middlewares/query.js
- src/libs/middlewares/reqQueryFields.js 118 additions, 102 deletionssrc/libs/middlewares/reqQueryFields.js
- src/libs/models/pqr.js 16 additions, 0 deletionssrc/libs/models/pqr.js
- src/libs/models/simulation.js 8 additions, 102 deletionssrc/libs/models/simulation.js
- src/libs/models/user.js 5 additions, 1 deletionsrc/libs/models/user.js
- src/libs/routes/api.js 9 additions, 3 deletionssrc/libs/routes/api.js
- src/libs/routes/class.js 2 additions, 4 deletionssrc/libs/routes/class.js
- src/libs/routes/classroom.js 2 additions, 4 deletionssrc/libs/routes/classroom.js
- src/libs/routes/distributionFactor.js 190 additions, 0 deletionssrc/libs/routes/distributionFactor.js
- src/libs/routes/enrollment.js 4 additions, 6 deletionssrc/libs/routes/enrollment.js
- src/libs/routes/idhm.js 4 additions, 8 deletionssrc/libs/routes/idhm.js
- src/libs/routes/idhme.js 4 additions, 8 deletionssrc/libs/routes/idhme.js
- src/libs/routes/idhml.js 4 additions, 8 deletionssrc/libs/routes/idhml.js
- src/libs/routes/idhmr.js 4 additions, 8 deletionssrc/libs/routes/idhmr.js
- src/libs/routes/infrastructure.js 542 additions, 0 deletionssrc/libs/routes/infrastructure.js
Loading
Please register or sign in to comment