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 |
|
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 |
|
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 |
|
Dave Richer
|
5f1daffb3e
|
Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2
|
2024-11-26 08:39:41 -08:00 |
|
Dave Richer
|
e9dfba7d31
|
feature/IO-3000-messaging-sockets-migration2 - Extra checks on scroll to index to prevent console warns when no messages exist in the conversation.
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-26 08:39:21 -08:00 |
|
Dave Richer
|
2f0838b39c
|
Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2
|
2024-11-26 15:30:41 +00:00 |
|
Dave Richer
|
d8311c5163
|
feature/IO-3000-messaging-sockets-migration2 - remove unused dep
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-26 07:00:54 -08:00 |
|
Patrick Fic
|
62e4843d5b
|
Merged in master-AIO (pull request #1953)
Merge Master into release to update.
|
2024-11-25 23:46:46 +00:00 |
|
Patrick Fic
|
6058bb1b8f
|
IO-2959 Add Crisp Status Reporter to API.
|
2024-11-25 15:44:15 -08:00 |
|
Patrick Fic
|
fa6c672583
|
Merge branch 'feature/IO-2920-cash-discounting' into release/2024-11-22
|
2024-11-25 14:15:37 -08:00 |
|
Patrick Fic
|
cb4d4e4c2c
|
IO-2920 Remove shop config for intellipay amounts.
|
2024-11-25 14:09:09 -08:00 |
|
Patrick Fic
|
225b57fd58
|
IO-2920 Update checkfee method to get CC amount based on new information.
|
2024-11-25 14:08:38 -08:00 |
|
Dave Richer
|
e1ffcba32f
|
Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2
|
2024-11-25 13:45:25 -08:00 |
|
Dave Richer
|
5c30f33dac
|
feature/IO-3000-messaging-sockets-migration2 - Additional logging
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 13:45:09 -08:00 |
|
Dave Richer
|
13908074c6
|
Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2
|
2024-11-25 21:33:59 +00:00 |
|
Dave Richer
|
c3c66f9646
|
feature/IO-3000-messaging-sockets-migration2 - Final Modifications
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 12:46:10 -08:00 |
|
Dave Richer
|
62dd3d7e8e
|
feature/IO-3000-messaging-sockets-migration2 - Final fixes around sync / archive / receive
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 11:38:59 -08:00 |
|
Patrick Fic
|
268b1ba9c1
|
IO-2920 Refactor fee discounting to use API to check.
|
2024-11-25 10:51:48 -08:00 |
|
Dave Richer
|
239c1502f9
|
feature/IO-3000-messaging-sockets-migration2 - Fix console warn in archive/unarchive if one query is not existent
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 09:57:18 -08:00 |
|
Dave Richer
|
457a3b2d7a
|
feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 08:42:02 -08:00 |
|
Dave Richer
|
5e2c0f9c4a
|
feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 08:38:07 -08:00 |
|
Dave Richer
|
cbc8665636
|
feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-25 08:36:33 -08:00 |
|
Allan Carr
|
f6506d6073
|
Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1949)
IO-2921 Chatter Final mods and Cron Trigger
Approved-by: Dave Richer
|
2024-11-22 19:50:27 +00:00 |
|
Allan Carr
|
91de311351
|
IO-2921 Chatter Final mods and Cron Trigger
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-11-22 10:55:19 -08:00 |
|
Dave Richer
|
49044e5669
|
feature/IO-3000-messaging-sockets-migrations2 -
- Missed a check
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-22 10:03:41 -08:00 |
|
Dave Richer
|
8adaa12618
|
feature/IO-3000-messaging-sockets-migrations2 -
- Merge release / fix conflicts
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-22 10:02:05 -08:00 |
|
Patrick Fic
|
36aad0f140
|
Merged in feature/IO-3001-us-est-scrubbing (pull request #1942)
feature/IO-3001-us-est-scrubbing
|
2024-11-22 17:18:47 +00:00 |
|
Patrick Fic
|
11ab7cd67e
|
IO-3001 Null Coalesce for some items for better handling.
|
2024-11-22 09:18:09 -08:00 |
|
Dave Richer
|
3ab471e629
|
feature/IO-3000-messaging-sockets-migrations2 -
- Final fix of unread messagages
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-22 08:23:24 -08:00 |
|
Dave Richer
|
6504b27eca
|
feature/IO-3000-messaging-sockets-migrations2 -
- A lot of a lot of testing....
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 22:14:39 -08:00 |
|
Allan Carr
|
d40579694f
|
Merged in hotfix/2024-11-21 (pull request #1947)
Hotfix/2024 11 21 IO-2921 IO-3027
|
2024-11-22 04:41:29 +00:00 |
|
Allan Carr
|
fa24d87966
|
Merged in feature/IO-3027-Datapumps-Refactor (pull request #1945)
Feature/IO-3027 Datapumps Refactor
|
2024-11-22 04:40:01 +00:00 |
|
Allan Carr
|
1b6eab8488
|
Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1946)
Feature/IO-2921 CARSTAR Canada Chatter Integration
|
2024-11-22 04:39:49 +00:00 |
|
Allan Carr
|
e15e92c112
|
Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1944)
IO-2921 Chatter Datapump Adjustment
|
2024-11-22 04:39:27 +00:00 |
|
Allan Carr
|
fba8cab98a
|
Merged in feature/IO-3027-Datapumps-Refactor (pull request #1943)
IO-3027 Datapump Refactor
|
2024-11-22 04:39:06 +00:00 |
|
Dave Richer
|
141deff41e
|
feature/IO-3000-messaging-sockets-migrations2 -
- harden openMessageByPhone
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 19:37:25 -08:00 |
|
Dave Richer
|
12ed8d3830
|
feature/IO-3000-messaging-sockets-migrations2 -
- dumb down archive/unarchive
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 19:21:51 -08:00 |
|
Dave Richer
|
525f795ce0
|
feature/IO-3000-messaging-sockets-migrations2 -
- dumb down archive/unarchive
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 19:17:42 -08:00 |
|
Dave Richer
|
38f13346e5
|
feature/IO-3000-messaging-sockets-migrations2 -
- testing and edge cases
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 18:44:38 -08:00 |
|
Dave Richer
|
8229e3593c
|
feature/IO-3000-messaging-sockets-migrations2 -
- remove unused query,
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 17:39:05 -08:00 |
|
Dave Richer
|
d2e1b32557
|
feature/IO-3000-messaging-sockets-migrations2 -
- Checkpoint,
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-11-21 17:35:04 -08:00 |
|
Allan Carr
|
e202bf9a89
|
IO-3027 Add in bodyshop.id to logging in SFTP
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-11-21 16:18:23 -08:00 |
|
Allan Carr
|
1a6e8bc5ba
|
Merge branch 'release/2024-11-22' into feature/IO-2921-CARSTAR-Canada-Chatter-Integration
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
# Conflicts:
# server/data/chatter.js
|
2024-11-21 15:09:46 -08:00 |
|