sync main #2

apoloz · 2025-06-30T07:23:24Z

apoloz commented

2025-06-30 07:23:24 +00:00

No description provided.

apoloz added 559 commits 2025-06-30 07:23:26 +00:00

pre merge commit f590c49def

Merge remote-tracking branch 'upstream/main' 102dc9ee55

fixed pagination 9d53760137

feat: info by order screen 0a664cc58f

Merge pull request 'feat: info by order screen' (#254 ) from BLoC/eatvio_app:main into main 578d777b1f

Reviewed-on: eatvio/eatvio_app#254

chats have been updated to work with consultatons 803588a289

merged 88d070c5f9

fixed translations fe4076f9ac

Merge pull request 'chats have been updated to work with consultatons' (#255 ) from misha/eatvio_app:main into main b6d4911c2e

Reviewed-on: eatvio/eatvio_app#255

Merge pull request 'main' (#20 ) from eatvio/eatvio_app:main into main f98cabd12d

Reviewed-on: mso7nueh/eatvio_app#20

feat: test-flight-cd.yaml 1f98606fc8

Merge pull request 'test-flight' (#257 ) from mso7nueh/eatvio_app:test-flight into test-flight 773da9c169

Reviewed-on: eatvio/eatvio_app#257

feat: test-case 8ff32db3ca

feat: tf build fca972bcc7

Merge pull request 'feat: test-case' (#258 ) from mso7nueh/eatvio_app:main into test-flight 531389d843

Reviewed-on: eatvio/eatvio_app#258

Merge pull request 'test-flight' (#259 ) from test-flight into main 1deee5fed4

Reviewed-on: eatvio/eatvio_app#259

feat: tf build e98f9d298e

Merge remote-tracking branch 'origin/test-flight' into test-flight 56c89b6bcb

Merge pull request 'test-flight' (#260 ) from test-flight into main 2d9d0df71e

Reviewed-on: eatvio/eatvio_app#260

feat: test-case 593b99ac05

Merge pull request 'feat: test-case' (#261 ) from mso7nueh/eatvio_app:main into main c64fff01de

Reviewed-on: eatvio/eatvio_app#261

Merge pull request 'main' (#262 ) from main into test-flight 26f6db7624

Reviewed-on: eatvio/eatvio_app#262

Merge pull request 'main' (#21 ) from eatvio/eatvio_app:main into main 26c42d97d0

Reviewed-on: mso7nueh/eatvio_app#21

feat: tags cf57518e5b

Merge pull request 'main' (#263 ) from mso7nueh/eatvio_app:main into main 3ad9db9d3d

Reviewed-on: eatvio/eatvio_app#263

Merge pull request 'main' (#264 ) from main into test-flight 6799bebae8

Reviewed-on: eatvio/eatvio_app#264

feat: tags 579df94d67

Merge pull request 'feat: tags' (#265 ) from mso7nueh/eatvio_app:main into main e76c9d34b5

Reviewed-on: eatvio/eatvio_app#265

Merge pull request 'main' (#266 ) from main into test-flight 0b8c7bdacb

Reviewed-on: eatvio/eatvio_app#266

feat: tag upd e9e22bd1ae

Merge pull request 'feat: tag upd' (#267 ) from mso7nueh/eatvio_app:main into main ab5326549a

Reviewed-on: eatvio/eatvio_app#267

Merge pull request 'main' (#268 ) from main into test-flight fe836570d5

Reviewed-on: eatvio/eatvio_app#268

Update .gitea/workflows/test-flight-cd.yaml 83e3760be9

Merge pull request 'Update .gitea/workflows/test-flight-cd.yaml' (#269 ) from main into test-flight 0330b7cde7

Reviewed-on: eatvio/eatvio_app#269

feat: upd export options 7712a85cea

Merge pull request 'feat: upd export options' (#270 ) from mso7nueh/eatvio_app:main into main 9305a6b907

Reviewed-on: eatvio/eatvio_app#270

Merge pull request 'main' (#271 ) from main into test-flight 29501adaf9

Reviewed-on: eatvio/eatvio_app#271

feat: rm profile type a90ffc1fc0

Merge pull request 'feat: rm profile type' (#272 ) from mso7nueh/eatvio_app:main into main 6839f7272a

Reviewed-on: eatvio/eatvio_app#272

Merge pull request 'main' (#273 ) from main into test-flight 4b2a364d6d

Reviewed-on: eatvio/eatvio_app#273

feat: cache clear c3861271f0

Merge pull request 'feat: cache clear' (#274 ) from mso7nueh/eatvio_app:main into main c06be7a112

Reviewed-on: eatvio/eatvio_app#274

Merge pull request 'main' (#275 ) from main into test-flight cae602e190

Reviewed-on: eatvio/eatvio_app#275

feat: profile type 80bb6c22cb

Merge pull request 'feat: profile type' (#276 ) from mso7nueh/eatvio_app:main into main 29b2b2d0d2

Reviewed-on: eatvio/eatvio_app#276

Merge pull request 'main' (#277 ) from main into test-flight c399eb1480

Reviewed-on: eatvio/eatvio_app#277

feat: build tf 616b9b4385

Merge pull request 'feat: build tf' (#278 ) from mso7nueh/eatvio_app:main into main 0a0616fb24

Reviewed-on: eatvio/eatvio_app#278

Merge pull request 'main' (#279 ) from main into test-flight 985f248343

Reviewed-on: eatvio/eatvio_app#279

feat: build tf upd 4ad219b428

Merge pull request 'feat: build tf upd' (#280 ) from mso7nueh/eatvio_app:main into main b1d55b6c16

Reviewed-on: eatvio/eatvio_app#280

Merge pull request 'main' (#281 ) from main into test-flight da687ef466

Reviewed-on: eatvio/eatvio_app#281

feat: build tf upd 2 60a4d1f64f

Merge pull request 'feat: build tf upd 2' (#282 ) from mso7nueh/eatvio_app:main into main a65a043ecf

Reviewed-on: eatvio/eatvio_app#282

Merge pull request 'main' (#283 ) from main into test-flight 4f730619ea

Reviewed-on: eatvio/eatvio_app#283

feat: build tf upd 3 2e6796eb80

Merge pull request 'feat: build tf upd 3' (#284 ) from mso7nueh/eatvio_app:main into main 820057de42

Reviewed-on: eatvio/eatvio_app#284

Merge pull request 'main' (#285 ) from main into test-flight 5cd5de8511

Reviewed-on: eatvio/eatvio_app#285

feat: build tf upd 4 42796cff52

Merge pull request 'feat: build tf upd 4' (#286 ) from mso7nueh/eatvio_app:main into main 9a2e07a41b

Reviewed-on: eatvio/eatvio_app#286

Merge pull request 'main' (#287 ) from main into test-flight 2aa836335f

Reviewed-on: eatvio/eatvio_app#287

chat has been updated fa817548d9

Update Build-tf a2c1d31d63

Merge pull request 'Update Build-tf' (#288 ) from main into test-flight 217ee43a49

Reviewed-on: eatvio/eatvio_app#288

feat: build tf upd 5 2ab8389251

Обновить .gitea/workflows/test-flight-cd.yaml 00750d9408

Merge pull request 'Обновить .gitea/workflows/test-flight-cd.yaml' (#290 ) from main into test-flight 43349d194f

Reviewed-on: eatvio/eatvio_app#290

feat: build tf upd 6 c6f1d5645f

Merge branch 'main' into main 4b9489da7e

Merge pull request 'feat: build tf upd 5' (#291 ) from mso7nueh/eatvio_app:main into main c00634c1d8

Reviewed-on: eatvio/eatvio_app#291

Merge pull request 'Merge pull request 'feat: build tf upd 5' (#291 ) from mso7nueh/eatvio_app:main into main' (#22 ) from eatvio/eatvio_app:main into main 01f8df67da

Reviewed-on: mso7nueh/eatvio_app#22

feat: build tf upd 7 3562dca76b

Merge pull request 'main' (#293 ) from mso7nueh/eatvio_app:main into main f0c861ade4

Reviewed-on: eatvio/eatvio_app#293

Merge pull request 'main' (#294 ) from main into test-flight bd59323e80

Reviewed-on: eatvio/eatvio_app#294

feat: upd tf 7c40f14364

Merge pull request 'feat: upd tf' (#295 ) from mso7nueh/eatvio_app:main into main a043428019

Reviewed-on: eatvio/eatvio_app#295

Merge pull request 'main' (#296 ) from main into test-flight a0ad7544c6

Reviewed-on: eatvio/eatvio_app#296

feat: upd build tf ebf15bdf3c

Merge pull request 'feat: upd build tf' (#297 ) from mso7nueh/eatvio_app:main into main 31df4797d0

Reviewed-on: eatvio/eatvio_app#297

Merge pull request 'main' (#298 ) from main into test-flight 6a67cfa3ba

Reviewed-on: eatvio/eatvio_app#298

feat: export options 186f1f40e5

Merge pull request 'feat: export options' (#299 ) from mso7nueh/eatvio_app:main into main caa2f28872

Reviewed-on: eatvio/eatvio_app#299

Merge pull request 'main' (#300 ) from main into test-flight 9c268baa27

Reviewed-on: eatvio/eatvio_app#300

feat: eo 70eaa0e0da

Merge pull request 'feat: eo' (#301 ) from mso7nueh/eatvio_app:main into main 0adae087ac

Reviewed-on: eatvio/eatvio_app#301

Merge pull request 'main' (#302 ) from main into test-flight 6431111362

Reviewed-on: eatvio/eatvio_app#302

feat: info by order screen f97da886b4

Merge pull request 'feat: info by order screen' (#303 ) from mso7nueh/eatvio_app:main into main 9483c53b5f

Reviewed-on: eatvio/eatvio_app#303

Merge pull request 'main' (#304 ) from main into test-flight e8f89d605c

Reviewed-on: eatvio/eatvio_app#304

feat: build tf upd 8 255d59127d

Merge pull request 'feat: build tf upd 8' (#305 ) from mso7nueh/eatvio_app:main into main f02b4c434f

Reviewed-on: eatvio/eatvio_app#305

Merge pull request 'main' (#306 ) from main into test-flight 9195b2ed29

Reviewed-on: eatvio/eatvio_app#306

feat: build tf upd 9 a14d31cd7a

Merge pull request 'feat: build tf upd 9' (#307 ) from mso7nueh/eatvio_app:main into main e4bb34a58b

Reviewed-on: eatvio/eatvio_app#307

Merge pull request 'main' (#308 ) from main into test-flight 173995791b

Reviewed-on: eatvio/eatvio_app#308

feat: build tf upd 10 066395983f

Merge pull request 'feat: build tf upd 10' (#309 ) from mso7nueh/eatvio_app:main into main 42e7697a2a

Reviewed-on: eatvio/eatvio_app#309

Merge pull request 'main' (#310 ) from main into test-flight 066169b059

Reviewed-on: eatvio/eatvio_app#310

feat: build tf upd 11 f26e89fc25

Merge pull request 'feat: build tf upd 11' (#311 ) from mso7nueh/eatvio_app:main into main 9228055b9e

Reviewed-on: eatvio/eatvio_app#311

Merge pull request 'main' (#312 ) from main into test-flight d45fd9bc5a

Reviewed-on: eatvio/eatvio_app#312

feat: build tf upd 12 467ae0afd3

Merge pull request 'feat: build tf upd 12' (#313 ) from mso7nueh/eatvio_app:main into main 1c6ea485f6

Reviewed-on: eatvio/eatvio_app#313

Merge pull request 'main' (#314 ) from main into test-flight 991967657d

Reviewed-on: eatvio/eatvio_app#314

feat: upd build tf 3aba5de3ec

Merge pull request 'feat: upd build tf' (#315 ) from mso7nueh/eatvio_app:main into main 50992adc1b

Reviewed-on: eatvio/eatvio_app#315

Merge pull request 'main' (#316 ) from main into test-flight b969b713c9

Reviewed-on: eatvio/eatvio_app#316

card adding and selecting default one cdc16b9a9c

Merge remote-tracking branch 'upstream/main' fd089e0206

Merge pull request 'cards screen updated' (#318 ) from misha/eatvio_app:main into main e0f50f3a24

Reviewed-on: eatvio/eatvio_app#318

Merge pull request 'main' (#319 ) from main into test-flight bee780f011

Reviewed-on: eatvio/eatvio_app#319

Merge pull request 'main' (#23 ) from eatvio/eatvio_app:main into main 9b7e07484f

Reviewed-on: mso7nueh/eatvio_app#23

Удалить test/widget_test.dart e00900db62

Удалить test/widget_test.dart 0da839559b

fix: remove widget test 06846d593a

Merge remote-tracking branch 'origin/main' 95754fbdd8

Merge pull request 'main' (#320 ) from mso7nueh/eatvio_app:main into main 5eee8d2db0

Reviewed-on: eatvio/eatvio_app#320

fix: recipe loading e082bbc3c9

fix: plans loading d84e3662c6

fix: decimal value on glossary moderation 595a5d1f97

feat: comment field increase size 89279b9ada

feat: automatic capitalization e476eabcde

feat: from chat to profile 37f7b33ac4

feat: from blog post to profile 35ac11e019

feat: from plan to profile fcdc57493d

Merge pull request 'main' (#321 ) from mso7nueh/eatvio_app:main into main 088a1cef50

Reviewed-on: eatvio/eatvio_app#321

feat(diary): wakeup, retire, mood, comment a871dd8951

Merge pull request 'feat(diary): wakeup, retire, mood, comment' (#322 ) from mso7nueh/eatvio_app:main into main d92bb6a59f

Reviewed-on: eatvio/eatvio_app#322

fix(analyzer): all d0a1b72cbe

Merge pull request 'fix(analyzer): all' (#323 ) from mso7nueh/eatvio_app:main into main 70cfa15597

Reviewed-on: eatvio/eatvio_app#323

feat(push notifications): test implemintation of push notifcations b54deb66e7

Merge remote-tracking branch 'upstream/main' 6e917989ff

fix: fixed analyzer issues 7008276735

fix(blog posts, diets, plans, recipies): changed name of json field for descriptions of models f9741adf1e

fixed analyzer issue 9715f4cac9

feat(order info): added order info screen 748484cf8f

Merge pull request 'Test implementation of push notifications' (#324 ) from misha/eatvio_app:main into main 9a9ef444f1

Reviewed-on: eatvio/eatvio_app#324

fix: changed baseUrl 245c854754

fix(diary): added proccesing of future dates and fixed deleted portions 823dc78490

fix: changed baseUrl 267cc38a0b

Merge pull request 'main' (#24 ) from eatvio/eatvio_app:main into main c463448b8f

Reviewed-on: mso7nueh/eatvio_app#24

Merge pull request 'main' (#25 ) from misha/eatvio_app:main into main e4ac0311e8

Reviewed-on: mso7nueh/eatvio_app#25

fix(many): 325 and 317 tasks b0fb4b4727

Обновить Build-tf 75d7e65948

Обновить Support/ExportOptions.plist ba4f960c11

Обновить Build-tf f839203389

Обновить Build-tf f40fbff893

Merge pull request 'feat(order info): added order info screen' (#326 ) from misha/eatvio_app:main into main ea95317095

Reviewed-on: eatvio/eatvio_app#326

feat(feed): views, more options 2ba130f875

Обновить Build-tf 3b73f2fe2c

Обновить Build-tf a60007b73b

Обновить Build-tf 600e2ea517

fix: remove ignored files 93236783c7

fix(diet): diet states 51fb27495d

fix: merge conflict 64ef5c8c54

Merge pull request 'feat(test-flight): try test flight load' (#327 ) from main into test-flight 2cfb5dd5d7

Reviewed-on: eatvio/eatvio_app#327

fix: merge conflict 397236a9f5

resovle conflict f85bad0bb8

Merge branch 'eatvio-main' c4d8ad1907

fix: generate build_runner 0b20520e0b

fix: generate build_runner 93ee1abb2d

fix: downgrade analzyer b0a6ec6558

fix: downgrade analyzer 2d113024ff

Merge pull request '"В черновик"в диетах, гитигнор, удален сгенерированные фалйы, подсчёт просмотров, исплавние опечаток, добавление трёх точек в ленте' (#336 ) from mso7nueh/eatvio_app:main into main e56047b000

Reviewed-on: eatvio/eatvio_app#336

feat(feed): #338 2275eee3d7

feat(feed): #337 76b514614a

feat(finance): #332 d49fa29dfb

feat(archiveOfConsultations): #331 0ead4556b9

Merge pull request 'Архив консультаций, мои финансы, лента' (#339 ) from mso7nueh/eatvio_app:main into main 3d87940755

Reviewed-on: eatvio/eatvio_app#339

fix(ci/cd): test-flight 740ccb7d30

fix(ci/cd): secrets >> env 554b747d8e

Merge pull request 'secrets >> env' (#341 ) from mso7nueh/eatvio_app:main into main 83ad3ffdd1

Reviewed-on: eatvio/eatvio_app#341

fix(ci/cd): env >> vars 61a7b12f93

Merge pull request 'env >> vars' (#342 ) from mso7nueh/eatvio_app:main into main 976cb9ac57

Reviewed-on: eatvio/eatvio_app#342

fix(ci/cd): upd ExportOptions b1095585a4

Merge pull request 'fix(ci/cd): upd ExportOptions' (#343 ) from mso7nueh/eatvio_app:main into main a2a47c6e88

Reviewed-on: eatvio/eatvio_app#343

fix(ci/cd): build tf 537ae19687

Merge pull request 'fix(ci/cd): build tf' (#344 ) from mso7nueh/eatvio_app:main into main fcc88f47b0

Reviewed-on: eatvio/eatvio_app#344

fix(ci/cd): export options 8fec0a623a

Merge pull request 'fix(ci/cd): export options' (#345 ) from mso7nueh/eatvio_app:main into main 54a4bbc82b

Reviewed-on: eatvio/eatvio_app#345

fix(ci/cd): project options 95373b0fa8

Merge pull request 'fix(ci/cd): project options' (#346 ) from mso7nueh/eatvio_app:main into main 1f72e83e9e

Reviewed-on: eatvio/eatvio_app#346

fix(ci/cd): export options 726301a64b

Merge pull request 'fix(ci/cd): export options' (#347 ) from mso7nueh/eatvio_app:main into main 84cd2aebc9

Reviewed-on: eatvio/eatvio_app#347

Обновить ios/Runner.xcodeproj/project.pbxproj 210e821107

Merge pull request 'fix(ci/cd): export options' (#347 ) from mso7nueh/eatvio_app:main into main ba3e12bba4

Reviewed-on: eatvio/eatvio_app#347

fix(ci/cd): build tf f8a74a4664

Merge pull request 'fix(ci/cd): build tf' (#348 ) from mso7nueh/eatvio_app:main into main 395474b3ec

Reviewed-on: eatvio/eatvio_app#348

fix(feed): consultant badge size f165c60fc1

fix(ci/cd): build tf 031c32d994

Merge pull request 'fix(ci/cd): build tf' (#349 ) from mso7nueh/eatvio_app:main into main 376691ac98

Reviewed-on: eatvio/eatvio_app#349

fix(ci/cd): build export options 2c58fe3dd0

Merge pull request 'fix(ci/cd): build export options' (#350 ) from mso7nueh/eatvio_app:main into main 15c0e7f31d

Reviewed-on: eatvio/eatvio_app#350

fix(ci/cd): build tf 625c1421a7

Merge pull request 'fix(ci/cd): build tf' (#351 ) from mso7nueh/eatvio_app:main into main 08c9317542

Reviewed-on: eatvio/eatvio_app#351

fix(ci/cd): build tf 5ace31d3a4

Merge pull request 'fix(ci/cd): build tf' (#352 ) from mso7nueh/eatvio_app:main into main 5104100391

Reviewed-on: eatvio/eatvio_app#352

fix(ci/cd): build tf a2af0365dc

Merge pull request 'fix(ci/cd): build tf' (#353 ) from mso7nueh/eatvio_app:main into main 1d8ec8302d

Reviewed-on: eatvio/eatvio_app#353

fix(ci/cd): build tf 26edfa593f

Merge pull request 'fix(ci/cd): build tf' (#354 ) from mso7nueh/eatvio_app:main into main a7f1d681a8

Reviewed-on: eatvio/eatvio_app#354

fix(ci/cd): build tf f66ab7eae9

Merge pull request 'fix(ci/cd): build tf' (#355 ) from mso7nueh/eatvio_app:main into main 1bf55fe8cd

Reviewed-on: eatvio/eatvio_app#355

fix(ci/cd): build tf env 494a41b001

Merge pull request 'fix(ci/cd): build tf env' (#356 ) from mso7nueh/eatvio_app:main into main ac92d0a3e4

Reviewed-on: eatvio/eatvio_app#356

fix(ci/cd): build tf env 3004e0e388

Merge pull request 'fix(ci/cd): build tf env' (#357 ) from mso7nueh/eatvio_app:main into main 57d30ed4b7

Reviewed-on: eatvio/eatvio_app#357

fix(ci/cd): build tf env a2b3c1c520

Merge pull request 'fix(ci/cd): build tf env' (#358 ) from mso7nueh/eatvio_app:main into main c1005e1be7

Reviewed-on: eatvio/eatvio_app#358

fix(ci/cd): build tf env de6beece5e

Merge pull request 'fix(ci/cd): build tf env' (#359 ) from mso7nueh/eatvio_app:main into main ae17613cca

Reviewed-on: eatvio/eatvio_app#359

fix(ci/cd): build tf env 0e16b39080

Merge pull request 'fix(ci/cd): build tf env' (#360 ) from mso7nueh/eatvio_app:main into main c63af7cbb7

Reviewed-on: eatvio/eatvio_app#360

fix(ci/cd): build tf env ffc5c7df61

Merge pull request 'fix(ci/cd): build tf env' (#361 ) from mso7nueh/eatvio_app:main into main d1970f7ce6

Reviewed-on: eatvio/eatvio_app#361

fix(ci/cd): build tf env ea22380fb1

Merge pull request 'fix(ci/cd): build tf env' (#362 ) from mso7nueh/eatvio_app:main into main d69c45117d

Reviewed-on: eatvio/eatvio_app#362

fix(ci/cd): revert 2df68a2f92

Merge pull request 'fix(ci/cd): revert' (#363 ) from mso7nueh/eatvio_app:main into main de9db33099

Reviewed-on: eatvio/eatvio_app#363

fix(ci/cd): export options dfc8b60b74

Merge pull request 'fix(ci/cd): export options' (#364 ) from mso7nueh/eatvio_app:main into main c00df89b78

Reviewed-on: eatvio/eatvio_app#364

fix(ci/cd): test-flight a3fbded9d6

Merge pull request 'fix(ci/cd): test-flight' (#365 ) from mso7nueh/eatvio_app:main into main 98f60bcd6c

Reviewed-on: eatvio/eatvio_app#365

fix(ci/cd): test-flight e27b800594

Merge pull request 'fix(ci/cd): test-flight' (#366 ) from mso7nueh/eatvio_app:main into main 9f07df14d1

Reviewed-on: eatvio/eatvio_app#366

fix(ci/cd): test-flight 7db4f291e2

Обновить ios/Runner.xcodeproj/project.pbxproj b78b9b89f2

Merge pull request 'fix(ci/cd): test-flight' (#367 ) from mso7nueh/eatvio_app:main into main 10309bc927

Reviewed-on: eatvio/eatvio_app#367

fix(ci/cd): test-flight fe2bd8d391

Merge remote-tracking branch 'origin/main' 36d7cd3698

Merge pull request 'fix(ci/cd): test-flight' (#368 ) from mso7nueh/eatvio_app:main into main 6bc1b98b24

Reviewed-on: eatvio/eatvio_app#368

fix(ci/cd): test-flight c7eecc027d

Merge pull request 'fix(ci/cd): test-flight' (#369 ) from mso7nueh/eatvio_app:main into main aad6774d91

Reviewed-on: eatvio/eatvio_app#369

fix(ci/cd): test-flight c23db15c11

Merge pull request 'fix(ci/cd): test-flight' (#370 ) from mso7nueh/eatvio_app:main into main fec5749dd4

Reviewed-on: eatvio/eatvio_app#370

fix(ci/cd): test-flight 19a59bdd20

Merge pull request 'fix(ci/cd): test-flight' (#375 ) from mso7nueh/eatvio_app:main into main 0144478ee1

Reviewed-on: eatvio/eatvio_app#375

fix(ci/cd): test-flight bea152ecf3

Merge pull request 'fix(ci/cd): test-flight' (#376 ) from mso7nueh/eatvio_app:main into main 573f192182

Reviewed-on: eatvio/eatvio_app#376

fix(ci/cd): test-flight e492a78b9b

Merge pull request 'fix(ci/cd): test-flight' (#377 ) from mso7nueh/eatvio_app:main into main 50e677bb91

Reviewed-on: eatvio/eatvio_app#377

fix(ci/cd): test-flight fe489a8454

fix(ci/cd): test-flight 310c935886

Merge pull request 'main' (#378 ) from mso7nueh/eatvio_app:main into main bd843a75ee

Reviewed-on: eatvio/eatvio_app#378

fix(ci/cd): test-flight 834fbc31dd

Merge pull request 'fix(ci/cd): test-flight' (#379 ) from mso7nueh/eatvio_app:main into main ad003527e0

Reviewed-on: eatvio/eatvio_app#379

fix(ci/cd): test-flight dff6528f7b

Merge pull request 'fix(ci/cd): test-flight' (#380 ) from mso7nueh/eatvio_app:main into main 490f788c53

Reviewed-on: eatvio/eatvio_app#380

fix(ci/cd): test-flight cdef5b6582

Merge pull request 'fix(ci/cd): test-flight' (#381 ) from mso7nueh/eatvio_app:main into main b3c84d21e7

Reviewed-on: eatvio/eatvio_app#381

fix(ci/cd): test-flight 258b575535

Merge pull request 'fix(ci/cd): test-flight' (#382 ) from mso7nueh/eatvio_app:main into main 2bcc5a5d74

Reviewed-on: eatvio/eatvio_app#382

fix(ci/cd): test-flight 8099c7d97d

Merge pull request 'fix(ci/cd): test-flight' (#383 ) from mso7nueh/eatvio_app:main into main 1676649f1f

Reviewed-on: eatvio/eatvio_app#383

fix(ci/cd): test flight b1ccb79b46

fix(ci/cd): test flight 567201aee1

fix(ci/cd): test flight 3e63281a90

fix(ci/cd): test flight 1c6ecb35fb

fix(ci/cd): test flight c4ff518a4b

fix(ci/cd): test flight ef78dcfdd7

Merge pull request 'main' (#28 ) from eatvio/eatvio_app:main into main e0f472a8e6

Reviewed-on: mso7nueh/eatvio_app#28

fix(ci/cd): test-flight 2f9daa129d

Merge pull request 'main' (#384 ) from mso7nueh/eatvio_app:main into main fd12243f52

Reviewed-on: eatvio/eatvio_app#384

fix(ci/cd): test flight 997213b4fb

Merge pull request 'fix(ci/cd): test flight' (#385 ) from mso7nueh/eatvio_app:main into main 52fcbe80f6

Reviewed-on: eatvio/eatvio_app#385

fix(ci/cd): test-flight ed52c81ca7

Merge pull request 'fix(ci/cd): test-flight' (#386 ) from mso7nueh/eatvio_app:main into main 6133c05570

Reviewed-on: eatvio/eatvio_app#386

fix(ci/cd): test-flight f9b1031567

Merge pull request 'fix(ci/cd): test-flight' (#387 ) from mso7nueh/eatvio_app:main into main 48a48db5d8

Reviewed-on: eatvio/eatvio_app#387

fix(ci/cd): test-flight 4bfeb027cc

Merge pull request 'fix(ci/cd): test-flight' (#388 ) from mso7nueh/eatvio_app:main into main 83a65538c9

Reviewed-on: eatvio/eatvio_app#388

fix(ci/cd): test-flight 7263fa865c

Merge pull request 'fix(ci/cd): test-flight' (#389 ) from mso7nueh/eatvio_app:main into main 7a68f08a3b

Reviewed-on: eatvio/eatvio_app#389

fix(ci/cd): test-flight 1fa63f9a52

Merge pull request 'fix(ci/cd): test-flight' (#390 ) from mso7nueh/eatvio_app:main into main 4298243f78

Reviewed-on: eatvio/eatvio_app#390

feat(diary): consultant comments 3754d047fb

Merge remote-tracking branch 'upstream/main' 4802d91b77

Merge pull request 'added consultant comment to diary' (#391 ) from misha/eatvio_app:main into main d689074a81

Reviewed-on: eatvio/eatvio_app#391

Merge pull request 'added consultant comment to diary' (#29 ) from eatvio/eatvio_app:main into main bc7fcd5c65

Reviewed-on: mso7nueh/eatvio_app#29

fix(feed): показать ещё (338), комментарии (325), переход в профиль (317) 1178525a93

remove ignored files a3d903b6b9

feat(avatar): task 394 placeholder empty avatar 27b1656690

fix(finance): task 332 remove card manage for user and red color for canceled 886dfa2570

fix(feed): task 374 raing score, description a52a5383de

Merge pull request 'Попытка настройки автосборки в тестфлайт, завново создал все сертификаты и ключи' (#340 ) from main into test-flight 1d74aadac6

Reviewed-on: eatvio/eatvio_app#340

fix(profile): profile subs fixed c8b828bfe1

Merge pull request 'fix(profile): profile subs fixed' (#399 ) from misha/eatvio_app:main into main 3694393674

Reviewed-on: eatvio/eatvio_app#399

Merge pull request 'main' (#30 ) from eatvio/eatvio_app:main into main 3e0ba5c440

Reviewed-on: mso7nueh/eatvio_app#30

feat(profile): 371 task badge description onTap 746aab2fae

feat(support): task 397 email copy 4aad916c1e

fix: analyzer af63b82f52

Merge pull request 'Исправления и улучшения' (#400 ) from mso7nueh/eatvio_app:main into main ff277d229a

Reviewed-on: eatvio/eatvio_app#400

feat(plans): plan creating has been completed 0fcb2c1a0d

Merge remote-tracking branch 'upstream/main' 22bbb58072

feat: add welcome screen b74d683e2c

feat: update screen 6b48eaf8fe

Merge pull request 'update screen + welcome screen' (#402 ) from mso7nueh/eatvio_app:main into main b5fd9dc7c5

Reviewed-on: eatvio/eatvio_app#402

feat: custom popup for blogPosts 66196a3332

Merge pull request 'Plans creation has been completed' (#401 ) from misha/eatvio_app:main into main e572614a8b

Reviewed-on: eatvio/eatvio_app#401

feat(recipes): custom popup for recipes d040f94979

fix: test-flight 37ed041da4

Merge pull request 'Контекстное меню (три точки)' (#403 ) from mso7nueh/eatvio_app:main into main a4260dc883

Reviewed-on: eatvio/eatvio_app#403

feat(support): add docs 32d698bf82

feat(chats,diary): added logic for chosen diet portions and added banner to finish plan to chats 3b4ed501fb

Merge remote-tracking branch 'upstream/main' a5f0fa7825

feat(menu): add popup to recipe, diet, plan 2ab148d0d0

Merge pull request 'feat(support): add docs' (#408 ) from mso7nueh/eatvio_app:Issue-407 into main 74e2bd1f89

Reviewed-on: eatvio/eatvio_app#408

Merge pull request 'feat(chats,diary): added logic for chosen diet portions and added banner to finish plan to chats' (#409 ) from misha/eatvio_app:main into main 2fbb99e466

Reviewed-on: eatvio/eatvio_app#409

Merge pull request 'Issue-329' (#404 ) from mso7nueh/eatvio_app:Issue-329 into main 43bfcbbfd8

Reviewed-on: eatvio/eatvio_app#404

changed base url 5e6cdca9c3

Merge pull request 'main' (#31 ) from eatvio/eatvio_app:main into main e499a9ee03

Reviewed-on: mso7nueh/eatvio_app#31

Merge pull request 'changed base url' (#410 ) from misha/eatvio_app:main into main 7b412a9eba

Reviewed-on: eatvio/eatvio_app#410

Обновить .gitea/workflows/test.yml 849e3cde72

Merge pull request 'main' (#32 ) from eatvio/eatvio_app:main into main 801760a093

Reviewed-on: mso7nueh/eatvio_app#32

fix(support): link 60d244aac2

Merge pull request 'fix(support): link' (#411 ) from mso7nueh/eatvio_app:main into main 33628951dc

Reviewed-on: eatvio/eatvio_app#411

fix(welcomeScreen): remove emoji acc88470f1

fix(consultations): fixed consultations screen 5852a67654

fix(chat): fixed chat screen c790214a26

Merge pull request 'feat(chat, consutations): fixed chat screen and consultations screen' (#415 ) from misha/eatvio_app:main into main 045bf365ec

Reviewed-on: eatvio/eatvio_app#415

Merge pull request 'fix(welcomeScreen): remove emoji' (#413 ) from mso7nueh/eatvio_app:Issue-412 into main 3c97c91bb4

Reviewed-on: eatvio/eatvio_app#413

Merge pull request 'main' (#33 ) from eatvio/eatvio_app:main into main 037fc3d529

Reviewed-on: mso7nueh/eatvio_app#33

feat(more_options): delete recipe, diet, plans, move to draft diets and plans b2d9e808fe

Merge pull request 'Issue-329 Реализация функционала удаления и снятия с публикации контента (диеты, планы, рецепты, посты)' (#417 ) from mso7nueh/eatvio_app:Issue-329 into main 03ea191c7a

Reviewed-on: eatvio/eatvio_app#417

Обновить .gitea/workflows/test-flight-cd.yaml c0f66b7a93

Merge pull request 'fix: test-flight' (#405 ) from main into test-flight c84af71020

Reviewed-on: eatvio/eatvio_app#405

feat(fastlane): add fastlane 028230003e

Merge branch 'main' of http://gitea.office.local:3000/eatvio/eatvio_app 5a22b74544

feat(fastlane): add checkout c887ec4b59

feat(fastlane): complete d2ac34e6d7

Обновить .gitea/workflows/test-flight-cd.yaml 457ae25dc8

Обновить .gitea/workflows/test-flight-cd.yaml 2480f20563

Обновить .gitea/workflows/test-flight-cd.yaml 31712f3c40

Обновить ios/fastlane/Fastfile 305d103eb7

Обновить ios/fastlane/Fastfile 737bb3b1e5

Обновить .gitea/workflows/test-flight-cd.yaml e52feae03a

Обновить .gitea/workflows/test-flight-cd.yaml f5577e00e7

Обновить .gitea/workflows/test-flight-cd.yaml d3a1c2fe26

Обновить ios/fastlane/Fastfile 6e29a2f92c

Обновить .gitea/workflows/test-flight-cd.yaml 17e0d53c1b

Обновить ios/fastlane/Fastfile 84c8cb0fc1

Обновить .gitea/workflows/test-flight-cd.yaml 5e89c5e9c6

Обновить ios/fastlane/Fastfile 5fa1ca6bf2

Обновить .gitea/workflows/test-flight-cd.yaml 23fe075bfd

Обновить ios/fastlane/Fastfile 0c68482f21

Обновить ios/fastlane/Fastfile 76f73a77c3

Обновить .gitea/workflows/test-flight-cd.yaml d92f511aa5

Обновить .gitea/workflows/test-flight-cd.yaml b1884e7863

feat(comments): onTap to profile 2adedf16ae

Merge pull request 'main' (#34 ) from eatvio/eatvio_app:main into main 2c5931eea0

Reviewed-on: mso7nueh/eatvio_app#34

Merge pull request 'feat(comments): onTap to profile' (#422 ) from mso7nueh/eatvio_app:Issue-317 into main 8c0d8cc976

Reviewed-on: eatvio/eatvio_app#422

Обновить .gitea/workflows/test.yml 82fffec5f5

feat(testflight): change to distribution 8cd9972112

feat(testflight): ci/cd 39708e1782

Обновить .gitea/workflows/test-flight-cd.yaml dca3257386

Обновить .gitea/workflows/test-flight-cd.yaml 21e8a7cedf

Обновить .gitea/workflows/test-flight-cd.yaml cdfd2769f0

Обновить .gitea/workflows/test-flight-cd.yaml 5929196004

Обновить ios/fastlane/Fastfile ef53ad45d6

Merge pull request 'main' (#421 ) from main into test-flight badfa352f9

Reviewed-on: eatvio/eatvio_app#421

Merge pull request 'main' (#35 ) from eatvio/eatvio_app:main into main 1a9c0a16ec

Reviewed-on: mso7nueh/eatvio_app#35

fix(Issue-203): welcome screen 67e7abb8a3

fix(Issue-412): update screen 7683f2b099

Merge pull request 'Issue-203: Исправление вёрстки Welcome Screen' (#424 ) from mso7nueh/eatvio_app:Issue-203 into main 159bb296d1

Reviewed-on: eatvio/eatvio_app#424

Merge pull request 'Issue-412: Исправление вёрсткий Update Screen' (#425 ) from mso7nueh/eatvio_app:Issue-412 into main 2429d6b5cd

Reviewed-on: eatvio/eatvio_app#425

Обновить .gitea/workflows/test.yml 75be1012c9

fix(testflight): ci/cd 46773c91b9

fix 27bad2e902

ci/cd fix a7c89d342c

removed sudo 5895983178

sudo password added to secrets ad5a9b50e9

removed cert downloading cffa48d2ca

Merge pull request 'Try to fix TestFlight ci/cd' (#426 ) from main into test-flight 10cf3bea6f

Reviewed-on: eatvio/eatvio_app#426

Merge pull request 'try to fix cicd' (#429 ) from misha/eatvio_app:main into test-flight b1f5165566

Reviewed-on: eatvio/eatvio_app#429

Merge pull request 'main' (#36 ) from eatvio/eatvio_app:main into main 8ec29f0b32

Reviewed-on: mso7nueh/eatvio_app#36

Обновить .gitea/workflows/test.yml 2f9d6a46dd

Обновить .gitea/workflows/test.yml 6e8701e629

Merge pull request 'Merge pull request 'main' (#36 ) from eatvio/eatvio_app:main into main' (#430 ) from mso7nueh/eatvio_app:main into main d1cb7fb998

Reviewed-on: eatvio/eatvio_app#430

Merge pull request 'test-flight' (#431 ) from test-flight into main 88916a570a

Reviewed-on: eatvio/eatvio_app#431

Обновить .gitea/workflows/test.yml 41d1c17426

Merge pull request 'main' (#37 ) from eatvio/eatvio_app:main into main 6a3f35822a

Reviewed-on: mso7nueh/eatvio_app#37

Обновить .gitea/workflows/test.yml feec4813d8

Merge pull request 'Обновить .gitea/workflows/test.yml' (#38 ) from eatvio/eatvio_app:main into main 5cd4346da9

Reviewed-on: mso7nueh/eatvio_app#38

Обновить .gitea/workflows/test.yml 0c61d1679d

Merge pull request 'Merge pull request 'main' (#37 ) from eatvio/eatvio_app:main into main' (#432 ) from mso7nueh/eatvio_app:main into main d7fd0a9613

Reviewed-on: eatvio/eatvio_app#432

Merge pull request 'main' (#39 ) from eatvio/eatvio_app:main into main 571e07f8e0

Reviewed-on: mso7nueh/eatvio_app#39

Merge pull request 'Merge pull request 'main' (#39 ) from eatvio/eatvio_app:main into main' (#433 ) from mso7nueh/eatvio_app:main into main e99471615b

Reviewed-on: eatvio/eatvio_app#433

fix(ci/cd): java version 17 >> 21.x 82c8ee492a

Merge pull request 'fix(ci/cd): java version 17 >> 21.x' (#434 ) from mso7nueh/eatvio_app:main into main 802f593b04

Reviewed-on: eatvio/eatvio_app#434

fix(screens): welcome and update screen issue e18ec6036d

Merge pull request 'fix(screens): welcome and update screen issue' (#435 ) from mso7nueh/eatvio_app:main into main bd81647e83

Reviewed-on: eatvio/eatvio_app#435

Merge pull request 'fix(screens): welcome and update screen issue' (#436 ) from main into test-flight d714884cfc

Reviewed-on: eatvio/eatvio_app#436

fix(ios): upd project version 14b676d667

Merge pull request 'fix(ios): upd project version' (#437 ) from mso7nueh/eatvio_app:main into test-flight 8a02138b32

Reviewed-on: eatvio/eatvio_app#437

fix(subs): fix subscribers screen error a1abe94fc2

fix(Issue-998): consultant profile info 5c223f7d70

Merge pull request 'Issue-998: Исправление профиля консультанта, исправление экрана подписчиков' (#438 ) from mso7nueh/eatvio_app:Issue-998 into main 983eb91d28

Reviewed-on: eatvio/eatvio_app#438

Merge pull request 'Consultant profile info' (#442 ) from main into test-flight 5c636206dd

Reviewed-on: eatvio/eatvio_app#442

Обновить .gitea/workflows/test-flight-cd.yaml 659586c2ea

Merge pull request 'Обновить .gitea/workflows/test-flight-cd.yaml' (#443 ) from main into test-flight c4a8ba1cef

Reviewed-on: eatvio/eatvio_app#443

Merge pull request 'main' (#40 ) from eatvio/eatvio_app:main into main c2bc2f5260

Reviewed-on: mso7nueh/eatvio_app#40

fix(testflight): upd proj version b1516d6062

Merge pull request 'upd proj version' (#444 ) from mso7nueh/eatvio_app:main into main 49ede10a06

Reviewed-on: eatvio/eatvio_app#444

feat(Issue-446): start screen profileScreen -> feedScreen 083feec4ef

Merge pull request 'feat(Issue-446): start screen profileScreen -> feedScreen' (#447 ) from mso7nueh/eatvio_app:main into main 77293eb614

Reviewed-on: eatvio/eatvio_app#447

Merge pull request 'main' (#445 ) from main into test-flight b908fbbfb0

Reviewed-on: eatvio/eatvio_app#445

fix(testflight): upd proj ver 19d44b54b8

Merge pull request 'fix(testflight): upd proj ver' (#448 ) from mso7nueh/eatvio_app:main into main b3bf2d12a7

Reviewed-on: eatvio/eatvio_app#448

fix(testflight): remove code sync 2a1c1dc56d

Merge pull request 'fix(testflight): remove code sync' (#450 ) from mso7nueh/eatvio_app:main into main 8a3ac2d668

Reviewed-on: eatvio/eatvio_app#450

Merge pull request 'main' (#449 ) from main into test-flight 476d4d2069

Reviewed-on: eatvio/eatvio_app#449

Обновить .gitea/workflows/test-flight-cd.yaml 05127a8a4a

Merge pull request 'Пароли перенесены в переменные gitea' (#451 ) from main into test-flight dd6a287eba

Reviewed-on: eatvio/eatvio_app#451

Обновить .gitea/workflows/test-flight-cd.yaml 8fbd8c987e

feat(recipe): edit recipe b2b2253f06

Merge pull request 'feat(recipe): edit recipe' (#452 ) from mso7nueh/eatvio_app:Issue-329 into main 023ad06403

Reviewed-on: eatvio/eatvio_app#452

fix(testflight): upd ver ae85a7eabf

Merge pull request 'fix(testflight): upd ver' (#453 ) from mso7nueh/eatvio_app:Issue-329 into main 9c75fd7c9e

Reviewed-on: eatvio/eatvio_app#453

Merge pull request 'test-flight' (#454 ) from test-flight into main 2e83e2fdec

Reviewed-on: eatvio/eatvio_app#454

fix(plans, recipes): added new end points for plans and recipes creation b942168167

Merge remote-tracking branch 'upstream/main' aeedc35c42

fix(recipe): tags error 06de6c5d1c

fix(testflight): upd ver 42deaea426

created notifications model and logic of type based parsing c1e2b1c312

fix: fixed analyzer issue 2d836002b7

feat(diet): add diet editing 941cfb04cc

Merge pull request 'Recipes and plans creation' (#456 ) from misha/eatvio_app:main into main 5a863b2520

Reviewed-on: eatvio/eatvio_app#456

Merge pull request 'main' (#1 ) from eatvio/eatvio_app:main into main cb9fff9327

Reviewed-on: mso7nueh/eatvio_app#1

feat(verify): phone 067e0929ed

feat(notifications): added json parsing for notifications and tested impplementation of notifications layoute 272637078a

added notifications layoute 3485e1fe5d

feat(verify): phone + email 8dcfa6ee6a

fixed analyzer issue b4f00a9868

feat(consultations): added new data to consultation model 1dfaa7cd93

fix: analyzer b59190e4e8

Merge pull request 'fix(recipe): tags error, feat(diet): add editing' (#457 ) from mso7nueh/eatvio_app:main into main 1173c8445e

Reviewed-on: eatvio/eatvio_app#457

Merge branch 'main' of ssh://10.55.5.123:222/misha/eatvio_app into notifications 089bfc23b7

Merge remote-tracking branch 'upstream/main' into notifications e13ae888ab

Merge pull request 'feat(notifications)' (#459 ) from misha/eatvio_app:notifications into main 963ff78c25

Reviewed-on: eatvio/eatvio_app#459

Merge pull request 'main' (#2 ) from eatvio/eatvio_app:main into main 50b63fea7d

Reviewed-on: mso7nueh/eatvio_app#2

Merge remote-tracking branch 'upstream/main' into consultations 8f70e9620b

Merge remote-tracking branch 'upstream/main' into consultations 7df1323f7d

feat(email) add email verify screen, add my recipe screen, plans/index -> my_plans 1e1005a09c

fix: analyzer 29b3de325c

fix: phone-verify redirect cf5b459756

fix: consultant profile f38eead280

fix: avatars 51d3c1ad2f

feat(diary): added state for future days with diet b4dd9b3a3a

feat(email): verify screen 67bf7b0510

feat(email): add alert for phone verify and email verify after registration 242cb474cc

feat(recipe): my recipes screen 566a96b18e

added diets to diary c36aabd9a4

Merge remote-tracking branch 'upstream/main' into diary 19d08cac66

added logic of unread notifications b80b4e3a9e

Merge pull request 'feat(consultations): added new data fields to consultations model' (#462 ) from misha/eatvio_app:consultations into main 64bf6e33d7

Reviewed-on: eatvio/eatvio_app#462

feat(recipe): my recipes screen complete 38031c89c2

Merge branch 'main' into main 8f9aeb7b63

Merge pull request 'recipes, plans, email and phone verify' (#463 ) from mso7nueh/eatvio_app:main into main 036aca7d08

Reviewed-on: eatvio/eatvio_app#463

Merge pull request 'feat(notifications): unread notifications handling' (#467 ) from misha/eatvio_app:notifications into main b9611bb5a1

Reviewed-on: eatvio/eatvio_app#467

Merge pull request 'feat(diary): New state for future days with diet in diary' (#465 ) from misha/eatvio_app:diary into main 2cd4054f29

Reviewed-on: eatvio/eatvio_app#465

Merge pull request 'main' (#3 ) from eatvio/eatvio_app:main into main db73865278

Reviewed-on: mso7nueh/eatvio_app#3

fix(feed): blogPosts overflow dc1e8d5b71

Merge pull request 'fix(feed): blogPosts' (#469 ) from mso7nueh/eatvio_app:main into main ac46cd159b

Reviewed-on: eatvio/eatvio_app#469

feat(consultations): updated consultations archive screen, and added buisines logic cd4ca7288c

Merge remote-tracking branch 'upstream/main' 820b4d0a8b

fix(analyzer): fixed analyzer issues d645910554

fix(consultation): some fixes 3addd9d238

Merge pull request 'fix(consultation): some fixes' (#474 ) from mso7nueh/eatvio_app:main into main 1db528838b

Reviewed-on: eatvio/eatvio_app#474

fix: upd ver a90efa8caa

Merge pull request 'fix: upd ver' (#475 ) from mso7nueh/eatvio_app:main into main 5d1a1dccc8

Reviewed-on: eatvio/eatvio_app#475

fix(consultation): state filter, avatar 9f0ce55d47

Merge pull request 'fix(consultation): state filter, avatar' (#478 ) from mso7nueh/eatvio_app:main into main ee7b03c504

Reviewed-on: eatvio/eatvio_app#478

feat(consultations): consultations archive. feat(diary): plan and diet widget 10ef59f6ea

merged upstram/main d405be1ea4

fixed consultation archive filters issues 7f29ade548

removed unused variable 88bf79def4

Merge pull request 'feat(consultations): consultations archive' (#472 ) from misha/eatvio_app:main into main 252538f52d

Reviewed-on: eatvio/eatvio_app#472

fix(profile): education 27cea212b0

Merge pull request 'fix(profile): education' (#479 ) from mso7nueh/eatvio_app:main into main 7b05c7bd36

Reviewed-on: eatvio/eatvio_app#479

fix: upd ver 77c52a50e1

Merge pull request 'fix: upd ver' (#481 ) from mso7nueh/eatvio_app:main into main 1cb824573b

Reviewed-on: eatvio/eatvio_app#481

fix(notifications): fixed consultantLeftComment notifications issue 35fc032d31

Merge pull request 'fix(notifications): fixed consultantLeftComment notifications issue' (#482 ) from misha/eatvio_app:main into main c95b610c35

Reviewed-on: eatvio/eatvio_app#482

fix: plan widget in profile image size overflow 74ecbbdbff

fix(recipe): infinity loading recipe edit 8a9a913420

feat(consultant): update consultant info f0a184b800

feat(consultant): ***WIP: consultant request status in settings 7c354cc0a3

Issue-483: WIP* moderation consultant request status and message c361e12d35

feat(plans): fixed plans price field in CreatePlanScreen, feat(menu): removed dev tools, feat(chats,notifications): added ws reconection da8d21bb08

Merge pull request 'feat(plans): fixed plans price field in CreatePlanScreen, feat(menu): removed dev tools, feat(chats,notifications): added ws reconection' (#486 ) from misha/eatvio_app:main into main c5e0d233f0

Reviewed-on: eatvio/eatvio_app#486

Merge pull request 'Issue-483' (#484 ) from mso7nueh/eatvio_app:main into main bbba15b3c7

Reviewed-on: eatvio/eatvio_app#484

fix: upd ver to 23 cf6ad1eafe

Merge pull request 'fix: upd ver to 23' (#488 ) from mso7nueh/eatvio_app:main into main e728b0951a

Reviewed-on: eatvio/eatvio_app#488

fix: email verify + consultant registration cacfaff4cf

Merge pull request 'fix: email verify + consultant registration' (#490 ) from mso7nueh/eatvio_app:main into main 0270c940fe

Reviewed-on: eatvio/eatvio_app#490

feat(chats): added refresh timer for chat room, feat(diary): fixed plan duration in plan widget and added date to app bar) ff40e74491

Merge remote-tracking branch 'upstream/main' 69359b01c5

fix(blogPost): update without image 0b2464ea19

fix(blogPost): update without image 70620d8d9e

feat(consultantFinaces): added consultant finaces screen 6fa4bffd7e

Merge pull request 'feat(chats): added refresh timer for chat room, feat(diary): fixed plan duration in plan widget and added date to app bar)' (#492 ) from misha/eatvio_app:main into main 88e33765d3

Reviewed-on: eatvio/eatvio_app#492

Merge remote-tracking branch 'upstream/main' 086fd1cac4

Merge pull request 'build 26 + 1.1.3+33' (#495 ) from mso7nueh/eatvio_app:main into main 72cf203658

Reviewed-on: eatvio/eatvio_app#495

fix(blogPost): Issue-329 e6bad9d35d

Merge remote-tracking branch 'origin/main' 7a3c6e6b07

Merge pull request 'Issue-329' (#500 ) from mso7nueh/eatvio_app:main into main 87d3f058f6

Reviewed-on: eatvio/eatvio_app#500

feat(userPurchases): added user purchases, fix(consultations): fixed consultations bug 483cf6d8ee

fix(diary): fixed app review issues 2584a70a09

fix: change baseUrl 2c3cc199c0

fix(chat&reg): fix chat screen, reg email valid 8c0efc1a34

fix(chat&reg): fix chat screen, reg email valid dc81085ae4

feat(userPurchases, consultantFinances): added status to models and layout for status 926f0de450

feat(dev-tools): Issue-441 11b695cefd

feat(chat&notifications): Issue-191 and Issue-440 and auth screen policy 9d1e621769

feat(chat&notifications): Issue-191 and Issue-440 and auth screen policy c0311bf213

Merge pull request 'Issue-440 & Issue-194 & build 27' (#503 ) from mso7nueh/eatvio_app:main into main 6bbec1f022

Reviewed-on: eatvio/eatvio_app#503

feat(permissions): added galery and camera permisshion checker f163608a90

merged upstram/main 4acb861b69

fix: testflight a84d2d7daa

Merge pull request 'fix: testflight' (#506 ) from mso7nueh/eatvio_app:main into main a98043758b

Reviewed-on: eatvio/eatvio_app#506

fix: testflight 319fd2dfe3

Merge pull request 'fix: testflight' (#507 ) from mso7nueh/eatvio_app:main into main 44d6487709

Reviewed-on: eatvio/eatvio_app#507

fix(chat): time 3b2c4fdff5

Merge pull request 'fix(chat): time Issue-440' (#509 ) from mso7nueh/eatvio_app:main into main a577a8d58a

Reviewed-on: eatvio/eatvio_app#509

Merge pull request 'fix(diary): fixed app review issues' (#502 ) from misha/eatvio_app:diaryFixes into main 9c004f8593

Reviewed-on: eatvio/eatvio_app#502

Merge pull request 'feat(consultantFinances), feat(userPurchases)' (#494 ) from misha/eatvio_app:main into main 896b2783ae

Reviewed-on: eatvio/eatvio_app#494

upd ver -> 28 41f948c8f7

Merge pull request 'upd ver -> 28' (#510 ) from mso7nueh/eatvio_app:main into main fa1192c5e5

Reviewed-on: eatvio/eatvio_app#510

feat(chat): Issue-440 add photo/file picker, fix black screen 0581da038a

fix: Issue-514 and Issue-497 ca296040f2

merge upstream d0426f6e1e

fix: Issue-514 BlackScreens + info for apple 7682859d32

Merge remote-tracking branch 'origin/main' b0c29345a2

# Conflicts:
#	lib/main.dart

fix(chat): Issue-440 chat v2 3b25e30b41

Merge pull request 'Issue-514 and Issue-497' (#516 ) from mso7nueh/eatvio_app:main into main fee92801b8

Reviewed-on: eatvio/eatvio_app#516

Merge pull request 'fix(chat): Issue-440 chat v2' (#519 ) from mso7nueh/eatvio_app:Issue-440 into main 84d52de935

Reviewed-on: eatvio/eatvio_app#519

feat(auth): reset password 84b88282ad

Merge pull request 'feat(auth): reset password' (#520 ) from mso7nueh/eatvio_app:Issue-497 into main 41ca97d030

Reviewed-on: eatvio/eatvio_app#520

feat(testflight): update version 2a705fdb66

Merge pull request 'feat(testflight): update version' (#521 ) from mso7nueh/eatvio_app:main into main 15ffb4a3ec

Reviewed-on: eatvio/eatvio_app#521

fix(chat): change sendChatMessage method 85d67ba9c4

Merge pull request 'fix(chat): change sendChatMessage method' (#524 ) from mso7nueh/eatvio_app:main into main c3647288a6

Reviewed-on: eatvio/eatvio_app#524

feat(chat): fix chat first message, add pick images from gallery 75fa9ebc5c

merge upstream f7e40e654d

feat(qr+devtools): scan qr code and dev tools 7530270a2e

Merge pull request 'feat(chat+qr+devtools): fix chat first message, add pick images from gallery, qrcode, devtools' (#526 ) from mso7nueh/eatvio_app:main into main d14fbbb8d3

Reviewed-on: eatvio/eatvio_app#526

fix(qr+menu): text 55bc361b05

fix: black screen 9c168d37ce

fix: auth 8c7c7f51cf

upd ver to 32 80afcd8949

Merge pull request 'fix: black screen Issue-514' (#528 ) from mso7nueh/eatvio_app:main into main 535dd595b7

Reviewed-on: eatvio/eatvio_app#528

feat(chat): add refresh in chats screen 87bf277248

feat(chat): add refresh when new message 9946abc0be

feat(testflight): new version c103d214c4

Merge pull request 'Issue-440: chat(s) screen' (#530 ) from mso7nueh/eatvio_app:main into main 2e5e1b3af4

Reviewed-on: eatvio/eatvio_app#530

feat(chat): add chat images/files preview 591a8a597d

Merge pull request 'feat(chat): add chat images/files preview' (#533 ) from mso7nueh/eatvio_app:main into main 9b4328a2ee

Reviewed-on: eatvio/eatvio_app#533

fix(chat): multi images 693260afb6

Merge pull request 'fix(chat): multi images' (#535 ) from mso7nueh/eatvio_app:main into main 300a708dfc

Reviewed-on: eatvio/eatvio_app#535

apoloz merged commit a16e78f804 into main

2025-06-30 07:23:35 +00:00

apoloz referenced this issue from a commit

2025-06-30 07:23:37 +00:00

Merge pull request 'main' (#2) from eatvio/eatvio_app:main into main

apoloz referenced this issue from a commit

2025-06-30 07:23:37 +00:00

Merge pull request 'sync main' (#2) from eatvio/eatvio_app:main into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: apoloz/eatvio_app#2

Allow edits from maintainers