Commit graph

15843 commits

Author SHA1 Message Date
David Bomba
db47163eb3 Fixes for conflicts 2023-02-18 08:30:59 +11:00
David Bomba
fb36a6052f Fixes for conflicts 2023-02-18 08:24:33 +11:00
David Bomba
6b22ccd13b Fixes for conflicts 2023-02-18 08:15:41 +11:00
David Bomba
746d5ce67f Reducing the quantity of jobs dispatched
(cherry picked from commit 1de91c9e33)
2023-02-17 20:01:34 +11:00
David Bomba
42bc2ed5b9 Fixes for displaying negative currencies
(cherry picked from commit 681fc47a68)
2023-02-17 17:21:12 +11:00
David Bomba
8eb3433912 Update naming of email statement scheduler
(cherry picked from commit 2f3cee2fc2)
2023-02-17 16:06:55 +11:00
David Bomba
3c5fe85011 Update purchase.php 2023-02-17 16:06:07 +11:00
David Bomba
02b84688e5 Move google play listener in place
(cherry picked from commit d4943703c8)
2023-02-17 16:05:27 +11:00
David Bomba
baf5912361 minor fixes for play store
(cherry picked from commit 93a9e207ee)
2023-02-17 16:04:00 +11:00
David Bomba
69b8a85b83 minor fixes for play store 2023-02-17 15:23:24 +11:00
David Bomba
4fa5a51314 Add ide helper 2023-02-17 15:10:13 +11:00
David Bomba
9c8d9943f7 Run GH actions on stable branch 2023-02-17 15:09:23 +11:00
David Bomba
7a0d4bb4e3 Fixes for webhooks 2023-02-17 15:08:09 +11:00
David Bomba
0fcaac66eb Remove unnessary touching of file
(cherry picked from commit 7f1a984848)
2023-02-17 15:05:30 +11:00
David Bomba
79b014c752 Ensure when merging, we purge empty contacts
(cherry picked from commit 75335ba8e4)
2023-02-17 15:05:12 +11:00
David Bomba
528f8c7b40 Minor fix for bulk purchase order download file naming
(cherry picked from commit 94670413ab)
2023-02-17 15:04:54 +11:00
David Bomba
3c2f65ea09 Point releases to v5-develop
(cherry picked from commit 2e6a47c388)
2023-02-17 15:04:38 +11:00
David Bomba
23f9679e24 fixes for conflicts 2023-02-17 15:04:20 +11:00
David Bomba
4b2afcdec3 Remove mail css inliner 2023-02-17 15:02:36 +11:00
David Bomba
e2a49d1302 Add buildCache to clientcontact
(cherry picked from commit e5017299c6)
2023-02-17 08:39:43 +11:00
David Bomba
38f23f1473 Remove mail css inliner
(cherry picked from commit 995cf73bde)
2023-02-17 08:39:32 +11:00
David Bomba
20ea75b125 Updates for Task Status
(cherry picked from commit 342f33b5e1)
2023-02-16 07:57:32 +11:00
David Bomba
04620c2fd1 Fixes for tests
(cherry picked from commit 1e5b96ddad)
2023-02-16 07:57:06 +11:00
David Bomba
0d0ec8d904 Fixes for tests
(cherry picked from commit d1a35510e9)
2023-02-16 07:56:49 +11:00
David Bomba
b127cbfc5e Clean up for access permissions
(cherry picked from commit 7787d1f653)
2023-02-16 07:56:36 +11:00
David Bomba
503e2aa568 Remove predis 2
(cherry picked from commit 5617e5708c)
2023-02-16 07:56:18 +11:00
David Bomba
6f139f9c44 Minor fixes
(cherry picked from commit 1a3d5420ed)
2023-02-16 07:54:46 +11:00
David Bomba
ab5bf084fa Fixes for base redirect
(cherry picked from commit a8362762cf)
2023-02-16 07:54:34 +11:00
David Bomba
238e2092ac Small patch
(cherry picked from commit e75954b5c8)
2023-02-16 07:54:16 +11:00
David Bomba
692a419c57 Set translations for login link
(cherry picked from commit 6fc84d7b9a)
2023-02-16 07:53:58 +11:00
David Bomba
ee920b3a1f Do not store pending transactions
(cherry picked from commit bfea83c8fd)
2023-02-16 07:52:56 +11:00
David Bomba
4763398af4
Merge pull request #8271 from turbo124/v5-stable
v5.5.70
2023-02-09 12:25:10 +11:00
David Bomba
c9856a777e Merge branch 'v5-develop' into v5-stable 2023-02-09 12:24:17 +11:00
David Bomba
95e0aa6547
Merge pull request #8270 from turbo124/v5-develop
Fixes for job middleware
2023-02-09 12:23:59 +11:00
David Bomba
f1b80adcd2 v5.5.80 2023-02-09 12:22:40 +11:00
David Bomba
0479b1abbd Fixes for job middleware 2023-02-09 12:10:08 +11:00
David Bomba
d955643748
Merge pull request #8269 from turbo124/v5-develop
Fixes for archived clients attempting to view client portal.
2023-02-09 11:24:57 +11:00
David Bomba
3c72418244 Fixes for client portal when archived user attempts to view items 2023-02-09 11:24:01 +11:00
David Bomba
6db335575c Handle user returning from stripe connect without authenticating 2023-02-09 11:07:40 +11:00
David Bomba
e182ce9a66 Handle case where Stripe Connect permission is denied 2023-02-09 11:02:25 +11:00
David Bomba
d52ca0796d Fixes for lock_connection for redis 2023-02-09 10:24:07 +11:00
David Bomba
aa0774a400 Increase default font size 2023-02-09 10:02:17 +11:00
David Bomba
150c341eb5
Merge pull request #8268 from turbo124/v5-develop
Fixes for translation string in subscriptions
2023-02-09 09:24:10 +11:00
David Bomba
0f6d782b05 Fixes for translation string in subscriptions 2023-02-09 09:23:47 +11:00
David Bomba
8760068a8c Update purchase orders with correct footer 2023-02-09 09:20:09 +11:00
David Bomba
239df0f67c Add logging around paytrace 2023-02-09 09:14:22 +11:00
David Bomba
bf6526683f
Merge pull request #8263 from turbo124/v5-stable
v5.5.69
2023-02-09 00:28:49 +11:00
David Bomba
69bc7d5997 Merge branch 'v5-develop' into v5-stable 2023-02-09 00:26:16 +11:00
David Bomba
04d1741984
Merge pull request #8262 from turbo124/v5-develop
bump predis to 2.x
2023-02-09 00:25:55 +11:00
David Bomba
2907ad8714 bump predis to 2.x 2023-02-09 00:25:37 +11:00