Leigh Pointer
347ef9a1d0
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-19 22:16:18 +02:00
Shaun Walker
739aa5311c
Merge pull request #3050 from sbwalker/dev
...
fix #3046 - user folders displayed in folder lists
2023-07-19 16:15:04 -04:00
sbwalker
805018286c
fix #3046 - user folders displayed in folder lists
2023-07-19 16:14:48 -04:00
Leigh Pointer
45f2a47ba5
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-19 21:53:10 +02:00
Shaun Walker
fe503b7bee
Merge pull request #3049 from sbwalker/dev
...
FileManager modification to support ShowFolders = False
2023-07-19 15:45:25 -04:00
sbwalker
6736570ee7
FileManager modification to support ShowFolders = False
2023-07-19 15:45:12 -04:00
Leigh Pointer
88c06eea6e
Fixes Module Creator problem #3041
...
This fix is to handle a returned null from the database. This issue came to light while using Postgresql
2023-07-19 09:58:36 +02:00
Leigh Pointer
13693ef9e5
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-19 09:53:29 +02:00
Shaun Walker
3a54326e73
Update README.md
2023-07-18 12:42:49 -04:00
Shaun Walker
941c1c8a45
Update README.md
2023-07-18 12:35:27 -04:00
Shaun Walker
f56e102f20
Merge pull request #3045 from oqtane/master
...
Merge pull request #3044 from oqtane/dev
2023-07-18 12:25:59 -04:00
Shaun Walker
010c669ce2
Merge pull request #3044 from oqtane/dev
...
4.0.1 Release
2023-07-18 12:25:41 -04:00
Leigh Pointer
d328058075
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-18 17:40:29 +02:00
Shaun Walker
9609e7b297
Merge pull request #3042 from leigh-pointer/ControlPanelPadding
...
Fixed up margins in Control Panel
2023-07-18 11:08:57 -04:00
Leigh Pointer
92718372b8
Fixed up margins in Control Panel
...
Added top margin to the Module Management
2023-07-18 12:47:48 +02:00
Leigh Pointer
9108eb5616
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-18 12:37:53 +02:00
Shaun Walker
354ad9d0d5
Merge pull request #3040 from sbwalker/dev
...
use html line breaks in error log notifications
2023-07-17 16:59:54 -04:00
sbwalker
100b92036b
use html line breaks in error log notifications
2023-07-17 16:59:40 -04:00
Shaun Walker
e9ed1ecc8c
Merge pull request #3039 from sbwalker/dev
...
prevent client looping if server is down
2023-07-17 11:49:16 -04:00
sbwalker
92595ccc35
prevent client looping if server is down
2023-07-17 11:49:06 -04:00
Leigh Pointer
ea45044dc7
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-17 16:48:24 +02:00
Shaun Walker
1ef28494b3
Merge pull request #3038 from sbwalker/dev
...
use discretion with LogLevel.Error messages
2023-07-17 09:29:00 -04:00
sbwalker
985d324593
use discretion with LogLevel.Error messages
2023-07-17 09:28:29 -04:00
Shaun Walker
96e7178cd2
Merge pull request #3036 from sbwalker/dev
...
Added logic to ensure assembly version being installed is equal to or greater than existing assembly
2023-07-17 08:16:16 -04:00
sbwalker
f41e2358a9
Added logic to ensure assembly version being installed is equal to or greater than existing assembly
2023-07-17 08:15:56 -04:00
Shaun Walker
0f146ff355
Merge pull request #3035 from sbwalker/dev
...
Added a ShowProgress parameter to FileManager (enabled by default). Disabling will display a simple spinner rather than detailed progress information during upload.
2023-07-17 07:43:18 -04:00
sbwalker
465f241e89
Added a ShowProgress parameter to FileManager (enabled by default). Disabling will display a simple spinner rather than detailed progress information during upload.
2023-07-17 07:42:48 -04:00
Shaun Walker
2bdb011240
Merge pull request #3026 from vnetonline/enhance-filemanager
...
[ENHANCE] - Moved `SetImage()` before the OnSelect fires so that the …
2023-07-17 07:11:41 -04:00
Shaun Walker
dd55725f9b
Merge pull request #3034 from vnetonline/fix-publish-module
...
[FIX] - Page disappears if you unpublish and publish a module
2023-07-17 07:10:55 -04:00
Leigh Pointer
6b16808207
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-17 11:01:10 +02:00
vnetonline
411111fa55
[FIX] - Page disappears if you unpublish and publish a module on the page
2023-07-17 09:33:04 +10:00
vnetonline
5345a12aca
[ENHANCE] - Moved SetImage() before the OnSelect fires so that the Parent can retrieve the Image from fileManager rather then calling FileService to retrieve again
2023-07-17 07:58:39 +10:00
Shaun Walker
39adcde16d
Merge pull request #3030 from sbwalker/dev
...
display message if package service does not return package requested
2023-07-15 15:27:01 -04:00
sbwalker
3c37ee60af
display message if package service does not return package requested
2023-07-15 15:26:48 -04:00
Shaun Walker
4effc4dd60
Merge pull request #3028 from sbwalker/dev
...
marketplace changes
2023-07-15 10:01:41 -04:00
sbwalker
fec9fa17e8
marketplace changes
2023-07-15 10:01:27 -04:00
Leigh Pointer
4071b285ce
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-15 12:34:10 +02:00
Shaun Walker
fca306ffa6
Merge pull request #3025 from sbwalker/dev
...
SupportUrl integration
2023-07-14 15:19:04 -04:00
sbwalker
0e042925f2
SupportUrl integration
2023-07-14 15:18:52 -04:00
Shaun Walker
99421846c7
Merge pull request #3024 from sbwalker/dev
...
remove OnSelect call from OnParametersSet() which was causing infinite loop
2023-07-14 12:15:34 -04:00
sbwalker
592885ff6c
remove OnSelect call from OnParametersSet() which was causing infinite loop
2023-07-14 12:15:16 -04:00
Shaun Walker
a95306c317
Merge pull request #3022 from sbwalker/dev
...
moved UserManager to Managers namespace
2023-07-13 17:05:21 -04:00
sbwalker
8bdbf7b994
moved UserManager to Managers namespace
2023-07-13 17:05:01 -04:00
Leigh Pointer
7bc80f0814
Merge remote-tracking branch 'oqtane/dev' into dev
2023-07-13 17:21:55 +02:00
Shaun Walker
aed65d2594
Merge pull request #3020 from sbwalker/dev
...
add handling for DisplayName
2023-07-13 11:17:04 -04:00
sbwalker
63b3e4d90d
add handling for DisplayName
2023-07-13 11:16:49 -04:00
Shaun Walker
f9c459eab2
Merge pull request #3019 from sbwalker/dev
...
fix bash script line endings and preserve using gitattributes (credit @rcpacheco in #2958 )
2023-07-13 10:19:14 -04:00
sbwalker
a6d83149a4
fix bash script line endings and preserve using gitattributes (credit @rcpacheco in #2958 )
2023-07-13 10:18:52 -04:00
Shaun Walker
387b477034
Merge pull request #3018 from sbwalker/dev
...
allow page themes to be different from site theme - display warning message
2023-07-13 09:09:00 -04:00
sbwalker
68cdcd193c
allow page themes to be different from site theme - display warning message
2023-07-13 08:58:43 -04:00
