Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity
1,878 Commits 7 Branches 57 Tags
75c336454b00effbed8e188a5d997d4742cf05f2
Commit Graph

1878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaun Walker
310c782326 Merge pull request #1274 from sbwalker/dev 
user and role management improvements
 2021-04-23 16:09:19 -04:00
Shaun Walker
65aac34f8c Merge pull request #1267 from sbwalker/dev 
modify nuget package installer to support satellite assemblies in subfolders
 2021-04-23 09:34:17 -04:00
Shaun Walker
856b11b574 Merge pull request #1265 from hishamco/language-switcher 
Add English to the language switcher
 2021-04-23 09:34:01 -04:00
Shaun Walker
1088e9adda Merge pull request #1264 from hishamco/language-management-exculde 
Exclude English from the languages list
 2021-04-23 09:33:22 -04:00
Leigh Pointer
7470513892 Merge pull request #2 from oqtane/dev 
Updates
 2021-04-22 05:49:01 +02:00
Shaun Walker
2780e4d029 modify nuget package installer to support satellite assemblies in subfolders 2021-04-21 19:31:02 -04:00
hishamco
c52f6c92f1 Add English to the language switcher 2021-04-21 17:47:50 +03:00
hishamco
3cafb68f6b Localize module titles in UI 2021-04-21 17:31:22 +03:00
hishamco
6e5496e969 Exclude English from the languages list 2021-04-21 16:41:24 +03:00
Shaun Walker
f9f0999315 Merge pull request #1260 from hishamco/supported-cultures 
Remove supported cultures entry from appsettings.json
 2021-04-20 17:14:21 -04:00
Shaun Walker
e7c5ca2c1a Merge pull request #1254 from chlupac/alias 
Default Alias
 2021-04-20 17:07:20 -04:00
Shaun Walker
d2ffb93fa4 Merge pull request #92 from oqtane/dev 
sync
 2021-04-20 14:13:41 -04:00
Shaun Walker
c4680c1972 Merge pull request #1262 from cnurse/dev 
Fix bug with installs due to missing Migrations
 2021-04-20 14:13:09 -04:00
Charles Nurse
8f5beaf3fe Fix bug with installs due to missing Migrations 2021-04-20 10:58:26 -07:00
hishamco
35225b2bb9 Move SqlServer databases into a separate project 2021-04-20 17:29:24 +03:00
hishamco
0b32dcf9b3 Make English default culture instead of current installed culture 2021-04-20 16:27:18 +03:00
hishamco
e33c9e417d Remove SupportedCultures entry from appsettings.json 2021-04-20 16:26:17 +03:00
hishamco
9d9a5a0275 Localize modules title 2021-04-20 16:20:24 +03:00
Leigh Pointer
a5494be8f1 Merge pull request #1 from oqtane/dev 
Update to 2.0.2
 2021-04-20 06:44:31 +02:00
Shaun Walker
bc6be52ae7 Merge pull request #91 from oqtane/dev 
sync
 2021-04-19 21:13:47 -04:00
Shaun Walker
40f8436947 Merge pull request #1239 from cnurse/dev 
Implement Database Migrations and add Multi-Database Support
 2021-04-19 21:11:11 -04:00
Charles Nurse
13f7db7b19 Resolve conflict 2021-04-19 11:57:45 -07:00
Charles Nurse
6b204cc988 Second attempt to resolve conflcit in Server project 2021-04-19 11:56:51 -07:00
Charles Nurse
a11d30b1e4 Attempt to resolve conflict in Server project file 2021-04-19 11:53:45 -07:00
Charles Nurse
2402cab3f3 Attempt to resolve conflict in DatabaseManager 2021-04-19 11:50:25 -07:00
Charles Nurse
20b5a10882 Resolve name of variable in AddSite 2021-04-19 11:15:53 -07:00
Charles Nurse
4598d0d6ba Resolve conflict in AddSite 2021-04-19 11:13:10 -07:00
Shaun Walker
7516be41d9 Update README.md 2021-04-19 14:10:13 -04:00
Charles Nurse
74c403cef1 Merge remote-tracking branch 'upstream/dev' into dev 2021-04-19 11:08:35 -07:00
Pavel Vesely
468f186511 Default Alias 
When alias is not found in alias table, Oqtane fails with exception. This solution allows define default alias (*) for default site with unknown alias.
 2021-04-19 20:03:18 +02:00
Shaun Walker
5455fadd65 Merge pull request #90 from oqtane/dev 
sync
 2021-04-19 09:33:34 -04:00
Shaun Walker
58ac86db8d Merge pull request #1253 from oqtane/master 
Merge pull request #1252 from oqtane/dev
 2021-04-19 09:28:24 -04:00
Shaun Walker
d8a65e9422 Merge pull request #1252 from oqtane/dev 
2.0.2 release
v2.0.2 		2021-04-19 09:24:01 -04:00
Shaun Walker
a85376afb1 2.0.2 release testing 2021-04-19 08:40:58 -04:00
Shaun Walker
da3b83acf8 Merge pull request #1251 from sbwalker/dev 
2.0.2 release testing
 2021-04-19 08:38:08 -04:00
Shaun Walker
0fe931d772 prepare for 2.0.2 release 2021-04-19 08:04:33 -04:00
Shaun Walker
2c69392f43 Merge pull request #1248 from sbwalker/dev 
prepare for 2.0.2 release
 2021-04-19 08:01:50 -04:00
Shaun Walker
3b54d17286 Merge pull request #89 from oqtane/dev 
sync
 2021-04-18 14:10:17 -04:00
Shaun Walker
7a3b2e6dfc Merge pull request #1246 from leigh-pointer/dev.fork 
Redirect on log out #1225 Fix
 2021-04-18 14:07:55 -04:00
Shaun Walker
82b85ab24d optimize GetSupportedCultures 2021-04-18 11:51:33 -04:00
Shaun Walker
8899504d05 Merge pull request #1247 from sbwalker/dev 
optimize GetSupportedCultures
 2021-04-18 11:48:59 -04:00
Leigh Pointer
1e7e2c8848 Redirect on log out #1225 Fix 2021-04-18 16:58:58 +02:00
Shaun Walker
cbe843bafc User experience improvements 2021-04-17 19:18:24 -04:00
Shaun Walker
8dac6fab54 Merge pull request #1244 from sbwalker/dev 
User experience improvements
 2021-04-17 19:16:13 -04:00
Charles Nurse
096f8249c3 Resolve conflict in Constants 2021-04-14 16:05:59 -07:00
Charles Nurse
e11a65c6ca Rollback removal of script files for Html Module to resolve conflict 2021-04-14 16:03:00 -07:00
Charles Nurse
23bab67bd3 Resolve new conflict 2021-04-14 15:59:31 -07:00
Charles Nurse
713b19e0e9 Remove Html Module Script files 2021-04-14 15:57:07 -07:00
Charles Nurse
f8b607911d Resolve conflict in project file 2021-04-14 15:53:07 -07:00
Charles Nurse
0222bbdeae Resolve conflict with main Oqtane repo 2021-04-14 15:48:54 -07:00