Shaun Walker
ce8abdb8cd
Merge pull request #3152 from sbwalker/dev
...
modify column size to prevent text wrapping
2023-08-16 12:25:53 -04:00
sbwalker
941bb7edaa
modify column size to prevent text wrapping
2023-08-16 12:25:39 -04:00
Shaun Walker
1acbdf8b9e
Merge pull request #3150 from alikoli/dev
...
Fix missing translations part 3
2023-08-15 15:51:58 -04:00
Shaun Walker
530804c847
Merge pull request #3151 from sbwalker/dev
...
In FileManager fix the id handling for the progressinfo and progressbar and include OnSelect events on Upload and Delete. Add missing backend implementation for AddFileAsync
2023-08-15 15:51:32 -04:00
sbwalker
b00b426e9c
fix the id handling for the progressinfo and progressbar, include OnSelect events on Upload and Delete, add missing backend implementation for AddFileAsync
2023-08-15 15:50:35 -04:00
alikoli
128f1753c0
Remove resx backups
2023-08-15 16:17:23 +02:00
alikoli
1922629d27
Merge branch 'oqtane:dev' into dev
2023-08-15 16:12:21 +02:00
alikoli
283a03a7cc
Fix missing translations part 3
2023-08-15 16:09:59 +02:00
Shaun Walker
cdab26a97b
Merge pull request #3146 from HonesDK/dev
...
Fixed localization in AuditInfo
2023-08-15 08:03:29 -04:00
Shaun Walker
5d3311c46b
Merge pull request #3147 from sbwalker/dev
...
Notification job must convert \n to <br /> now that IsNodyHtml is set to True
2023-08-14 17:03:43 -04:00
sbwalker
7cbc21671b
Notification job must convert \n to <br /> now that IsNodyHtml is set to True
2023-08-14 17:03:21 -04:00
HonesDK
d14d820e25
Merge branch 'dev' of https://github.com/HonesDK/oqtane.framework into dev
2023-08-14 16:54:41 +02:00
HonesDK
b567d02df2
Fixed localization in AuditInfo
2023-08-14 16:52:30 +02:00
HonesDK
dbb58541f2
Revert "Fixed modified by localization, and added DateTimeFormat to localization"
...
This reverts commit 4a8bcc6f71
2023-08-14 16:51:21 +02:00
Shaun Walker
5a42caf4f8
Merge pull request #3143 from sbwalker/dev
...
add ability to get user based on username or email address
2023-08-13 08:35:24 -04:00
sbwalker
c2acd010ce
add ability to get user based on username or email address
2023-08-13 08:35:03 -04:00
HonesDK
4a8bcc6f71
Fixed modified by localization, and added DateTimeFormat to localization
2023-08-13 10:11:29 +02:00
Shaun Walker
89e4dc7a08
Merge pull request #3141 from sbwalker/dev
...
change "price" to "from" to reflect multiple options
2023-08-12 10:31:56 -04:00
sbwalker
c344eedb12
change "price" to "from" to reflect multiple options
2023-08-12 10:31:44 -04:00
Shaun Walker
0aeb1a62b9
Merge pull request #3137 from sbwalker/dev
...
fix #3134 improve parsing of headcontent to handle space delimiters
2023-08-11 15:53:43 -04:00
sbwalker
316e0f5a68
fix #3134 improve parsing of headcontent to handle space delimiters
2023-08-11 15:53:32 -04:00
Shaun Walker
6f9314f76f
Merge pull request #3133 from alikoli/dev
...
Fix missing translations part 2
2023-08-11 15:33:21 -04:00
alikoli
6ef21795ba
fix heading
2023-08-10 02:13:31 +02:00
alikoli
e44855493e
fix heading
2023-08-10 02:12:36 +02:00
alikoli
101a3c8af5
Revert launchSettings
2023-08-10 02:03:46 +02:00
alikoli
8fbbbce4ec
Fix missing translations part 2
2023-08-10 01:52:46 +02:00
Shaun Walker
1de8bb850f
Update README.md
2023-08-09 08:54:45 -04:00
Shaun Walker
25d09186fe
Update README.md
2023-08-09 08:34:35 -04:00
Shaun Walker
9552b7c6f9
Update README.md
2023-08-09 08:34:13 -04:00
Shaun Walker
3d692e4198
Merge pull request #3132 from oqtane/master
...
Merge pull request #3131 from oqtane/dev
2023-08-09 08:22:44 -04:00
Shaun Walker
215ca9f755
Merge pull request #3131 from oqtane/dev
...
4.0.2 Release
2023-08-09 08:22:24 -04:00
Shaun Walker
7dbcb24f3d
Merge pull request #3129 from alikoli/fix-missing-translations
...
Fix missing translations
2023-08-09 08:16:06 -04:00
alikoli
18b4bd62f7
Update appsettings.json
2023-08-09 04:06:14 +02:00
alikoli
20f3cf5327
Add empty appsettings
2023-08-09 03:58:34 +02:00
alikoli
c1d35e8af5
Fix missing translations
2023-08-09 03:06:15 +02:00
Shaun Walker
e1cd318f61
Merge pull request #3128 from sbwalker/dev
...
fix installed cultures logic to recognize all satellite resources
2023-08-08 13:22:10 -04:00
sbwalker
4da0952091
fix installed cultures logic to recognize all satellite resources
2023-08-08 13:21:56 -04:00
Shaun Walker
a60f75f0a9
Merge pull request #3127 from sbwalker/dev
...
fix refresh logic in router
2023-08-08 13:07:43 -04:00
sbwalker
3814009ad9
fix refresh logic in router
2023-08-08 13:07:29 -04:00
Shaun Walker
fe7bb00112
Merge pull request #3125 from leigh-pointer/ModuleTitleLoc
...
Updated Module Title using SetModuleTitle on ModuleBase
2023-08-08 12:23:36 -04:00
Leigh Pointer
2356753dfc
Updated Module Title using SetModuleTitle on ModuleBase
2023-08-08 16:37:40 +02:00
Leigh Pointer
bd23ec268b
Merge remote-tracking branch 'oqtane/dev' into dev
2023-08-08 15:34:25 +02:00
Shaun Walker
1d5f23c3c7
Merge pull request #3123 from leigh-pointer/TransKeys
...
Trans keys
2023-08-08 09:33:43 -04:00
Leigh Pointer
f424bf53b3
Revert Title to "Folder Management"
...
This is due to the public virtual string Title can not use the Localize instance as it not yet created so error with null reference.
2023-08-08 15:30:39 +02:00
Leigh Pointer
efbdf0006e
Merge remote-tracking branch 'oqtane/dev' into TransKeys
2023-08-08 15:22:03 +02:00
Shaun Walker
625b173ee4
Merge pull request #3122 from leigh-pointer/TransKeys
...
Updated the Settings Heading
2023-08-08 08:05:21 -04:00
Leigh Pointer
0a8d9bc3d3
Updated the Settings Heading
2023-08-08 14:01:45 +02:00
Shaun Walker
0d0909a461
Merge pull request #3120 from leigh-pointer/TransKeys
...
Translation for thread #3094
2023-08-08 07:55:35 -04:00
Shaun Walker
ebb0a538f8
Merge pull request #3121 from sbwalker/dev
...
improve sync service to always rely on server dates
2023-08-08 07:51:26 -04:00
sbwalker
337a566617
improve sync service to always rely on server dates
2023-08-08 07:51:07 -04:00
