admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,243 Commits 1,012 Branches 0 Tags
da2bec67bf26339c230c8bfe36ddcf5035cc0ed7
Commit Graph

6243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
da2bec67bf Merged in release/2024-11-22 (pull request #1976) 
feature/IO-3000-messaging-sockets-migration2 -
 2024-11-29 16:58:32 +00:00
Dave Richer
51a1b48da9 Merge remote-tracking branch 'origin/feature/IO-3000-messaging-sockets-migrationv2' into release/2024-11-22 2024-11-28 12:27:39 -08:00
Dave Richer
648a9b8f64 feature/IO-3000-messaging-sockets-migration2 - 
- Small change

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 12:27:06 -08:00
Dave Richer
f3d8ca5711 Merged in release/2024-11-22 (pull request #1975) 
Release/2024 11 22 into test-AIO - IO-3000
 2024-11-28 20:18:56 +00:00
Dave Richer
7402679091 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1974) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-28 20:16:43 +00:00
Dave Richer
627174b7d3 feature/IO-3000-messaging-sockets-migration2 - 
- Bring back subscription for fallback

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 12:14:35 -08:00
Patrick Fic
9fcc01aa9f IO-3000 FInal updates to firebase SW. 2024-11-28 12:11:30 -08:00
Patrick Fic
cb46ee5700 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1973) 
IO-3000 update firebase js version, and add back testing route.
 2024-11-28 19:41:05 +00:00
Patrick Fic
299d838ab9 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1972) 
IO-3000 update firebase js version, and add back testing route.
 2024-11-28 19:40:46 +00:00
Patrick Fic
43bf1fc8cf IO-3000 update firebase js version, and add back testing route. 2024-11-28 11:39:17 -08:00
Patrick Fic
e3340fe408 Merged in release/2024-11-22 (pull request #1971) 
IO-3000 Add back FCM notification subscribe
 2024-11-28 19:06:36 +00:00
Patrick Fic
73af18f287 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1970) 
IO-3000 Add back FCM notification subscribe
 2024-11-28 19:06:17 +00:00
Patrick Fic
90f4977924 IO-3000 Add back FCM notification subscribe 2024-11-28 11:05:50 -08:00
Dave Richer
79a9b534f9 Merged in release/2024-11-22 (pull request #1969) 
Release/2024 11 22 into test-AIO IO-3000
 2024-11-28 18:02:46 +00:00
Dave Richer
c3b184d17b Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1968) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-28 18:02:13 +00:00
Dave Richer
db5740d487 feature/IO-3000-messaging-sockets-migration2 - 
- Various work

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 09:57:35 -08:00
Dave Richer
08c0da1bed feature/IO-3000-messaging-sockets-migration2 - 
- Various work

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 09:10:23 -08:00
Patrick Fic
9a49d1c69e Merged in release/2024-11-22 (pull request #1967) 
Release/2024 11 22 - IO-3040 IO-3001
 2024-11-28 15:57:01 +00:00
Allan Carr
4d35976241 Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1965) 
IO-3040 Report Selector Date Range Restriction for Prod

Approved-by: Patrick Fic
 2024-11-28 15:56:25 +00:00
