Commit Graph

Select branches

Hide Pull Requests

Baghi/conflict

main

shadi/conflict

Mono Color

• 0468739cdc 1 main shadi/conflict hsafaei 2026-02-15 14:54:02 +0330
• c9921178b9 Merge branch 'shadi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main hsafaei 2026-02-14 19:29:30 +0330
• 990d31ced2 1 hsafaei 2026-02-14 19:29:21 +0330
• b09ead1f12 Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main Baghi/conflict hsafaei 2026-02-14 17:07:33 +0330
• dedd9c6d98 bcolor hsafaei 2026-02-14 17:07:27 +0330
• 6d651dd65a myHeaderToolsMultiselectClick Mehdi104797 2026-02-14 15:44:00 +0330
• 163da9f589 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict Baghi330 2026-02-14 16:59:01 +0330
• 5ae16d04ab 1 Baghi330 2026-02-14 16:56:54 +0330
• 44168bd5ec Merge remote-tracking branch 'origin/main' into Baghi/conflict Baghi330 2026-02-14 16:52:54 +0330
• 7205931f30 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict Baghi330 2026-02-14 16:52:36 +0330
• 7c684be671 toolbar Baghi330 2026-02-14 16:52:04 +0330
• 50cf02890a Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main hsafaei 2026-02-14 16:46:05 +0330
• 33c1ff1184 tag summary hsafaei 2026-02-14 16:45:52 +0330
• 214a840d8a readOnly Baghi330 2026-02-14 16:26:26 +0330
• 5cb4b9aff6 Merge remote-tracking branch 'origin/main' into Baghi/conflict Baghi330 2026-02-14 15:42:24 +0330
• 2d3534f731 children Baghi330 2026-02-14 15:36:24 +0330
• c46fe10219 login form build !!!! hsafaei 2026-02-14 15:10:22 +0330
• cca8dfc457 . Mehdi104797 2026-02-14 13:28:34 +0330
• aa659d8aa8 تغییرات Mehdi104797 2026-02-14 13:20:18 +0330
• bbdb5d8eca Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main hsafaei 2026-02-14 14:28:31 +0330
• f47a5100a2 1 hsafaei 2026-02-14 14:28:25 +0330
• 7fd8cb9a65 11 Baghi330 2026-02-14 14:27:36 +0330
• 82d71d0ede Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main hsafaei 2026-02-14 14:13:32 +0330
• 32a2bb9e13 Merge remote-tracking branch 'origin/main' into Baghi/conflict Baghi330 2026-02-14 14:13:05 +0330
• 48926cd9d4 1 Baghi330 2026-02-14 14:11:43 +0330
• b0df396a38 conflict_relation_identification hsafaei 2026-02-14 14:10:56 +0330
• 29c4120730 children hsafaei 2026-02-14 13:56:22 +0330
• d59355e6b8 console.log Baghi330 2026-02-14 13:40:56 +0330
• d69b74561c Merge branch 'main' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into shadi/conflict Mehdi104797 2026-02-14 10:09:05 +0330
• 79826b4a46 uepGetConflictDoc hsafaei 2026-02-14 13:30:05 +0330
• c9fe6b38c5 Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into shadi/conflict Mehdi104797 2026-02-14 10:06:41 +0330
• bb1e24f528 tiptap toolbar Baghi330 2026-02-14 13:30:03 +0330
• 27c0470e16 Merge remote-tracking branch 'origin/shadi/conflict' into Baghi/conflict Baghi330 2026-02-14 13:09:48 +0330
• c6c096b312 header sidebar Baghi330 2026-02-14 13:06:29 +0330
• 7de449e90c جستجو Mehdi104797 2026-02-14 10:06:25 +0330
• e148486f2d pagination درست کردن Mehdi104797 2026-02-14 09:29:48 +0330
• f88deee0c3 conflictSelected Baghi330 2026-02-14 11:16:55 +0330
• d3873be2b5 bug Baghi330 2026-02-14 11:04:51 +0330
• 7892a7cefb 1 Baghi330 2026-02-14 10:41:53 +0330
• cc647ffaba first commit Baghi330 2026-02-12 11:24:27 +0330