| 
						
					 | 
					
						
						
							
						
						6ae5777e1c
					 | 
					
						
						
							
							Revert "Fix NuGet Warning NU5048"
						
						
						
						
						
						
						
						This reverts commit cad5ce51fc. 
						
						
					 | 
					
						2021-04-28 20:31:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cad5ce51fc
					 | 
					
						
						
							
							Fix NuGet Warning NU5048
						
						
						
						
						
						
						
						Icon URL is deprecated in favor of embedding the icon inside the NuGet package. 
						
						
					 | 
					
						2021-04-28 09:17:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a79ba591fe
					 | 
					
						
						
							
							Make container fluid to fill the pane
						
						
						
						
						
						
					 | 
					
						2021-04-28 07:01:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1efd623a99
					 | 
					
						
						
							
							Adding new DatabaseConfig components in the Client project for supported Databases to avoid deploying server dlls to client
						
						
						
						
						
						
					 | 
					
						2021-04-27 15:35:10 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c32003320d
					 | 
					
						
						
							
							Merge pull request #1284 from iJungleboy/dev
						
						
						
						
						
						
						
						Make version static-readonly 
						
						
					 | 
					
						2021-04-27 07:56:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						307f97c60c
					 | 
					
						
						
							
							Merge pull request #1281 from hishamco/localization-manager
						
						
						
						
						
						
						
						LocalizationManager enhancements 
						
						
					 | 
					
						2021-04-27 07:51:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						722c234cb5
					 | 
					
						
						
							
							Merge pull request #1285 from leigh-pointer/dev.fork
						
						
						
						
						
						
						
						Fix Error with Footer on Oqtane Theme #1282 
						
						
					 | 
					
						2021-04-27 07:50:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						189dcf5b90
					 | 
					
						
						
							
							Fix for Error with Footer on Oqtane Theme #1282
						
						
						
						
						
						
					 | 
					
						2021-04-26 15:38:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a531a235a0
					 | 
					
						
						
							
							Make version static-readonly
						
						
						
						
						
						
						
						https://github.com/oqtane/oqtane.framework/issues/1283 
						
						
					 | 
					
						2021-04-26 13:51:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7569aa41a
					 | 
					
						
						
							
							Merge pull request #3 from oqtane/dev
						
						
						
						
						
						
						
						Merge with Fork 
						
						
					 | 
					
						2021-04-26 11:31:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55b69f0afc
					 | 
					
						
						
							
							Order the cultures alphabatically
						
						
						
						
						
						
					 | 
					
						2021-04-26 01:55:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76c2a2f2f9
					 | 
					
						
						
							
							Add English to supported cultures by default
						
						
						
						
						
						
					 | 
					
						2021-04-26 01:55:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d42c7a5ea5
					 | 
					
						
						
							
							user and role management improvements
						
						
						
						
						
						
					 | 
					
						2021-04-24 13:47:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60f386838e
					 | 
					
						
						
							
							Merge pull request #1280 from sbwalker/dev
						
						
						
						
						
						
						
						user and role management improvements 
						
						
					 | 
					
						2021-04-24 13:44:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a519510a9
					 | 
					
						
						
							
							improve comments and logging
						
						
						
						
						
						
					 | 
					
						2021-04-23 16:29:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3449f5beb
					 | 
					
						
						
							
							Merge pull request #1275 from sbwalker/dev
						
						
						
						
						
						
						
						improve comments and logging 
						
						
					 | 
					
						2021-04-23 16:26:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ffafe5d14c
					 | 
					
						
						
							
							Merge pull request #93 from oqtane/dev
						
						
						
						
						
						
						
						sync 
						
						
					 | 
					
						2021-04-23 16:10:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d083726be
					 | 
					
						
						
							
							user and role management improvements
						
						
						
						
						
						
					 | 
					
						2021-04-23 16:11:35 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						310c782326
					 | 
					
						
						
							
							Merge pull request #1274 from sbwalker/dev
						
						
						
						
						
						
						
						user and role management improvements 
						
						
					 | 
					
						2021-04-23 16:09:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						856b11b574
					 | 
					
						
						
							
							Merge pull request #1265 from hishamco/language-switcher
						
						
						
						
						
						
						
						Add English to the language switcher 
						
						
					 | 
					
						2021-04-23 09:34:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1088e9adda
					 | 
					
						
						
							
							Merge pull request #1264 from hishamco/language-management-exculde
						
						
						
						
						
						
						
						Exclude English from the languages list 
						
						
					 | 
					
						2021-04-23 09:33:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7470513892
					 | 
					
						
						
							
							Merge pull request #2 from oqtane/dev
						
						
						
						
						
						
						
						Updates 
						
						
					 | 
					
						2021-04-22 05:49:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2780e4d029
					 | 
					
						
						
							
							modify nuget package installer to support satellite assemblies in subfolders
						
						
						
						
						
						
					 | 
					
						2021-04-21 19:31:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c52f6c92f1
					 | 
					
						
						
							
							Add English to the language switcher
						
						
						
						
						
						
					 | 
					
						2021-04-21 17:47:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3cafb68f6b
					 | 
					
						
						
							
							Localize module titles in UI
						
						
						
						
						
						
					 | 
					
						2021-04-21 17:31:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e5496e969
					 | 
					
						
						
							
							Exclude English from the languages list
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:41:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9f0999315
					 | 
					
						
						
							
							Merge pull request #1260 from hishamco/supported-cultures
						
						
						
						
						
						
						
						Remove supported cultures entry from appsettings.json 
						
						
					 | 
					
						2021-04-20 17:14:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7c5ca2c1a
					 | 
					
						
						
							
							Merge pull request #1254 from chlupac/alias
						
						
						
						
						
						
						
						Default Alias 
						
						
					 | 
					
						2021-04-20 17:07:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2ffb93fa4
					 | 
					
						
						
							
							Merge pull request #92 from oqtane/dev
						
						
						
						
						
						
						
						sync 
						
						
					 | 
					
						2021-04-20 14:13:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c4680c1972
					 | 
					
						
						
							
							Merge pull request #1262 from cnurse/dev
						
						
						
						
						
						
						
						Fix bug with installs due to missing Migrations 
						
						
					 | 
					
						2021-04-20 14:13:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f5beaf3fe
					 | 
					
						
						
							
							Fix bug with installs due to missing Migrations
						
						
						
						
						
						
					 | 
					
						2021-04-20 10:58:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97fb6ede7e
					 | 
					
						
						
							
							Reuse AddOqtaneScopedServices()
						
						
						
						
						
						
					 | 
					
						2021-04-20 19:10:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7d8888232
					 | 
					
						
						
							
							Refactor Program.cs
						
						
						
						
						
						
					 | 
					
						2021-04-20 19:01:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7f5fe9827
					 | 
					
						
						
							
							Merge branch 'database' into clean-startup
						
						
						
						
						
						
						
						# Conflicts:
