Charles Nurse
|
dbc4e3ea66
|
Add the Jetbrains Rider "idea" folder to gitignore.
|
2021-03-02 12:07:04 -08:00 |
|
Charles Nurse
|
0d5ecb7427
|
Include gitignore and README files in Solution Files folder, so they are more accessible for editing
|
2021-03-02 12:03:26 -08:00 |
|
Shaun Walker
|
0d6413e8a5
|
Merge pull request #1142 from oqtane/dev
merge dev with master for 2.0.1 release
|
2021-02-27 12:32:37 -05:00 |
|
Shaun Walker
|
0eae1b690e
|
Merge pull request #1139 from sbwalker/dev
Fix issue when creating assets.json and folder does not exist. Improve module/theme uninstall to remove empty folders.
|
2021-02-26 09:06:49 -05:00 |
|
Shaun Walker
|
12fd845ed5
|
Fix issue when creating assets.json and folder does not exist. Improve module/theme uninstall to remove empty folders.
|
2021-02-26 09:08:25 -05:00 |
|
Shaun Walker
|
5b9196cfd4
|
Update README.md
|
2021-02-26 08:05:36 -05:00 |
|
Shaun Walker
|
ba54076c61
|
Prepare for 2.0.1 release
|
2021-02-26 08:04:44 -05:00 |
|
Shaun Walker
|
8762809a83
|
Update README.md
|
2021-02-26 08:04:39 -05:00 |
|
Shaun Walker
|
c65bc1f4b1
|
Merge pull request #1138 from sbwalker/dev
Prepare for 2.0.1 release
|
2021-02-26 08:02:59 -05:00 |
|
Shaun Walker
|
99665800c4
|
remove SVG from allowable upload files
|
2021-02-26 07:48:16 -05:00 |
|
Shaun Walker
|
127a9c8deb
|
Merge pull request #1137 from sbwalker/dev
remove SVG from allowable upload files
|
2021-02-26 07:46:35 -05:00 |
|
Shaun Walker
|
af1eebbf0d
|
update copyright content
|
2021-02-26 07:45:10 -05:00 |
|
Shaun Walker
|
e5272d9725
|
Merge pull request #1136 from sbwalker/dev
update copyright content
|
2021-02-26 07:43:43 -05:00 |
|
Shaun Walker
|
4a2d3e452a
|
Merge pull request #83 from oqtane/dev
sync
|
2021-02-25 14:27:51 -05:00 |
|
Shaun Walker
|
dbecfc1c9f
|
Merge pull request #1135 from leigh-pointer/dev
Fix for #1134 Files size incorrect when less than 1000 bytes
|
2021-02-25 08:31:29 -05:00 |
|
Leigh Pointer
|
6c79006dd7
|
fix for #1134 Files size incorrect when less than 1000 bytes
|
2021-02-25 07:44:19 +01:00 |
|
Leigh Pointer
|
53af3f2a14
|
Merge pull request #5 from oqtane/dev
Commits 19, 24 Feb
|
2021-02-25 06:54:59 +01:00 |
|
Shaun Walker
|
385ec178eb
|
Merge pull request #1132 from oqtane/revert-1121-dev
Revert "Fix Upload SVG throw error #1120"
|
2021-02-24 17:27:20 -05:00 |
|
Shaun Walker
|
eda2a5637f
|
Revert "Fix Upload SVG throw error #1120"
|
2021-02-24 17:26:54 -05:00 |
|
Shaun Walker
|
f60c60ac1d
|
Merge pull request #1121 from leigh-pointer/dev
Fix Upload SVG throw error #1120
|
2021-02-24 17:22:23 -05:00 |
|
Shaun Walker
|
75a5262259
|
Merge pull request #1124 from PhilipMur/dev
Fixed site Favicon not saving
|
2021-02-24 17:22:02 -05:00 |
|
Philip Murray
|
60d685416d
|
Fixed site Favicon not saving
The saved function for the favicon was not there
|
2021-02-19 13:09:29 +00:00 |
|
Leigh Pointer
|
b04cee22cd
|
Merge branch 'dev' of https://github.com/leigh-pointer/oqtane.framework into dev
|
2021-02-18 09:27:57 +01:00 |
|
Leigh Pointer
|
3af095997f
|
Fixed when file size is less that 1 Kb displays 0. This can be misleading as many svg files are less that 1 kb. File size now displays to 2 deciaml places.
|
2021-02-18 09:27:51 +01:00 |
|
Leigh Pointer
|
1aae8a1373
|
Update FileController.cs
|
2021-02-18 08:55:13 +01:00 |
|
Leigh Pointer
|
bd762cb5c9
|
stream not needed
|
2021-02-18 08:52:57 +01:00 |
|
Leigh Pointer
|
59ba4b2e05
|
doesnt need to open the stream if svg
|
2021-02-18 08:51:05 +01:00 |
|
Leigh Pointer
|
45974a9c80
|
Update FileController.cs
|
2021-02-18 08:48:33 +01:00 |
|
Leigh Pointer
|
9411f9a62e
|
Merge branch 'dev' of https://github.com/leigh-pointer/oqtane.framework into dev
|
2021-02-18 08:39:18 +01:00 |
|
Leigh Pointer
|
e3fc7c0ad1
|
#1120 Fix forUpload SVG throw error
|
2021-02-18 08:38:53 +01:00 |
|
Leigh Pointer
|
a60859ba19
|
Merge pull request #4 from oqtane/dev
Login changes and log out path
|
2021-02-17 06:52:57 +01:00 |
|
Leigh Pointer
|
eef26d02d3
|
Merge pull request #4 from oqtane/dev
Login changes
|
2021-02-17 06:46:35 +01:00 |
|
Shaun Walker
|
b7ce7bb3e4
|
Improve Login user experience when running on WebAssembly and address Logout scenario
|
2021-02-16 08:11:36 -05:00 |
|
Shaun Walker
|
e7b65aad19
|
Merge pull request #1114 from sbwalker/dev
Improve Login user experience when running on WebAssembly and address Logout scenario
|
2021-02-16 08:10:19 -05:00 |
|
Shaun Walker
|
cd89b2bf7b
|
Merge pull request #82 from oqtane/dev
sync
|
2021-02-16 06:42:56 -05:00 |
|
Leigh Pointer
|
4b3c488fb9
|
Merge pull request #3 from oqtane/dev
WebAssembly startup issue
|
2021-02-15 17:30:38 +01:00 |
|
Shaun Walker
|
9e8c574fb5
|
fix #1103 reported by @PhilipMur - incorrect life cycle method for Control Panel loading
|
2021-02-15 10:38:38 -05:00 |
|
Shaun Walker
|
dfa74f7eb6
|
Merge pull request #1111 from hishamco/lang-version
Remove LangVerion from Oqtane.Server
|
2021-02-15 10:37:58 -05:00 |
|
Shaun Walker
|
2b92dd51a1
|
Merge pull request #1112 from sbwalker/dev
fix #1103 reported by @PhilipMur - incorrect life cycle method for Control Panel loading
|
2021-02-15 10:37:27 -05:00 |
|
Leigh Pointer
|
a47aa28c89
|
Merge pull request #2 from oqtane/dev
Section head and Languages
|
2021-02-15 05:49:29 +01:00 |
|
hishamco
|
510f475816
|
Remove LangVerion from Oqtane.Server
|
2021-02-15 03:27:47 +03:00 |
|
Shaun Walker
|
de1107f046
|
Unauthenticated users need to be able to retrieve the list of languages
|
2021-02-14 18:35:42 -05:00 |
|
Shaun Walker
|
0f640dd68b
|
Merge pull request #1110 from sbwalker/dev
Unauthenticated users need to be able to retrieve the list of languages
|
2021-02-14 18:34:33 -05:00 |
|
Shaun Walker
|
a50363fec7
|
Merge pull request #1107 from leigh-pointer/dev
#1106 Fix issue where Section would not initialize Expanded.
|
2021-02-14 15:03:09 -05:00 |
|
Leigh Pointer
|
22c6ccffb8
|
Merge pull request #1 from oqtane/dev
Merge from base
|
2021-02-13 07:53:23 +01:00 |
|
Leigh Pointer
|
fcd795be3d
|
#1106 Fix issue where Section would not initialize collapsed.
|
2021-02-13 07:33:12 +01:00 |
|
Shaun Walker
|
6adda2b1a9
|
Merge pull request #1102 from leigh-pointer/dev
DirectorySeparator issue when black or forward slash.
|
2021-02-12 10:30:15 -05:00 |
|
Shaun Walker
|
0af8f427e1
|
Merge pull request #1101 from 2sic-forks/dev
fix typo memeber = member
|
2021-02-12 10:29:22 -05:00 |
|
Leigh Pointer
|
c6e2c2e501
|
DirectorySeparator issue when black or forward slash.
Tested on Apple mac and Windows
|
2021-02-11 15:38:37 +01:00 |
|
iJungleboy
|
278aab537f
|
fix typo memeber = member
|
2021-02-11 10:41:43 +01:00 |
|