Commit Graph

121 Commits

Author SHA1 Message Date
f51351f291 Set resources in one file 2026-04-05 14:29:24 +05:00
6ea173b423 New style 2026-04-04 20:45:17 +05:00
410ad1139a gitignore 2026-04-04 20:30:19 +05:00
957e06833f Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:49:41 +05:00
bfef557d60 Версия 2026-04-04 14:49:30 +05:00
2c355d1898 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:26:12 +05:00
d1b23716c3 settings 2026-04-04 14:25:53 +05:00
0c816b4870 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop
# Conflicts:
#	.idea/caches/deviceStreaming.xml
2026-04-04 14:17:38 +05:00
0b9a3c318b Версия другая 2026-04-04 14:15:26 +05:00
00e1d2293e файлы проекта 2026-04-04 10:08:29 +05:00
aef576f893 Activity display style edits 2025-09-05 12:03:27 +05:00
5dfe30948b Merge pull request 'In the field "Type of assessed biological impact" allows multiple selection' (#7) from master into develop
Reviewed-on: #7
2025-09-04 13:07:24 +05:00
78c688a006 In the field "Type of assessed biological impact" allows multiple selection 2025-09-04 13:05:15 +05:00
c935e299bc Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2025-09-04 10:31:32 +05:00
e916f1012b config 2025-09-04 10:31:23 +05:00
b805095d82 GIT config 2025-09-04 07:35:15 +05:00
25b433be42 Multi select eff type 2025-09-03 07:17:05 +05:00
0b52b1c995 Merge pull request 'Multi select eff impect (prepare)' (#6) from develop into master
Reviewed-on: #6
2025-09-02 12:29:18 +05:00
1da522d469 Multi select eff impect (ubuntu) 2025-09-02 07:31:51 +05:00
8a67c49668 + 2025-08-27 17:16:43 +05:00
1a4fa304da New DB version 154 2025-08-26 18:50:30 +05:00
2e0893bac4 Order by distance 2025-08-25 18:46:38 +05:00
e2e18c7818 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop
# Conflicts:
#	.idea/caches/deviceStreaming.xml
2025-08-25 09:18:17 +05:00
23c47245b8 + 2025-08-25 09:16:13 +05:00
192e564f02 Merge branch 'develop' of https://git.dirt.kz/igor/org.ccalm.asdc into develop 2025-08-25 09:04:35 +05:00
930ae8eafb Logs 2025-08-25 09:04:23 +05:00
d9b2711209 logger 2025-07-25 07:42:29 +05:00
9d750fc6a3 Поменял версию приложения 2025-04-10 15:41:07 +05:00
dd9adf335e Merge pull request 'develop' (#4) from develop into master
Reviewed-on: https://git.dirt.kz/igor/org.ccalm.asdc/pulls/4
2025-04-10 15:42:11 +06:00
d5564c934c Обновлён перевод для языка дари 2025-04-01 19:07:06 +05:00
c399cdc7d9 Обновлён перевод на Азербайджанском 2025-04-01 16:03:26 +05:00
5f86a63aa0 Обновлён перевод на Turkmen языке 2025-04-01 13:40:04 +05:00
9ee46b8f86 Merge pull request '+help' (#3) from develop into master
Reviewed-on: https://git.dirt.kz/igor/org.ccalm.asdc/pulls/3
2025-02-27 14:26:07 +06:00
b213d911fd +help 2025-02-27 13:22:15 +05:00
41d7f6b4d1 3.0.6 2025-02-27 13:12:53 +05:00
ecb0ae8b15 Merge branch 'master' of https://git.dirt.kz/igor/org.ccalm.asdc 2025-02-19 21:55:30 +05:00
0bfba422dc +Флаг на карте для синхронизированных обработок 2025-02-19 18:54:47 +05:00
be8a290d50 восстановил 2025-02-19 11:40:24 +05:00
682fada1fa Не буду удалять 2025-02-19 11:37:58 +05:00
7664117a1e Поправил активацию планшетов при помощи QR кодов 2025-02-19 11:34:54 +05:00
1eb95452bb Merge branch 'master' of https://git.dirt.kz/igor/ASDC 2025-02-18 23:39:33 +05:00
45ed6f9bbc + 2025-02-18 23:39:25 +05:00
6e52332d3d Merge branch 'master' of https://git.dirt.kz/igor/ASDC 2025-02-18 18:26:05 +05:00
b1331e56f9 + 2025-02-18 18:25:57 +05:00
ead0f4a45b Выпуск новой версии 3.0.2 + языки 2025-02-11 00:02:43 +05:00
78dc4d52be Настройки 2025-02-10 19:11:36 +05:00
f6e55f5e9f Переводы 2025-02-10 16:20:26 +05:00
af78e7d906 Делаю грузинский язык 2025-02-10 07:36:07 +05:00
9f9633c935 Merge branch 'master' of https://git.dirt.kz/igor/ASDC 2025-02-09 09:51:20 +05:00
7cba83664e IDE изменила файлы 2025-02-09 09:51:11 +05:00