mehdi shadi
  • Joined on 2024-07-09
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-15 11:25:30 +00:00
c9921178b9 Merge branch 'shadi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main
b09ead1f12 Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main
dedd9c6d98 bcolor
Compare 5 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 15:43:53 +00:00
6d651dd65a myHeaderToolsMultiselectClick
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 13:33:07 +00:00
163da9f589 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict
44168bd5ec Merge remote-tracking branch 'origin/main' into Baghi/conflict
7205931f30 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict
7c684be671 toolbar
Compare 11 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 13:28:26 +00:00
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 13:20:10 +00:00
aa659d8aa8 تغییرات
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 11:15:37 +00:00
bbdb5d8eca Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main
82d71d0ede Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main
Compare 3 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 11:02:18 +00:00
32a2bb9e13 Merge remote-tracking branch 'origin/main' into Baghi/conflict
b0df396a38 conflict_relation_identification
29c4120730 children
Compare 6 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 10:08:57 +00:00
d69b74561c Merge branch 'main' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into shadi/conflict
79826b4a46 uepGetConflictDoc
Compare 2 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 10:06:33 +00:00
c9fe6b38c5 Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into shadi/conflict
bb1e24f528 tiptap toolbar
27c0470e16 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict
c6c096b312 header sidebar
Compare 4 commits »
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 10:06:20 +00:00
7de449e90c جستجو
shadi created branch shadi/conflict in Baghi/conflict-nuxt-4 2026-02-14 09:37:29 +00:00
shadi pushed to shadi/conflict at Baghi/conflict-nuxt-4 2026-02-14 09:37:29 +00:00
e148486f2d pagination درست کردن