Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,496 Commits 5 Branches 56 Tags
Commit Graph

6496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaun Walker
1b7ca45d4a Added support for friendly names and thumbnails in theme, layout, and container components. Added fallback support during loading for themes, layout, and containers. 2020-06-01 14:58:46 -04:00
Shaun Walker
01491b063d
Merge pull request #574 from chlupac/OqtaneIgnore 
OqtaneIgnore implementation fix
 2020-06-01 14:58:04 -04:00
Shaun Walker
4142cc63e7
Merge pull request #576 from sbwalker/master 
Added support for friendly names and thumbnails in theme, layout, and container components. Added fallback support during loading for themes, layout, and containers.
 2020-06-01 14:57:21 -04:00
Shaun Walker
20dc749d05
Merge pull request #575 from chlupac/ControlPanel 
Control panel Pane persistence & default selection fix.
 2020-06-01 08:09:07 -04:00
Pavel Vesely
4144be5323 Control panel Pane persistence & default selection fix. 2020-06-01 10:12:33 +02:00
Pavel Vesely
27a3ac8d1c OqtaneIgnore implementation fix 2020-06-01 09:21:53 +02:00
Shaun Walker
f45cb8b069 fix theme selection in sites 2020-05-31 22:56:19 -04:00
Shaun Walker
0cc325ee95
Merge pull request #573 from sbwalker/master 
fix theme selection in sites
 2020-05-31 22:54:54 -04:00
Shaun Walker
7d21cfefc1 restrict container selection to the current theme, hide layout selection if theme does not support layouts, make behavior consistent for all theme/layout/container selection 2020-05-31 22:53:11 -04:00
Shaun Walker
652d46f64a
Merge pull request #572 from sbwalker/master 
restrict container selection to the current theme, hide layout selection if theme does not support layouts, make behavior consistent for all theme/layout/container selection
 2020-05-31 22:52:05 -04:00
Shaun Walker
be4813d9c0
Merge pull request #31 from oqtane/master 
sync
 2020-05-31 20:45:12 -04:00
Shaun Walker
fe92d3d74f
Merge pull request #538 from thabaum/patch-9 
Site Settings: removes ONLY " <Select Container>"Theme and Layout drop down options
 2020-05-31 20:42:25 -04:00
Shaun Walker
833ea9461a
Merge pull request #568 from chlupac/ActionLink 
Allow to show icon only in action link
 2020-05-31 09:54:04 -04:00
Jim Spillane
47a917a3df
Merge pull request #16 from oqtane/master 
Sync master
 2020-05-30 18:41:08 -04:00
Pavel Vesely
cb484665ca Allow to show icon only in action link 2020-05-30 21:24:40 +02:00
Shaun Walker
64b0c2f128
Merge pull request #564 from sbwalker/master 
addressed consistency between theme loading and moduledefinition loading, added theme detailed UI view
 2020-05-29 16:27:04 -04:00
Shaun Walker
6402723d2a addressed consistency between theme loading and moduledefinition loading, added theme detailed UI view 2020-05-29 16:27:02 -04:00
Shaun Walker
b1a007491f
Merge pull request #30 from oqtane/master 
sync
 2020-05-29 10:53:46 -04:00
Shaun Walker
17ef268594
Merge pull request #559 from chlupac/ThemeRepository 
OqtaneIgnore implementation to theme elements
 2020-05-29 10:42:33 -04:00
Pavel Vesely
58d97dd731 OqtaneIgnore implementation to theme elements 2020-05-29 16:09:27 +02:00
Shaun Walker
ee3a4d1624
Merge pull request #556 from iJungleboy/patches/fix544 
Patches/fix544
 2020-05-29 08:38:22 -04:00
Shaun Walker
f9035f8fdf
Update README.md 2020-05-28 17:32:06 -04:00
Shaun Walker
3a5b6954e3 fix for #525 when running locally without a network connection 2020-05-28 16:24:22 -04:00
Shaun Walker
1794d54a3f
Merge pull request #557 from sbwalker/master 
fix for #525 when running locally without a network connection
 2020-05-28 16:23:15 -04:00
