git/WizardMerge
1
0
Fork 0
mirror of https://github.com/johndoe6345789/WizardMerge.git synced 2026-04-24 13:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
65 Commits 8 Branches 2 Tags
0d6d29eef4043c9b9ae927f2c9a4cf8a29d37617
Commit Graph

65 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
copilot-swe-agent[bot]
0d6d29eef4 Add detailed documentation about JSON handling limitations in CLI 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:20:56 +00:00
copilot-swe-agent[bot]
51373a4576 Update .gitignore for frontend build artifacts and test CLI frontend 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:16:37 +00:00
copilot-swe-agent[bot]
d9324c6c9c Create multi-frontend architecture with qt6, nextjs, and cli frontends 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:10:33 +00:00
copilot-swe-agent[bot]
ef2f5896b7 Initial plan 2025-12-26 04:03:47 +00:00
johndoe6345789
19bed6e65d Merge pull request #14 from johndoe6345789/renovate/major-react-monorepo 
Update react monorepo to v19 (major)
 2025-12-26 04:02:13 +00:00
johndoe6345789
bf1b8606e5 Merge pull request #15 from johndoe6345789/renovate/ubuntu-24.x 
Update ubuntu Docker tag to v24
 2025-12-26 04:01:56 +00:00
renovate[bot]
f4e90fe3ae Update react monorepo to v19 2025-12-26 04:01:49 +00:00
johndoe6345789
ad0847fd3b Merge pull request #12 from johndoe6345789/renovate/major-nextjs-monorepo 
Update dependency next to v16
 2025-12-26 04:01:02 +00:00
johndoe6345789
1acbc7b5f2 Merge pull request #11 from johndoe6345789/renovate/node-24.x 
Update dependency @types/node to v24
 2025-12-26 04:00:45 +00:00
renovate[bot]
77e5262b3c Update ubuntu Docker tag to v24 2025-12-26 04:00:32 +00:00
johndoe6345789
2d56d1c609 Merge pull request #13 from johndoe6345789/copilot/convert-backend-to-drogon 
Convert backend from CLI to Drogon HTTP API server
 2025-12-26 03:59:38 +00:00
copilot-swe-agent[bot]
5c544fd9e6 Add comprehensive conversion summary documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:51:03 +00:00
copilot-swe-agent[bot]
e88e32b1e8 Fix code review issues: safer type conversions and error handling 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:48:48 +00:00
copilot-swe-agent[bot]
acf04ce8d5 Add API client examples and comprehensive documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:46:08 +00:00
copilot-swe-agent[bot]
d4aac99a21 Add Docker support and flexible build system for Drogon 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:44:16 +00:00
copilot-swe-agent[bot]
152f1e6a21 Convert backend to Drogon HTTP API server 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:40:20 +00:00
copilot-swe-agent[bot]
5ea670db23 Initial plan 2025-12-26 03:35:20 +00:00
renovate[bot]
528118bc30 Update dependency next to v16 2025-12-26 03:32:22 +00:00
renovate[bot]
e2b8ca342b Update dependency @types/node to v24 2025-12-26 03:32:19 +00:00
johndoe6345789
f508771654 Merge pull request #10 from johndoe6345789/copilot/implement-roadmap-md 
Replace Python skeleton with production C++/TypeScript architecture
 2025-12-26 03:31:21 +00:00
copilot-swe-agent[bot]
9c251974f0 Remove build artifacts from git tracking and update .gitignore 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:44:27 +00:00
copilot-swe-agent[bot]
8d83555466 Add comprehensive implementation summary documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:43:50 +00:00
copilot-swe-agent[bot]
e687410883 Fix frontend CSS: Replace Tailwind directives with plain CSS 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:41:10 +00:00
copilot-swe-agent[bot]
57d51c32e5 Add tests, update TLA+ spec, and add comprehensive build documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:39:07 +00:00
copilot-swe-agent[bot]
15e40ffd4c Implement Phase 1.1: Delete Python skeleton and create C++/TypeScript architecture 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:37:29 +00:00
copilot-swe-agent[bot]
155a8b896c Initial plan 2025-12-25 08:30:22 +00:00
johndoe6345789
a965ba94c0 Merge pull request #5 from johndoe6345789/copilot/improve-merge-conflict-resolution 
Add comprehensive roadmap with multi-frontend architecture and OCR'd research paper
 2025-12-25 08:24:53 +00:00
copilot-swe-agent[bot]
21a17d8760 Improve OCR script robustness and document dependencies 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:18:08 +00:00
copilot-swe-agent[bot]
807cc09240 Add OCR'd research paper and multi-frontend architecture to roadmap 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:15:40 +00:00
copilot-swe-agent[bot]
d6fb855a71 Update roadmap with evergreen timeline and more specific last updated date 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 07:07:43 +00:00
copilot-swe-agent[bot]
65911ac280 Update README to reference the new roadmap 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 07:06:15 +00:00
copilot-swe-agent[bot]
89a856bc73 Add comprehensive ROADMAP.md for WizardMerge development 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 07:05:29 +00:00
johndoe6345789
6d5650c4b2 Merge pull request #6 from johndoe6345789/renovate/actions-checkout-6.x 
Update actions/checkout action to v6
 2025-12-25 07:03:59 +00:00
johndoe6345789
06835b9712 Merge pull request #7 from johndoe6345789/renovate/actions-setup-java-5.x 
Update actions/setup-java action to v5
 2025-12-25 07:03:45 +00:00
renovate[bot]
764ab5e548 Update actions/setup-java action to v5 2025-12-25 07:02:47 +00:00
renovate[bot]
89103f40fe Update actions/checkout action to v6 2025-12-25 07:02:44 +00:00
johndoe6345789
329713a032 Merge pull request #4 from johndoe6345789/renovate/configure 
Configure Renovate
 2025-12-25 07:02:26 +00:00
copilot-swe-agent[bot]
99c0a6b83c Initial plan 2025-12-25 07:01:53 +00:00
renovate[bot]
5702a79547 Add renovate.json 2025-12-25 06:45:17 +00:00
JohnDoe6345789
3cf45c2e0f Update README.md 2025-11-27 21:25:50 +00:00
Richard Ward
df673d0d68 tidy 2025-11-27 21:18:23 +00:00
JohnDoe6345789
7e33fbd7d3 Create tlc.yml 2025-11-27 21:07:07 +00:00
JohnDoe6345789
090d637cd1 Rename setup.sh to scripts/setup.sh 2025-11-27 20:24:06 +00:00
JohnDoe6345789
5501892b6e Rename run_app.sh to scripts/run_app.sh 2025-11-27 20:23:53 +00:00
JohnDoe6345789
6983005181 Rename install_all_python.sh to scripts/install_all_python.sh 2025-11-27 20:23:38 +00:00
JohnDoe6345789
ec2dcb30c5 Rename extract_graphics.py to scripts/extract_graphics.py 2025-11-27 20:23:19 +00:00
JohnDoe6345789
9cb34d8d70 Rename wizardmerge.md to extracted_graphics/docs/wizardmerge.md 2025-11-27 20:22:57 +00:00
JohnDoe6345789
542c0280e2 Rename wizardmerge.pdf to extracted_graphics/docs/wizardmerge.pdf 2025-11-27 20:22:31 +00:00
JohnDoe6345789
4d307b9ade Rename wizardmerge.docx to extracted_graphics/docs/wizardmerge.docx 2025-11-27 20:22:05 +00:00
JohnDoe6345789
3c743c16d9 Add files via upload 2025-11-27 20:20:25 +00:00