1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Commit Graph

7074 Commits

Author SHA1 Message Date
Benjamin Beganović
0757cbddda Refactor generic template 2021-06-09 16:09:05 +02:00
Benjamin Beganović
ee4be6d84a Accept view() instead of markdown() in NinjaMailer 2021-06-09 16:08:55 +02:00
David Bomba
eb396e890b
Merge pull request #5985 from turbo124/v5-develop
Fixes for StoreUserRequest
2021-06-09 22:25:39 +10:00
David Bomba
e4975e85bb Fixes for StoreUserRequest 2021-06-09 22:25:25 +10:00
David Bomba
9e5f61f01a
Merge pull request #5984 from turbo124/v5-develop
Migration failed messaging
2021-06-09 21:10:43 +10:00
David Bomba
c8df3f1298 Migration failed messaging 2021-06-09 21:10:22 +10:00
Benjamin Beganović
a7a4bcc19d Merge admin light/dark master template into one file 2021-06-09 12:25:48 +02:00
David Bomba
17cc6b810c
Merge pull request #5983 from turbo124/v5-develop
Add rules for adding users to hosted platform
2021-06-09 20:19:50 +10:00
David Bomba
7627d3566d Improve query efficiency 2021-06-09 20:19:23 +10:00
David Bomba
f4bfa6c0fd Add rules for adding users to hosted platform 2021-06-09 19:57:03 +10:00
David Bomba
dd22f683fa
Merge pull request #5982 from turbo124/v5-develop
Fixes for injecting Task Statuses in import data
2021-06-09 16:38:51 +10:00
David Bomba
b1cc872dcd Fixes for injecting Task Statuses in import data 2021-06-09 16:38:36 +10:00
David Bomba
6110ed6bb8
Merge pull request #5981 from turbo124/v5-develop
Updates for Password Protection with OAuth
2021-06-09 16:22:41 +10:00
David Bomba
3d880f2dd3 Updates for Password Protection with OAuth 2021-06-09 16:22:25 +10:00
David Bomba
e300966a74
Merge pull request #5980 from turbo124/v5-develop
Logging for Password Protection
2021-06-09 16:01:22 +10:00
David Bomba
26a1e34268 Logging for Password Protection 2021-06-09 16:01:09 +10:00
David Bomba
ff0698a274
Merge pull request #5978 from turbo124/v5-develop
v5.1.74
2021-06-09 15:34:24 +10:00
David Bomba
645ec389d7 v5.1.74 2021-06-09 15:34:08 +10:00
David Bomba
1f3d4f0a6b
Merge pull request #5977 from turbo124/v5-develop
v5.1.73
2021-06-09 15:32:17 +10:00
David Bomba
fcb395c2b0 v5.1.73 2021-06-09 15:31:53 +10:00
David Bomba
ada4777a57 Check DB script 2021-06-09 14:37:02 +10:00
David Bomba
e3907c50c9
Merge pull request #5976 from turbo124/v5-develop
Check DB script
2021-06-09 14:28:12 +10:00
David Bomba
cd1062cff9 Check DB script 2021-06-09 14:27:48 +10:00
David Bomba
236fa854ad
Merge pull request #5975 from turbo124/v5-develop
Add additional databases
2021-06-09 14:25:42 +10:00
David Bomba
d8911d9735 Add additional databases 2021-06-09 14:25:26 +10:00
David Bomba
46bcd8396d
Merge pull request #5974 from turbo124/v5-develop
Console command to check Multi DB
2021-06-09 13:48:48 +10:00
David Bomba
2bbfa72288 Console command to check Multi DB 2021-06-09 13:47:26 +10:00
David Bomba
fb70fff7ca
Merge pull request #5973 from turbo124/v5-develop
Debugging Company Import
2021-06-09 13:18:14 +10:00
David Bomba
34e24d2a0a Debugging Company Import 2021-06-09 13:17:55 +10:00
David Bomba
6d9bbf0fd3
Merge pull request #5972 from turbo124/v5-develop
Create Ninja User on hosted platform
2021-06-09 12:24:55 +10:00
David Bomba
a753d6ca5a Create Ninja User on hosted platform 2021-06-09 12:24:32 +10:00
David Bomba
bf2d3284b0
Merge pull request #5971 from turbo124/v5-develop
Fixes for Company Importer
2021-06-09 11:50:31 +10:00
=
f93a92bde9 Prevent Docker from restarting the queues 2021-06-09 10:27:01 +10:00
David Bomba
9231c29d69 Additional logic for importing data into the hosted platform 2021-06-09 08:19:00 +10:00
David Bomba
a1c00026e9
Merge pull request #5969 from turbo124/v5-develop
Fixes for import json
2021-06-08 22:59:06 +10:00
David Bomba
9585974b66 Fixes for import json 2021-06-08 22:58:46 +10:00
David Bomba
f7e91cabd4 Fixes for importjson 2021-06-08 22:44:38 +10:00
David Bomba
ad27910025
Merge pull request #5967 from turbo124/v5-develop
Fixes for if plan is null
2021-06-08 22:30:32 +10:00
David Bomba
0f58039532 Fixes for if plan is null 2021-06-08 22:29:39 +10:00
David Bomba
512b4d9bdf
Merge pull request #5966 from turbo124/v5-develop
Fixes for if plan is null
2021-06-08 22:17:35 +10:00
David Bomba
8170c395b4 Fixes for if plan is null 2021-06-08 22:17:19 +10:00
David Bomba
1826ea7db5
Merge pull request #5965 from turbo124/v5-develop
Additional logging
2021-06-08 22:06:37 +10:00
David Bomba
5be8910c38 Additional logging 2021-06-08 22:05:18 +10:00
David Bomba
b8365d94f8
Merge pull request #5964 from turbo124/v5-develop
Fixes for client portal links
2021-06-08 21:45:37 +10:00
David Bomba
d68e40433c Fixes for client portal links 2021-06-08 21:45:23 +10:00
David Bomba
d9d2ccf428
Merge pull request #5963 from turbo124/v5-develop
Better logging for company importer
2021-06-08 20:41:08 +10:00
David Bomba
b629b9dcba Better logging for company importer 2021-06-08 20:39:07 +10:00
David Bomba
fc4d713412
Merge pull request #5962 from turbo124/v5-develop
Better logging for company importer
2021-06-08 18:59:01 +10:00
David Bomba
c2e2ab60cb Implement slight delay on Company Import 2021-06-08 18:58:27 +10:00
David Bomba
12a31b79e7 Better logging for company importer 2021-06-08 18:54:34 +10:00