Commit Graph

  • 0cc325ee95 Merge pull request #573 from sbwalker/master Shaun Walker 2020-05-31 22:54:54 -04:00
  • f45cb8b069 fix theme selection in sites Shaun Walker 2020-05-31 22:56:19 -04:00
  • 652d46f64a Merge pull request #572 from sbwalker/master Shaun Walker 2020-05-31 22:52:05 -04:00
  • 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 Shaun Walker 2020-05-31 22:53:11 -04:00
  • be4813d9c0 Merge pull request #31 from oqtane/master Shaun Walker 2020-05-31 20:45:12 -04:00
  • fe92d3d74f Merge pull request #538 from thabaum/patch-9 Shaun Walker 2020-05-31 20:42:25 -04:00
  • 833ea9461a Merge pull request #568 from chlupac/ActionLink Shaun Walker 2020-05-31 09:54:04 -04:00
  • 47a917a3df Merge pull request #16 from oqtane/master Jim Spillane 2020-05-30 18:41:08 -04:00
  • cb484665ca Allow to show icon only in action link Pavel Vesely 2020-05-30 21:24:40 +02:00
  • 64b0c2f128 Merge pull request #564 from sbwalker/master Shaun Walker 2020-05-29 16:27:04 -04:00
  • 6402723d2a addressed consistency between theme loading and moduledefinition loading, added theme detailed UI view Shaun Walker 2020-05-29 16:27:02 -04:00
  • b1a007491f Merge pull request #30 from oqtane/master Shaun Walker 2020-05-29 10:53:46 -04:00
  • 17ef268594 Merge pull request #559 from chlupac/ThemeRepository Shaun Walker 2020-05-29 10:42:33 -04:00
  • 58d97dd731 OqtaneIgnore implementation to theme elements Pavel Vesely 2020-05-29 16:09:27 +02:00
  • ee3a4d1624 Merge pull request #556 from iJungleboy/patches/fix544 Shaun Walker 2020-05-29 08:38:22 -04:00
  • f9035f8fdf Update README.md Shaun Walker 2020-05-28 17:32:06 -04:00
  • 1794d54a3f Merge pull request #557 from sbwalker/master Shaun Walker 2020-05-28 16:23:15 -04:00
  • 3a5b6954e3 fix for #525 when running locally without a network connection Shaun Walker 2020-05-28 16:24:22 -04:00
  • 7d251b20cc Fix collection of theme information because of improper namespace checks https://github.com/oqtane/oqtane.framework/issues/554 ijungleboy 2020-05-28 21:07:30 +02:00
  • 73763f1623 Merge pull request #555 from sbwalker/master Shaun Walker 2020-05-28 14:46:36 -04:00
  • 0f09df13b5 page redirect support and added missing unique indexes on database tables Shaun Walker 2020-05-28 14:48:00 -04:00
  • 1b2c7772ef Merge pull request #29 from oqtane/master Shaun Walker 2020-05-28 14:39:10 -04:00
  • 3b2583a1bd Merge pull request #553 from chlupac/HorizontalMenuFix Shaun Walker 2020-05-28 14:37:24 -04:00
  • f7470e3c5b Horizontal menu fix Pavel Vesely 2020-05-28 20:00:28 +02:00
  • 19f8b3d429 Merge pull request #28 from oqtane/master Shaun Walker 2020-05-28 10:30:12 -04:00
  • fd249a7734 Merge pull request #551 from chlupac/TryGetQueryValue Shaun Walker 2020-05-28 09:51:01 -04:00
  • d5f3b7513d Merge pull request #549 from chlupac/UserSearch Shaun Walker 2020-05-28 09:45:45 -04:00
  • 2a3b7caa9f Merge pull request #548 from jimspillane/FixWildcardRoute Shaun Walker 2020-05-28 09:45:34 -04:00
  • e80f42f1d9 Merge pull request #552 from sbwalker/master Shaun Walker 2020-05-28 09:43:23 -04:00
  • 612a820dac fixed stylesheet and script removal logic Shaun Walker 2020-05-28 09:44:41 -04:00
  • 8b5004c628 Merge pull request #1 from oqtane/master iJungleboy 2020-05-28 12:47:23 +02:00
  • 151e37c470 Uri extensions for read query values Pavel Vesely 2020-05-28 12:26:23 +02:00
  • e935451d93 Search in User management Pavel Vesely 2020-05-28 11:32:24 +02:00
  • b0af00aa47 Fix Alias route Jim Spillane 2020-05-27 16:58:50 -04:00
  • cbbac26881 Merge pull request #15 from oqtane/master Jim Spillane 2020-05-27 16:55:10 -04:00
  • f2230dd530 Merge pull request #544 from chlupac/nuget Shaun Walker 2020-05-27 16:12:51 -04:00
  • 215e52e42e Merge pull request #547 from sbwalker/master Shaun Walker 2020-05-27 16:02:20 -04:00
  • 963148c639 Refactor Javascript and Stylesheet loading Shaun Walker 2020-05-27 16:03:38 -04:00
  • 945d7870c0 Merge pull request #14 from oqtane/master Jim Spillane 2020-05-26 18:46:49 -04:00
  • cc40733cff Merge pull request #27 from oqtane/master Shaun Walker 2020-05-26 10:39:21 -04:00
  • 795f591da2 Generate nugets in correct format Pavel Vesely 2020-05-26 09:04:15 +02:00
  • 4cab49e022 Merge pull request #535 from thabaum/patch-8 Shaun Walker 2020-05-25 11:33:07 -04:00
  • 3b685fe571 Merge pull request #541 from jimspillane/ChangeJavaScriptNamespaceToOqtane Shaun Walker 2020-05-25 11:32:54 -04:00
  • 97df673609 Change JavaScript namespace from interop to Oqtane Jim Spillane 2020-05-24 23:04:55 -04:00
  • cbcec0481a removed "Select Container, Theme, Layout" options Cody 2020-05-24 19:12:47 -07:00
  • 2f272ef4b6 style module actions dropdown text #fff Cody 2020-05-24 17:47:27 -07:00
  • a4ed06f2fc Merge pull request #13 from oqtane/master Jim Spillane 2020-05-24 19:43:11 -04:00
  • e4b37c17d8 Merge pull request #534 from sbwalker/master Shaun Walker 2020-05-24 19:10:21 -04:00
  • 3339690e2a Improvements to ModuleCreator external template to use Package references and include framework in Nuspec file Shaun Walker 2020-05-24 19:11:35 -04:00
  • f1f07f45c6 Merge pull request #531 from chlupac/ControlPanel Shaun Walker 2020-05-24 10:54:10 -04:00
  • 068803615b Notification job fill mail subject Pavel Vesely 2020-05-22 21:29:52 +02:00
  • ddbb08ea75 Control panel state persistence Pavel Vesely 2020-05-22 21:29:06 +02:00
  • 93497eb776 Merge pull request #530 from sbwalker/master Shaun Walker 2020-05-22 13:39:04 -04:00
  • 6ac2b64d7d improvements to module creator templates Shaun Walker 2020-05-22 13:39:59 -04:00
  • c2ddd248e4 Merge pull request #529 from sbwalker/master Shaun Walker 2020-05-22 11:51:04 -04:00
  • e1b0dbcdf7 modification to JSInterop and Quill Shaun Walker 2020-05-22 11:51:57 -04:00
  • a4ec456205 Merge branch 'master' of https://github.com/thabaum/Oqtane.Framework Cody 2020-05-21 21:10:57 -07:00
  • 23764d1ae4 Merge pull request #3 from oqtane/master Cody 2020-05-21 21:07:22 -07:00
  • f77a8a964f Merge remote-tracking branch 'oqtane.framework-upstream/master' Cody 2020-05-21 15:52:54 -07:00
  • 32cd34b090 Merge pull request #522 from sbwalker/master Shaun Walker 2020-05-21 15:54:53 -04:00
  • c089b90659 modifications to JSInterop in RichTextEditor Shaun Walker 2020-05-21 15:55:58 -04:00
  • 2f8a15fb89 Merge pull request #519 from sbwalker/master Shaun Walker 2020-05-20 15:30:44 -04:00
  • d8fca5de20 module creator templates need to be in the server project in order to be distributed with application Shaun Walker 2020-05-20 15:31:09 -04:00
  • 61b1b710db Merge pull request #517 from sbwalker/master Shaun Walker 2020-05-20 14:58:56 -04:00
  • 1495a5c017 fixed references in external template Shaun Walker 2020-05-20 14:59:57 -04:00
  • 24579dc4d0 Merge pull request #12 from oqtane/master Jim Spillane 2020-05-20 13:04:32 -04:00
  • 1355233b92 Merge pull request #515 from sbwalker/master Shaun Walker 2020-05-20 11:56:32 -04:00
  • 066ef44773 fixes to upgrade project Shaun Walker 2020-05-20 11:57:41 -04:00
  • dc55c5b3ec Merge pull request #26 from oqtane/master Shaun Walker 2020-05-20 09:19:36 -04:00
  • ed3f07ff61 Merge pull request #514 from mikecasas/external-module-creator-refs Shaun Walker 2020-05-20 08:52:16 -04:00
  • 028485b653 Merge remote-tracking branch 'upstream/master' into external-module-creator-refs Mike Casas 2020-05-20 08:06:18 -04:00
  • b43d191536 Merge pull request #25 from oqtane/master Shaun Walker 2020-05-20 08:03:39 -04:00
  • 43dfad38c9 Merge pull request #513 from mikecasas/fix-01 Shaun Walker 2020-05-20 08:02:30 -04:00
  • 6f1e930474 Updated the versions. Mike Casas 2020-05-20 06:51:22 -04:00
  • 1d52de53a6 Update reference. Mike Casas 2020-05-20 06:47:57 -04:00
  • 4dc24f4c78 Merge pull request #511 from sbwalker/master Shaun Walker 2020-05-19 17:58:53 -04:00
  • 3aec68d9fa added border Shaun Walker 2020-05-19 17:59:57 -04:00
  • a73e088abc Update README.md Shaun Walker 2020-05-19 17:49:43 -04:00
  • 31773abb01 Merge pull request #510 from sbwalker/master Shaun Walker 2020-05-19 17:48:05 -04:00
  • b61446a50a updated screenshots Shaun Walker 2020-05-19 17:49:11 -04:00
  • 85c491224d Update README.md Shaun Walker 2020-05-19 14:55:52 -04:00
  • 19fb3120d3 Update README.md v1.0.0 Shaun Walker 2020-05-19 14:18:43 -04:00
  • 4154bd0988 Merge pull request #509 from sbwalker/master Shaun Walker 2020-05-19 14:07:10 -04:00
  • 35b26c7525 update to version 1.0.0 Shaun Walker 2020-05-19 14:08:03 -04:00
  • b7eeda7562 Merge pull request #508 from sbwalker/master Shaun Walker 2020-05-19 13:38:30 -04:00
  • 52b2c876a4 performance optimizations to avoid use of reflection ( thanks to @chlupac for this suggestion ) Shaun Walker 2020-05-19 13:39:39 -04:00
  • a8ec5e1265 Merge pull request #507 from sbwalker/master Shaun Walker 2020-05-19 12:47:36 -04:00
  • b59e2533ea update to .NET Core 3.2 Shaun Walker 2020-05-19 12:48:30 -04:00
  • b82f69b8b0 Merge pull request #506 from sbwalker/master Shaun Walker 2020-05-19 09:16:37 -04:00
  • 61ff097f51 default theme needs to work in local development scenarios Shaun Walker 2020-05-19 09:17:38 -04:00
  • a160597f6f Merge pull request #505 from sbwalker/master Shaun Walker 2020-05-19 09:07:25 -04:00
  • 263b045c75 module creator template updates Shaun Walker 2020-05-19 09:08:29 -04:00
  • f0fe6551dd Merge pull request #24 from oqtane/master Shaun Walker 2020-05-19 08:24:12 -04:00
  • 09b17e142e Merge pull request #503 from jimspillane/FixMergeFiles Shaun Walker 2020-05-19 07:52:07 -04:00
  • b8ce634f85 Fix file upload merge Jim Spillane 2020-05-18 19:53:49 -04:00
  • 9b65cd0e07 Merge pull request #502 from sbwalker/master Shaun Walker 2020-05-18 18:01:23 -04:00
  • 1532eb7586 Optimized downloading of assemblies when using WebAssembly Shaun Walker 2020-05-18 18:02:23 -04:00
  • b4596cb624 Merge pull request #11 from oqtane/master Jim Spillane 2020-05-18 15:30:43 -04:00
  • 96c2a59551 Merge pull request #501 from sbwalker/master Shaun Walker 2020-05-18 13:33:50 -04:00
  • 5e23448618 use lambas for setting resources Shaun Walker 2020-05-18 13:34:53 -04:00