#	Oqtane.Server/Startup.cs 
						
						
					 | 
					
						2021-04-20 17:42:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35225b2bb9
					 | 
					
						
						
							
							Move SqlServer databases into a separate project
						
						
						
						
						
						
					 | 
					
						2021-04-20 17:29:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b32dcf9b3
					 | 
					
						
						
							
							Make English default culture instead of current installed culture
						
						
						
						
						
						
					 | 
					
						2021-04-20 16:27:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e33c9e417d
					 | 
					
						
						
							
							Remove SupportedCultures entry from appsettings.json
						
						
						
						
						
						
					 | 
					
						2021-04-20 16:26:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d9a5a0275
					 | 
					
						
						
							
							Localize modules title
						
						
						
						
						
						
					 | 
					
						2021-04-20 16:20:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8069d838d5
					 | 
					
						
						
							
							Merge pull request #4 from oqtane/master
						
						
						
						
						
						
						
						sync 
						
						
					 | 
					
						2021-04-20 08:50:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5494be8f1
					 | 
					
						
						
							
							Merge pull request #1 from oqtane/dev
						
						
						
						
						
						
						
						Update to 2.0.2 
						
						
					 | 
					
						2021-04-20 06:44:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc6be52ae7
					 | 
					
						
						
							
							Merge pull request #91 from oqtane/dev
						
						
						
						
						
						
						
						sync 
						
						
					 | 
					
						2021-04-19 21:13:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40f8436947
					 | 
					
						
						
							
							Merge pull request #1239 from cnurse/dev
						
						
						
						
						
						
						
						Implement Database Migrations and add Multi-Database Support 
						
						
					 | 
					
						2021-04-19 21:11:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13f7db7b19
					 | 
					
						
						
							
							Resolve conflict
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:57:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b204cc988
					 | 
					
						
						
							
							Second attempt to resolve conflcit in Server project
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a11d30b1e4
					 | 
					
						
						
							
							Attempt to resolve conflict in Server project file
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:53:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2402cab3f3
					 | 
					
						
						
							
							Attempt to resolve conflict in DatabaseManager
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:50:25 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20b5a10882
					 | 
					
						
						
							
							Resolve name of variable in AddSite
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:15:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4598d0d6ba
					 | 
					
						
						
							
							Resolve conflict in AddSite
						
						
						
						
						
						
					 | 
					
						2021-04-19 11:13:10 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7516be41d9
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2021-04-19 14:10:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |