Commit Graph

27 Commits

Author SHA1 Message Date
Mehdi104797
6d651dd65a myHeaderToolsMultiselectClick 2026-02-14 15:44:00 +03:30
Baghi330
163da9f589 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict 2026-02-14 16:59:01 +03:30
Baghi330
44168bd5ec Merge remote-tracking branch 'origin/main' into Baghi/conflict 2026-02-14 16:52:54 +03:30
Baghi330
7205931f30 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict 2026-02-14 16:52:36 +03:30
50cf02890a Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main 2026-02-14 16:46:05 +03:30
33c1ff1184 tag summary 2026-02-14 16:45:52 +03:30
Baghi330
5cb4b9aff6 Merge remote-tracking branch 'origin/main' into Baghi/conflict 2026-02-14 15:42:24 +03:30
Baghi330
2d3534f731 children 2026-02-14 15:36:24 +03:30
c46fe10219 login form build !!!! 2026-02-14 15:10:22 +03:30
bbdb5d8eca Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main 2026-02-14 14:28:31 +03:30
f47a5100a2 1 2026-02-14 14:28:25 +03:30
Baghi330
7fd8cb9a65 11 2026-02-14 14:27:36 +03:30
82d71d0ede Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main 2026-02-14 14:13:32 +03:30
Baghi330
32a2bb9e13 Merge remote-tracking branch 'origin/main' into Baghi/conflict 2026-02-14 14:13:05 +03:30
Baghi330
48926cd9d4 1 2026-02-14 14:11:43 +03:30
b0df396a38 conflict_relation_identification 2026-02-14 14:10:56 +03:30
29c4120730 children 2026-02-14 13:56:22 +03:30
79826b4a46 uepGetConflictDoc 2026-02-14 13:30:05 +03:30
Mehdi104797
cca8dfc457 . 2026-02-14 13:28:34 +03:30
Mehdi104797
aa659d8aa8 تغییرات 2026-02-14 13:20:18 +03:30
Baghi330
f88deee0c3 conflictSelected 2026-02-14 11:16:55 +03:30
Baghi330
d3873be2b5 bug 2026-02-14 11:04:51 +03:30
Baghi330
7892a7cefb 1 2026-02-14 10:41:53 +03:30
Mehdi104797
d69b74561c Merge branch 'main' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into shadi/conflict 2026-02-14 10:09:05 +03:30
Mehdi104797
7de449e90c جستجو 2026-02-14 10:06:25 +03:30
Mehdi104797
e148486f2d pagination درست کردن 2026-02-14 09:29:48 +03:30
Baghi330
cc647ffaba first commit 2026-02-12 11:24:27 +03:30