gulnaz 3f04f84c7f Merge branch 'master' into develop ... # Conflicts: # backend/pom.xml # backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java # backend/src/main/java/ervu/dao/okopf/OkopfDaoImpl.java # backend/src/main/java/ervu/service/scheduler/EsnsiOkopfSchedulerServiceImpl.java # backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java # backend/src/main/java/ru/micord/ervu/kafka/model/Data.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # backend/src/main/java/ru/micord/ervu/security/esia/service/UlDataService.java # config.md # config/micord.env # config/standalone/dev/standalone.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2025-01-23 11:20:35 +03:00
..
doc	fix	2024-12-20 21:50:09 +03:00
src	Merge branch 'master' into develop	2025-01-23 11:20:35 +03:00
.npmrc	Project first commit	2024-06-11 10:58:00 +03:00
angular.json	Project first commit	2024-06-11 10:58:00 +03:00
browser_check.js	SUPPORT-8830 fix	2025-01-10 16:42:21 +03:00
home.html	SUPPORT-8830 fix	2025-01-10 16:42:21 +03:00
index.html	change title	2024-10-01 13:44:30 +03:00
index.webpack.html	SUPPORT-8830 fixes	2024-12-27 19:47:47 +03:00
package-lock.json	Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6	2025-01-20 09:58:31 +03:00
package.json	Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6	2025-01-20 09:58:31 +03:00
pom.xml	set version 1.9.7	2025-01-23 10:41:18 +03:00
preview.html	change title	2024-10-01 13:44:30 +03:00
save.ts.metadata.js	Project first commit	2024-06-11 10:58:00 +03:00
systemjs.config.js	SUPPORT-8381: add ng2-file-upload lib	2024-07-15 11:18:11 +03:00
systemjs.preview.config.js	SUPPORT-8381: add ng2-file-upload lib	2024-07-15 11:18:11 +03:00
tsconfig.aot.json	Project first commit	2024-06-11 10:58:00 +03:00
tsconfig.json	Project first commit	2024-06-11 10:58:00 +03:00
webpack.aot.config.js	copy also browser_check.js and fix info.svg error	2025-01-15 16:30:43 +03:00