Commit Graph

1037 Commits

Author SHA1 Message Date
Shaun Walker
93497eb776
Merge pull request #530 from sbwalker/master
improvements to module creator templates
2020-05-22 13:39:04 -04:00
Shaun Walker
e1b0dbcdf7 modification to JSInterop and Quill 2020-05-22 11:51:57 -04:00
Shaun Walker
c2ddd248e4
Merge pull request #529 from sbwalker/master
modification to JSInterop and Quill
2020-05-22 11:51:04 -04:00
Cody
a4ec456205 Merge branch 'master' of https://github.com/thabaum/Oqtane.Framework 2020-05-21 21:10:57 -07:00
Cody
23764d1ae4
Merge pull request #3 from oqtane/master
update
2020-05-21 21:07:22 -07:00
Cody
f77a8a964f Merge remote-tracking branch 'oqtane.framework-upstream/master' 2020-05-21 15:52:54 -07:00
Shaun Walker
c089b90659 modifications to JSInterop in RichTextEditor 2020-05-21 15:55:58 -04:00
Shaun Walker
32cd34b090
Merge pull request #522 from sbwalker/master
modifications to JSInterop in RichTextEditor
2020-05-21 15:54:53 -04:00
Shaun Walker
d8fca5de20 module creator templates need to be in the server project in order to be distributed with application 2020-05-20 15:31:09 -04:00
Shaun Walker
2f8a15fb89
Merge pull request #519 from sbwalker/master
module creator templates need to be in the server project in order to be distributed with application
2020-05-20 15:30:44 -04:00
Shaun Walker
1495a5c017 fixed references in external template 2020-05-20 14:59:57 -04:00
Shaun Walker
61b1b710db
Merge pull request #517 from sbwalker/master
fixed references in external template
2020-05-20 14:58:56 -04:00
Jim Spillane
24579dc4d0
Merge pull request #12 from oqtane/master
Sync master
2020-05-20 13:04:32 -04:00
Shaun Walker
066ef44773 fixes to upgrade project 2020-05-20 11:57:41 -04:00
Shaun Walker
1355233b92
Merge pull request #515 from sbwalker/master
fixes to upgrade project
2020-05-20 11:56:32 -04:00
Shaun Walker
dc55c5b3ec
Merge pull request #26 from oqtane/master
sync
2020-05-20 09:19:36 -04:00
Shaun Walker
ed3f07ff61
Merge pull request #514 from mikecasas/external-module-creator-refs
External module creator refs
2020-05-20 08:52:16 -04:00
Mike Casas
028485b653 Merge remote-tracking branch 'upstream/master' into external-module-creator-refs 2020-05-20 08:06:18 -04:00
Shaun Walker
b43d191536
Merge pull request #25 from oqtane/master
sync
2020-05-20 08:03:39 -04:00
Shaun Walker
43dfad38c9
Merge pull request #513 from mikecasas/fix-01
Update reference.
2020-05-20 08:02:30 -04:00
Mike Casas
6f1e930474 Updated the versions. 2020-05-20 06:51:22 -04:00
Mike Casas
1d52de53a6 Update reference. 2020-05-20 06:47:57 -04:00
Shaun Walker
3aec68d9fa added border 2020-05-19 17:59:57 -04:00
Shaun Walker
4dc24f4c78
Merge pull request #511 from sbwalker/master
added border
2020-05-19 17:58:53 -04:00
Shaun Walker
a73e088abc
Update README.md 2020-05-19 17:49:43 -04:00
Shaun Walker
b61446a50a updated screenshots 2020-05-19 17:49:11 -04:00
Shaun Walker
31773abb01
Merge pull request #510 from sbwalker/master
updated screenshots
2020-05-19 17:48:05 -04:00
Shaun Walker
85c491224d
Update README.md 2020-05-19 14:55:52 -04:00
Shaun Walker
19fb3120d3
Update README.md 2020-05-19 14:18:43 -04:00
Shaun Walker
35b26c7525 update to version 1.0.0 2020-05-19 14:08:03 -04:00
Shaun Walker
4154bd0988
Merge pull request #509 from sbwalker/master
update to version 1.0.0
2020-05-19 14:07:10 -04:00
Shaun Walker
52b2c876a4 performance optimizations to avoid use of reflection ( thanks to @chlupac for this suggestion ) 2020-05-19 13:39:39 -04:00
Shaun Walker
b7eeda7562
Merge pull request #508 from sbwalker/master
performance optimizations to avoid use of reflection ( thanks to @chlupac for this suggestion )
2020-05-19 13:38:30 -04:00
Shaun Walker
b59e2533ea update to .NET Core 3.2 2020-05-19 12:48:30 -04:00
Shaun Walker
a8ec5e1265
Merge pull request #507 from sbwalker/master
update to .NET Core 3.2
2020-05-19 12:47:36 -04:00
Shaun Walker
61ff097f51 default theme needs to work in local development scenarios 2020-05-19 09:17:38 -04:00
Shaun Walker
b82f69b8b0
Merge pull request #506 from sbwalker/master
default theme needs to work in local development scenarios
2020-05-19 09:16:37 -04:00
Shaun Walker
263b045c75 module creator template updates 2020-05-19 09:08:29 -04:00
Shaun Walker
a160597f6f
Merge pull request #505 from sbwalker/master
module creator template updates
2020-05-19 09:07:25 -04:00
Shaun Walker
f0fe6551dd
Merge pull request #24 from oqtane/master
sync
2020-05-19 08:24:12 -04:00
Shaun Walker
09b17e142e
Merge pull request #503 from jimspillane/FixMergeFiles
Fix file upload merge
2020-05-19 07:52:07 -04:00
Jim Spillane
b8ce634f85 Fix file upload merge
Allow upload of file names that match the token pattern ".part_", but not in the file extension. For example, a file named, a.part_Y.txt, would not be uploaded.
2020-05-18 19:53:49 -04:00
Shaun Walker
1532eb7586 Optimized downloading of assemblies when using WebAssembly 2020-05-18 18:02:23 -04:00
Shaun Walker
9b65cd0e07
Merge pull request #502 from sbwalker/master
Optimized downloading of assemblies when using WebAssembly
2020-05-18 18:01:23 -04:00
Jim Spillane
b4596cb624
Merge pull request #11 from oqtane/master
Sync upstream
2020-05-18 15:30:43 -04:00
Shaun Walker
5e23448618 use lambas for setting resources 2020-05-18 13:34:53 -04:00
Shaun Walker
96c2a59551
Merge pull request #501 from sbwalker/master
use lambas for setting resources
2020-05-18 13:33:50 -04:00
Shaun Walker
6ae019336d changing default theme to Oqtane theme 2020-05-18 10:44:54 -04:00
Shaun Walker
0c236682b9
Merge pull request #500 from sbwalker/master
changing default theme to Oqtane theme
2020-05-18 10:44:00 -04:00
Shaun Walker
9b74262c76 Added support for module resource management 2020-05-18 09:47:37 -04:00