Allan Carr
5edbed3f0b Merged in feature/IO-3001-us-est-scrubbing (pull request #1966) 
IO-3001 Correct Commenting of Button
 2024-11-28 15:55:59 +00:00
Allan Carr
3d79be06de IO-3001 Correct Commenting of Button 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 18:02:28 -08:00
Allan Carr
fd9e7b4d4b IO-3040 Report Selector Date Range Restriction for Prod 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 16:24:10 -08:00
Dave Richer
352551e421 Merged in release/2024-11-22 (pull request #1964) 
Release/2024 11 22
 2024-11-27 22:10:10 +00:00
Dave Richer
2937a07379 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1963) 
feature/IO-3000-messaging-sockets-migration2 -
 2024-11-27 22:09:27 +00:00
Dave Richer
ad1761096a feature/IO-3000-messaging-sockets-migration2 - 
- found small thing

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 14:08:52 -08:00
Patrick Fic
6a7548d11b Merged in feature/IO-2920-cash-discounting (pull request #1962) 
IO-2920 Rever test URL to correct value for intellipay.
 2024-11-27 21:17:56 +00:00
Patrick Fic
affbb3f168 IO-2920 Rever test URL to correct value for intellipay. 2024-11-27 13:15:03 -08:00
Dave Richer
bf5c61bd86 Merged in release/2024-11-22 (pull request #1961) 
Release/2024 11 22
 2024-11-27 19:37:03 +00:00
Dave Richer
0522747b49 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1960) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-27 19:36:29 +00:00
Dave Richer
aec7b40ae2 feature/IO-3000-messaging-sockets-migration2 - 
-misc

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 11:35:28 -08:00
Dave Richer
54d319f1e8 Merge remote-tracking branch 'origin/release/2024-11-22' into feature/IO-3000-messaging-sockets-migrationv2 2024-11-27 11:30:39 -08:00
Dave Richer
8d6fba2b61 feature/IO-3000-messaging-sockets-migration2 - 
-misc

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 11:27:34 -08:00
Dave Richer
70c31eae9e feature/IO-3000-messaging-sockets-migration2 - 
- [EXISTING BUG?] The updated at timeframes do not automatically update as time passes. If you receive a message, and it is changed to a few seconds ago, if you wait a few minutes, it does not change unless you interact with it forcing a re-render. This can be solved by adding a tick state and periodically refreshing - unsure of the performance impact for many elements however.

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 10:21:53 -08:00
Dave Richer
5e871b024d feature/IO-3000-messaging-sockets-migration2 - 
- Polling Mode indicator now pegged to socket.connected

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 10:13:38 -08:00
Dave Richer
f8902efcea Merged in release/2024-11-22 (pull request #1959) 
Release/2024 11 22
 2024-11-27 18:03:54 +00:00
Dave Richer
eb1786d634 Merged in feature/IO-2959-crisp-status-page (pull request #1958) 
IO-2959 Remove debug for crisp status and add sig term handler.
 2024-11-27 18:03:02 +00:00
Patrick Fic
5e8d0fddbd IO-2959 Remove debug for crisp status and add sig term handler. 2024-11-27 09:44:42 -08:00
Allan Carr
5d690fd71f Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1956) 
Feature/IO-3040 Report Selector Date Range Restriction

Approved-by: Dave Richer
 2024-11-27 16:48:07 +00:00
Allan Carr
79a2d902cd Merged in feature/IO-3037-Supplement-Existing-Lines (pull request #1957) 
IO-3037 Supplement Existing Lines

Approved-by: Dave Richer
 2024-11-27 16:47:52 +00:00
Allan Carr
77f340d08c IO-3037 Supplement Existing Lines 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 08:40:55 -08:00
Allan Carr
0770e7b50d IO-3040 Re-add Translations after Merge from Release 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-26 16:12:03 -08:00
Allan Carr
3147212b7b Merge branch 'release/2024-11-22' into feature/IO-3040-Report-Selector-Date-Range-Restriction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/translations/en_us/common.json
#	client/src/translations/es/common.json
#	client/src/translations/fr/common.json
 2024-11-26 16:10:03 -08:00
Allan Carr
24cc9762b2 IO-3040 Report Selector Date Range Restriction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-26 15:04:39 -08:00
Patrick Fic
3183baf560 Merged in release/2024-11-22 (pull request #1955) 
Release/2024 11 22
 2024-11-26 18:48:52 +00:00
Dave Richer
2d5153da5b Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1948) 
Feature/IO-3000 messaging sockets migrationv2 - Enhanced Socket Migrations

Approved-by: Patrick Fic
 2024-11-26 18:48:17 +00:00
Dave Richer
083534c3f3 Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 10:30:16 -08:00
Dave Richer
63397769d2 feature/IO-3000-messaging-sockets-migration2 - Take last conversation if more than one exists. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-26 10:29:57 -08:00
Dave Richer
b5b7957b2f Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 17:56:41 +00:00
Patrick Fic
d50c73c82f Merged in feature/IO-2959-crisp-status-page (pull request #1954) 
Feature/IO-2959 crisp status page
 2024-11-26 16:53:57 +00:00
Patrick Fic
a4bff1a548 IO-2959 Implement logger & best practices. 2024-11-26 08:52:58 -08:00