ijungleboy
7d251b20cc Fix collection of theme information because of improper namespace checks 
https://github.com/oqtane/oqtane.framework/issues/554
 2020-05-28 21:07:30 +02:00
Shaun Walker
0f09df13b5 page redirect support and added missing unique indexes on database tables 2020-05-28 14:48:00 -04:00
Shaun Walker
73763f1623
Merge pull request #555 from sbwalker/master 
page redirect support and added missing unique indexes on database tables
 2020-05-28 14:46:36 -04:00
Shaun Walker
1b2c7772ef
Merge pull request #29 from oqtane/master 
sync
 2020-05-28 14:39:10 -04:00
Shaun Walker
3b2583a1bd
Merge pull request #553 from chlupac/HorizontalMenuFix 
Horizontal menu fix
 2020-05-28 14:37:24 -04:00
Pavel Vesely
f7470e3c5b Horizontal menu fix 2020-05-28 20:00:28 +02:00
Shaun Walker
19f8b3d429
Merge pull request #28 from oqtane/master 
sync
 2020-05-28 10:30:12 -04:00
Shaun Walker
fd249a7734
Merge pull request #551 from chlupac/TryGetQueryValue 
Uri extensions for read query values
 2020-05-28 09:51:01 -04:00
Shaun Walker
d5f3b7513d
Merge pull request #549 from chlupac/UserSearch 
Search in User management
 2020-05-28 09:45:45 -04:00
Shaun Walker
2a3b7caa9f
Merge pull request #548 from jimspillane/FixWildcardRoute 
Fix Alias name route
 2020-05-28 09:45:34 -04:00
Shaun Walker
612a820dac fixed stylesheet and script removal logic 2020-05-28 09:44:41 -04:00
Shaun Walker
e80f42f1d9
Merge pull request #552 from sbwalker/master 
fixed stylesheet and script removal logic
 2020-05-28 09:43:23 -04:00
iJungleboy
8b5004c628
Merge pull request #1 from oqtane/master 
sync
 2020-05-28 12:47:23 +02:00
Pavel Vesely
151e37c470 Uri extensions for read query values 
- safe way to check if key is presented
- safe parsing int values in query
- should replace int.Parse()

  _jobId = Int32.Parse(PageState.QueryString["id"]);
  can throw unhandled exception when "id" is not int

  correct way
  if (PageState.Uri.TryGetQueryValueInt("id",out _jobId)) ....
 2020-05-28 12:26:23 +02:00
Pavel Vesely
e935451d93 Search in User management 2020-05-28 11:33:47 +02:00
Jim Spillane
b0af00aa47 Fix Alias route 
Added wildcard route catchall.
 2020-05-27 16:58:50 -04:00
Jim Spillane
cbbac26881
Merge pull request #15 from oqtane/master 
Sync upstream
 2020-05-27 16:55:10 -04:00
Shaun Walker
f2230dd530
Merge pull request #544 from chlupac/nuget 
Generate nugets in correct format
 2020-05-27 16:12:51 -04:00
Shaun Walker
963148c639 Refactor Javascript and Stylesheet loading 2020-05-27 16:03:38 -04:00
Shaun Walker
215e52e42e
Merge pull request #547 from sbwalker/master 
Refactor Javascript and Stylesheet loading
 2020-05-27 16:02:20 -04:00
Jim Spillane
945d7870c0
Merge pull request #14 from oqtane/master 
Sync master
 2020-05-26 18:46:49 -04:00
Shaun Walker
cc40733cff
Merge pull request #27 from oqtane/master 
sync
 2020-05-26 10:39:21 -04:00
Pavel Vesely
795f591da2 Generate nugets in correct format 2020-05-26 09:28:37 +02:00
Shaun Walker
4cab49e022
Merge pull request #535 from thabaum/patch-8 
Oqtane Theme:  CSS style module actions dropdown text #fff
 2020-05-25 11:33:07 -04:00
Shaun Walker
3b685fe571
Merge pull request #541 from jimspillane/ChangeJavaScriptNamespaceToOqtane 
Change JavaScript namespace from interop to Oqtane
 2020-05-25 11:32:54 -04:00
Jim Spillane
97df673609 Change JavaScript namespace from interop to Oqtane 2020-05-24 23:04:55 -04:00