Commit graph

246 commits

Author SHA1 Message Date
pakintada@gmail.com
09c21301d6 feat(merge_component): Add merge from website
Merge contents from patch selected by user into newer version

merge from client feature
2024-03-04 11:19:11 +07:00
pakintada@gmail.com
292c7697a4 fix(topping): 🐛 fix missing topping after saved
Ensure topping data in slots with padding if only use in some slots.

Topping saving
2024-03-02 13:22:23 +07:00
pakintada@gmail.com
517e051f2d fix(merge_component): 🚧 try fix delayed commit show
Try solving delayed commit show, WIP topping and string param display for commit modal
2024-03-02 11:15:48 +07:00
pakintada@gmail.com
ce7d595427 fix(diff_commit_merge): delayed commit data load condition 2024-03-01 14:33:48 +07:00
pakintada@gmail.com
da353cec84 add changes diffing modal & silence some logs 2024-03-01 00:22:28 +07:00
pakintada@gmail.com
148488e2c4 add new client deployment guide 2024-02-28 10:11:52 +07:00
pakintada@gmail.com
59190fc3f1 add update recipe repo guide 2024-02-27 15:01:19 +07:00
Kenta420
a12121fca6 update recipe viewer 2024-02-27 13:43:26 +07:00
pakintada@gmail.com
cf5b11b267 add deepCompare for merge, WIP merge 2024-02-23 16:50:21 +07:00
pakintada@gmail.com
ed7810cded change ignore fresh updated, do update after merge instead. 2024-02-23 16:48:23 +07:00
pakintada@gmail.com
fed315367a ⚠️ WIP migrating tmp to patch 2024-02-22 16:04:34 +07:00
pakintada@gmail.com
89ce1f361c add redis status check 2024-02-22 15:46:36 +07:00
Kenta420
f7f1535695 add recipe viewer 2024-02-21 15:17:54 +07:00
Kenta420
92b11f7b9d update filemanager navigation 2024-02-20 15:01:43 +07:00
Kenta420
11dc6b2132 Update filemanager (🚧 in construction) 2024-02-19 18:07:10 +07:00
Kenta420
0fe469b5c6 Fixed: fixed bug scrcpy and shell is disconnect when switch page 2024-02-19 14:24:05 +07:00
pakintada@gmail.com
9543d4541c adjust case sensitive MixOrder 2024-02-12 09:34:56 +07:00
pakintada@gmail.com
f4b1db4867 add mixOrder condition 2024-02-12 08:50:02 +07:00
pakintada@gmail.com
c9fd7baf9d test expose style 2024-02-09 17:02:02 +07:00
pakintada@gmail.com
8f09e50172 change to query param 2024-02-09 08:54:43 +07:00
pakintada@gmail.com
e9603026bf test change pos router 2024-02-09 07:36:50 +07:00
pakintada@gmail.com
52c70662a7 add debug route 2024-02-08 19:54:12 +07:00
pakintada@gmail.com
608d0a6c20 Merge branch 'main' of https://github.com/Poomipat-Ch/taobin_recipe_manager 2024-02-08 17:10:53 +07:00
pakintada@gmail.com
0d24907e9f test fix topping route 2024-02-08 17:09:36 +07:00
Kenta420
5cf54b76ab Add download zip file after click download 2024-02-08 17:01:08 +07:00
pakintada@gmail.com
adefe31090 fix switch department not change country 2024-02-08 16:40:06 +07:00
pakintada@gmail.com
d9a7961806 fix default broke material and topping route 2024-02-08 14:39:21 +07:00
pakintada@gmail.com
fb046dadf8 fix handle error redis 2024-02-08 13:58:11 +07:00
pakintada@gmail.com
679c7f85bf rm dir 2024-02-08 13:35:14 +07:00
pakintada@gmail.com
4003cf19fc rm head 2024-02-08 13:32:44 +07:00
pakintada@gmail.com
4aacc74e1a disable git module 2024-02-08 13:31:42 +07:00
pakintada@gmail.com
abfd27949f add set default if storage empty 2024-02-08 13:18:03 +07:00
pakintada@gmail.com
9ccea7f635 Fix routing when notfound 2024-02-08 11:26:16 +07:00
f38f894dce Merge branch 'fixNotShowDisable' of Mehhehhe/recipe-website into main 2024-02-08 09:50:26 +07:00
pakintada@gmail.com
08ffec8e24 fix not display disable material 2024-02-08 09:48:48 +07:00
14523da696 Merge branch 'fixSkip' of Mehhehhe/recipe-website into main 2024-02-08 09:27:30 +07:00
pakintada@gmail.com
a2f766a327 Merge branch 'main' of https://github.com/Poomipat-Ch/taobin_recipe_manager 2024-02-08 09:20:13 +07:00
pakintada@gmail.com
b3b55be388 fix skipping recipe list bug 2024-02-08 09:18:11 +07:00
Kenta420
c20d24c6ac Merge branch 'main' of github.com:Poomipat-Ch/taobin_recipe_manager 2024-02-07 18:25:22 +07:00
Kenta420
92fbf7eed6 Add download file 2024-02-07 18:25:11 +07:00
pakintada@gmail.com
ece4cef205 add topping recipe display & fix bugs 2024-02-07 15:39:19 +07:00
pakintada@gmail.com
7d6988f581 fix equipment incorrect category bug 2024-02-06 17:00:32 +07:00
pakintada@gmail.com
1d536309e1 add warning & default init recipelist 2024-02-06 16:35:39 +07:00
pakintada@gmail.com
18ea640282 addable & removable recipelist | savable topping & material WIP 2024-02-06 16:07:10 +07:00
pakintada@gmail.com
c0e9c62d85 Merge branch 'main' of https://github.com/Poomipat-Ch/taobin_recipe_manager 2024-02-05 17:18:20 +07:00
Kenta420
ac0f5bbeea re-implement scrcpy 2024-02-05 17:10:34 +07:00
pakintada@gmail.com
0604a3b77f Add redis. Prep for new save file 2024-02-05 17:07:04 +07:00
pakintada@gmail.com
6c22be7d7c Merge branch 'main' of https://github.com/Poomipat-Ch/taobin_recipe_manager 2024-02-05 16:43:11 +07:00
Kenta420
be417729ea add shell 2024-02-05 16:24:11 +07:00
pakintada@gmail.com
95a9bebb4a ignore this 2024-02-05 12:26:30 +07:00