hishamco
97fb6ede7e
Reuse AddOqtaneScopedServices()
2021-04-20 19:10:06 +03:00
hishamco
f7d8888232
Refactor Program.cs
2021-04-20 19:01:56 +03:00
hishamco
e7f5fe9827
Merge branch 'database' into clean-startup
...
# Conflicts:
# Oqtane.Server/Startup.cs
2021-04-20 17:42:39 +03: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
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
2021-04-19 09:24:01 -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
a85376afb1
2.0.2 release testing
2021-04-19 08:40:58 -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
hishamco
7417e8dd27
Merge branch 'dev' of https://github.com/oqtane/oqtane.framework into dev
2021-04-18 02:29:39 +03:00
hishamco
a018e853a8
Register configuration in startup
2021-04-18 02:27:31 +03:00
hishamco
73b13d7a54
Add Oqtane extension methods for clean startup
2021-04-18 02:25:40 +03: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
Charles Nurse
a0329b1b6c
Fix bug in new Migration to support PostgreSQL
2021-04-08 14:58:02 -07:00
Charles Nurse
8c45b7e42f
Added support for migrating existing Oqtane installations from DbUp to Migrations. Also added a Migration for version 2.0.2, and set current version to 2.1.0
2021-04-08 12:20:21 -07:00
Shaun Walker
1d3a79437c
add theme creator module to simplify the scaffolding of external themes
2021-04-07 13:05:18 -04:00
Shaun Walker
947c254e12
Merge pull request #1230 from sbwalker/dev
...
add theme creator modules to simplify the scaffolding of external themes
2021-04-07 13:03:04 -04:00
Shaun Walker
d05747af1e
enhanced ModuleActions component to display panes in a submenu, added more containers to Oqtane theme, added more panes to MultiPane layout, added module outline in edit mode to distinguish modules in panes, consolidated to use a single default AdminPane named "Content", fixed bug related to custom Admin Container behavior
2021-04-06 17:45:11 -04:00
Shaun Walker
0bf85a7a14
Merge pull request #1228 from sbwalker/dev
...
enhanced ModuleActions component to display panes in a submenu, added more containers to Oqtane theme, added more panes to MultiPane layout, added module outline in edit mode to distinguish modules in panes, consolidated to use a single default AdminPane named "Content", fixed bug related to custom Admin Container behavior
2021-04-06 17:42:43 -04:00
Shaun Walker
6b90e0f37b
fix #1197 - move folder path logic from Client Service to Server Controller
2021-04-05 08:53:22 -04:00
Shaun Walker
224f0c3ceb
Merge pull request #1227 from sbwalker/dev
...
fix #1197 - move folder path logic from Client Service to Server Controller
2021-04-05 08:52:29 -04:00
Shaun Walker
fc145a167d
organize theme components into folders
2021-04-03 19:46:29 -04:00
Shaun Walker
6354c9ebd0
Merge pull request #1226 from sbwalker/dev
...
organize theme components into folders
2021-04-03 19:43:49 -04:00
Shaun Walker
61b73060e5
login form validation
2021-04-02 16:14:02 -04:00
Shaun Walker
b5c1184fa4
Merge pull request #1224 from sbwalker/dev
...
login form validation
2021-04-02 16:11:38 -04:00
Charles Nurse
d12b18350f
Fixed bug in AddSite due to missing assignment of database type
2021-04-02 11:49:38 -07:00
Charles Nurse
985987d8f4
Updated initial appsettings.json
2021-04-02 11:28:34 -07:00
Charles Nurse
e6530ee127
Added support for MySQL and ProgreSQL and AddSite/Tenant
2021-04-02 10:55:00 -07:00
Shaun Walker
6606ebb58a
Merge pull request #88 from oqtane/dev
...
sync
2021-04-02 13:19:36 -04:00
