group-2-threaded-project-petshop

RecentRunner/group-2-threaded-project-petshop

Fork 0

Commit Graph

Select branches

Hide Pull Requests

local-dev

main

#108

#133

#134

#135

#138

#139

#141

#142

#143

#144

#145

#146

#152

#154

#155

#156

#158

#160

#161

#162

#163

#164

#168

#169

#170

#171

#172

#251

#252

#253

#254

#266

#267

#268

#274

#275

#278

#28

#280

#29

#296

#297

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#320

#322

#324

#325

#326

#335

#336

#337

#338

#47

#48

#50

#52

#53

#54

#55

#56

#57

#58

#59

#60

#75

914e0bceda Points now subtract from costs augmentedpotato 2026-04-15 02:44:14 -06:00
dfc3d627c8 Points now subtract from costs augmentedpotato 2026-04-15 02:44:14 -06:00
7ad35bd2dc Merge branch 'AttachmentsToChat' Alex 2026-04-15 02:15:16 -06:00
10ddb4ffdd Merge branch 'AttachmentsToChat' Alex 2026-04-15 02:15:16 -06:00
1163961b90 fixed product supplier android Alex 2026-04-15 02:14:20 -06:00
7f5b0cceb1 fixed product supplier android Alex 2026-04-15 02:14:20 -06:00
a2c8df16b7 added filtering to activity logs for desktop Alex 2026-04-15 02:10:20 -06:00
73b99b4aa0 added filtering to activity logs for desktop Alex 2026-04-15 02:10:20 -06:00
a23171359f turned logs to laymen terms and added to android Alex 2026-04-15 01:52:35 -06:00
0cf7144387 turned logs to laymen terms and added to android Alex 2026-04-15 01:52:35 -06:00
404f162728 Merge pull request #304 from RecentRunner/web-coupons Harkamal 2026-04-15 01:39:43 -06:00
47f60dc309 Merge pull request #304 from RecentRunner/web-coupons Harkamal 2026-04-15 01:39:43 -06:00
bd7368f0cf Merge pull request #303 from RecentRunner/chat-ui-updates Harkamal 2026-04-15 01:37:52 -06:00
cae0f23522 Merge pull request #303 from RecentRunner/chat-ui-updates Harkamal 2026-04-15 01:37:52 -06:00
fb7d71c86e unify ai and live chat Harkamal Randhawa 2026-04-15 01:35:54 -06:00
b029500553 unify ai and live chat Harkamal Randhawa 2026-04-15 01:35:54 -06:00
2c1871b6e2 loyalty points augmentedpotato 2026-04-15 01:34:49 -06:00
da115fd824 loyalty points augmentedpotato 2026-04-15 01:34:49 -06:00
f22a187148 always show chat sidebar Harkamal Randhawa 2026-04-15 01:31:29 -06:00
03c8033540 always show chat sidebar Harkamal Randhawa 2026-04-15 01:31:29 -06:00
28ccf8b96d Merge pull request #302 from RecentRunner/web-features Harkamal 2026-04-15 01:25:47 -06:00
d34c8f34ca Merge pull request #302 from RecentRunner/web-features Harkamal 2026-04-15 01:25:47 -06:00
377439495c fix web chat features Harkamal Randhawa 2026-04-15 01:23:15 -06:00
638b15fb40 fix web chat features Harkamal Randhawa 2026-04-15 01:23:15 -06:00
c8a1c29cc3 removed status on purchase order android Alex 2026-04-15 01:09:56 -06:00
7b176fe938 removed status on purchase order android Alex 2026-04-15 01:09:56 -06:00
3214d3893b fix chat scroll and button Harkamal Randhawa 2026-04-15 01:09:09 -06:00
f9cd2ed758 fix chat scroll and button Harkamal Randhawa 2026-04-15 01:09:09 -06:00
5817f82b77 fix contact form style Harkamal Randhawa 2026-04-15 00:56:24 -06:00
873c1bbb38 fix contact form style Harkamal Randhawa 2026-04-15 00:56:24 -06:00
ad63a314c9 add store images Harkamal Randhawa 2026-04-15 00:55:08 -06:00
db756d95c4 add store images Harkamal Randhawa 2026-04-15 00:55:08 -06:00
1636ba14b6 Coupon system working properly augmentedpotato 2026-04-15 00:54:46 -06:00
3f5add59e8 Coupon system working properly augmentedpotato 2026-04-15 00:54:46 -06:00
0315920b0d Merge pull request #301 from RecentRunner/web-fixes Harkamal 2026-04-15 00:49:04 -06:00
14e4f4ca72 Merge pull request #301 from RecentRunner/web-fixes Harkamal 2026-04-15 00:49:04 -06:00
4643feb868 added pagenation to android for each fragment Alex 2026-04-15 00:46:32 -06:00
6a082fc8f1 added pagenation to android for each fragment Alex 2026-04-15 00:46:32 -06:00
a3eff2e738 contact form with email Harkamal Randhawa 2026-04-15 00:46:32 -06:00
0e1eb056a4 contact form with email Harkamal Randhawa 2026-04-15 00:46:32 -06:00
2e13c0cea0 web issue fixes Harkamal Randhawa 2026-04-15 00:44:07 -06:00
f45330a451 web issue fixes Harkamal Randhawa 2026-04-15 00:44:07 -06:00
023fdf5ee9 web fixes Harkamal Randhawa 2026-04-15 00:38:04 -06:00
3111553009 web fixes Harkamal Randhawa 2026-04-15 00:38:04 -06:00
7d3cc51c8f Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop Harkamal Randhawa 2026-04-15 00:27:49 -06:00
51a03fe2c5 Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop Harkamal Randhawa 2026-04-15 00:27:49 -06:00
fe8fdafdd8 Merge pull request #300 from RecentRunner/web-pwreset Harkamal 2026-04-15 00:27:40 -06:00
95d4c84ed8 Merge pull request #300 from RecentRunner/web-pwreset Harkamal 2026-04-15 00:27:40 -06:00
024a618473 fixed issue for desktop when sending a file too large Alex 2026-04-15 00:27:06 -06:00
f66eb12729 fixed issue for desktop when sending a file too large Alex 2026-04-15 00:27:06 -06:00
f194d7ca78 Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop Harkamal Randhawa 2026-04-15 00:18:43 -06:00
bbecc168a0 Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop Harkamal Randhawa 2026-04-15 00:18:43 -06:00
755fa092c2 password reset augmentedpotato 2026-04-15 00:17:26 -06:00
535004bced password reset augmentedpotato 2026-04-15 00:17:26 -06:00
8cf12d32d3 merge azure-deploy Harkamal Randhawa 2026-04-15 00:14:09 -06:00
6788afc3d2 merge azure-deploy Harkamal Randhawa 2026-04-15 00:14:09 -06:00
017ef65b5a desktop chat now shows images Alex 2026-04-15 00:00:17 -06:00
3167e2c68b desktop chat now shows images Alex 2026-04-15 00:00:17 -06:00
934a857cdf document BACKEND_URL swap Harkamal Randhawa 2026-04-14 23:46:38 -06:00
13ce9a9cc7 document BACKEND_URL swap Harkamal Randhawa 2026-04-14 23:46:38 -06:00
6c4fc20870 add desktop backend config Harkamal Randhawa 2026-04-14 23:46:21 -06:00
1dc87b0c06 add desktop backend config Harkamal Randhawa 2026-04-14 23:46:21 -06:00
be697f080e Merge branch 'AttachmentsToChat' Alex 2026-04-14 23:43:39 -06:00
5cf5265451 Merge branch 'AttachmentsToChat' Alex 2026-04-14 23:43:39 -06:00
6235f96def added time stamp and sender name to android chat Alex 2026-04-14 23:42:23 -06:00
1114982553 added time stamp and sender name to android chat Alex 2026-04-14 23:42:23 -06:00
4f6a6f71ed fixed chat messaging on same account with different devices Alex 2026-04-14 23:34:07 -06:00
7847bf19cc fixed chat messaging on same account with different devices Alex 2026-04-14 23:34:07 -06:00
de37b27fcc Merge remote-tracking branch 'origin/main' into azure-deploy Harkamal Randhawa 2026-04-14 23:32:16 -06:00
e16e7f5f22 Merge remote-tracking branch 'origin/main' into azure-deploy Harkamal Randhawa 2026-04-14 23:32:16 -06:00
0b244938cf Merge pull request #299 from RecentRunner/web-v1 Harkamal 2026-04-14 23:29:51 -06:00
f940ac4c10 Merge pull request #299 from RecentRunner/web-v1 Harkamal 2026-04-14 23:29:51 -06:00
9cc2da6b92 merge main Harkamal Randhawa 2026-04-14 23:29:46 -06:00
a4beb245a4 merge main Harkamal Randhawa 2026-04-14 23:29:46 -06:00
08c8e54b2d Merge branch 'AttachmentsToChat' Alex 2026-04-14 23:20:16 -06:00
2151ac56cd Merge branch 'AttachmentsToChat' Alex 2026-04-14 23:20:16 -06:00
3ee259abfd lazy init Harkamal Randhawa 2026-04-14 23:19:34 -06:00
ca3e272fd9 lazy init Harkamal Randhawa 2026-04-14 23:19:34 -06:00
42a4bcd104 made admin analyics able to select store Alex 2026-04-14 23:17:12 -06:00
c5a59e8de3 made admin analyics able to select store Alex 2026-04-14 23:17:12 -06:00
ec0d2d1ec7 added personal and store analytics Alex 2026-04-14 23:10:03 -06:00
1b4a96c923 added personal and store analytics Alex 2026-04-14 23:10:03 -06:00
6aac0c6366 Merge remote-tracking branch 'origin/main' into azure-deploy Harkamal Randhawa 2026-04-14 23:06:48 -06:00
1b873f7012 Merge remote-tracking branch 'origin/main' into azure-deploy Harkamal Randhawa 2026-04-14 23:06:48 -06:00
1a51f16ee0 show error details Harkamal Randhawa 2026-04-14 22:56:54 -06:00
0c9feefeb5 show error details Harkamal Randhawa 2026-04-14 22:56:54 -06:00
7340a5616e Changed android phone validation Alex 2026-04-14 22:53:42 -06:00
08337145f0 Changed android phone validation Alex 2026-04-14 22:53:42 -06:00
dea1caafd6 runtime backend proxy Harkamal Randhawa 2026-04-14 22:52:01 -06:00
88bf6f8428 runtime backend proxy Harkamal Randhawa 2026-04-14 22:52:01 -06:00
d35c820967 use middleware for runtime backend proxy Harkamal Randhawa 2026-04-14 22:48:00 -06:00
a241024ced use middleware for runtime backend proxy Harkamal Randhawa 2026-04-14 22:48:00 -06:00
9c47f5ac76 added staff and customer images to desktop Alex 2026-04-14 22:43:24 -06:00
7baa780c7f added staff and customer images to desktop Alex 2026-04-14 22:43:24 -06:00
aca52efc44 maade it so sales display points earned Alex 2026-04-14 22:33:10 -06:00
2b4fcfe24c maade it so sales display points earned Alex 2026-04-14 22:33:10 -06:00
6848ab3586 implemented forget password for desktop Alex 2026-04-14 22:15:15 -06:00
b7d6adc1cc implemented forget password for desktop Alex 2026-04-14 22:15:15 -06:00
b3547b2971 fixed chat loading issue andriod Alex 2026-04-14 22:08:14 -06:00
01cce24997 fixed chat loading issue andriod Alex 2026-04-14 22:08:14 -06:00

... 2 3 4 5 6 ...