Skip to content

Merge branch dev with rel-6.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1,241 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1241 commits
Select commit Hold shift + click to select a range
9a2b28a
Removed the unnecessary event for widget keyup
malikmasis Jul 3, 2022
f1cbaeb
Merge branch 'dev' into adding-widget-to-editor
malikmasis Jul 3, 2022
400152a
Update AbpTestModule.cs
maliming Jul 4, 2022
e1b4058
Update AbpTestModule.cs
maliming Jul 4, 2022
0bf8e2a
Merge pull request #13204 from turrisxyz/Pinned-Dependencies-GitHub
maliming Jul 4, 2022
ce08df3
Add `Microsoft.Bcl.AsyncInterfaces` package to `Volo.Abp.DistributedL…
maliming Jul 4, 2022
179f64f
Merge pull request #13205 from abpframework/Volo.Abp.DistributedLocki…
maliming Jul 4, 2022
4c947dd
Added some hiding/showing elements
malikmasis Jul 4, 2022
88c897f
Merge branch 'dev' into adding-widget-to-editor
malikmasis Jul 4, 2022
0e39d7b
Rename `AllowTenantsToChangeEmailSettings` to `AllowChangingEmailSett…
maliming Jul 4, 2022
c840d2f
Merge pull request #13193 from abpframework/LeptonXLite
EngincanV Jul 4, 2022
ff52499
Update zh-Hans.json
maliming Jul 4, 2022
9f28224
Merge pull request #13209 from abpframework/maliming-patch-1
realLiangshiwei Jul 4, 2022
fae5445
Update leptonx theme versions to 1.0.0-beta.3 for templates
EngincanV Jul 4, 2022
061b459
Merge pull request #13210 from abpframework/EngincanV/template-update
maliming Jul 4, 2022
4f1822c
Update theme.css
enisn Jul 4, 2022
b515f89
Merge pull request #13208 from abpframework/AllowChangingEmailSettings
realLiangshiwei Jul 4, 2022
525d6b5
Merge branch 'dev' into auto-merge/rel-5-3/1177
maliming Jul 4, 2022
848ce4e
Merge pull request #13194 from abpframework/auto-merge/rel-5-3/1177
maliming Jul 4, 2022
2163620
Removed loading the manual script files
malikmasis Jul 4, 2022
8a75007
Merge branch 'dev' into adding-widget-to-editor
malikmasis Jul 4, 2022
0d4ee57
Improve Chinese localization
realLiangshiwei Jul 5, 2022
5127074
Merge pull request #13235 from abpframework/liangshiwei/patch-1
maliming Jul 5, 2022
408f7a1
Update Authorization Chinese document
dhssingle Jul 5, 2022
20df33f
Merge pull request #13237 from dhssingle/dev
maliming Jul 5, 2022
95fd9df
Edited the design for AddWidgetModal
malikmasis Jul 5, 2022
7b268f0
Merge branch 'dev' into adding-widget-to-editor
malikmasis Jul 5, 2022
34dca9a
Removed the unnecessary space char
malikmasis Jul 5, 2022
9243b51
Changed structure of CmsKitContentWidgetOptions
malikmasis Jul 5, 2022
e273c27
Changed key name places
malikmasis Jul 5, 2022
fcec87c
Added the AddWidget button to Page/Update
malikmasis Jul 5, 2022
0c07830
Added `AddWidget` button to Blogpost\Create
malikmasis Jul 5, 2022
55681e4
Added `AddWidget` button to Blogpost\Update
malikmasis Jul 5, 2022
81f35da
Add bool return value to `MultiTenancyMiddlewareErrorPageBuilder` dec…
maliming Jul 6, 2022
68289a9
Set JsonSerializerOptionsCache static.
maliming Jul 6, 2022
371a7a0
Update AbpSystemTextJsonSerializerProvider.cs
maliming Jul 6, 2022
ee470c4
Removed the example hard coded data
malikmasis Jul 6, 2022
d1f8a63
Update the summary.
maliming Jul 6, 2022
0a6c531
Review Refactors
enisn Jul 6, 2022
05e7796
Merge pull request #13248 from abpframework/AbpSystemTextJsonSerializ…
realLiangshiwei Jul 6, 2022
9fbb920
Merge pull request #13249 from abpframework/auto-merge/rel-5-3/1178
maliming Jul 6, 2022
899a194
Update Authorization.md
maliming Jul 6, 2022
e04a3e6
Merge pull request #13250 from abpframework/maliming-patch-1
maliming Jul 6, 2022
4ef4573
Merge pull request #13251 from abpframework/auto-merge/rel-5-3/1179
maliming Jul 6, 2022
cbc1206
Merge pull request #13245 from abpframework/MultiTenancyMiddlewareErr…
realLiangshiwei Jul 6, 2022
43aeec3
Used EditorComponentName istead of InternalName
malikmasis Jul 6, 2022
0175282
Merge branch 'dev' into adding-widget-to-editor
malikmasis Jul 6, 2022
6b51245
Merge pull request #13242 from abpframework/adding-widget-to-editor
enisn Jul 6, 2022
9ecd795
Used `W` instead of `AW` for the widget button
malikmasis Jul 6, 2022
13dd07d
Used widgetName instead of widgetType
malikmasis Jul 6, 2022
60e9646
Merge pull request #13253 from abpframework/cms-kit-render-typo
enisn Jul 6, 2022
3b164f5
Add `--theme-style` option to CLI
EngincanV Jul 6, 2022
81de31b
Update LeptonX Lite package versions to 1.0.0-beta.4 for application …
EngincanV Jul 6, 2022
bb5d737
Add @volo scope to angular template's .npmrc file
ismcagdas Jul 7, 2022
a7b7946
app-nolayers: Add @volo registry to .npmrc for angular
EngincanV Jul 7, 2022
0429ca2
Update_NPM_Packages
voloagent Jul 7, 2022
c956586
Create dynamic components for blazor layout
EngincanV Jul 7, 2022
e726212
Exclude abstract BundleContributors in BundlingService
enisn Jul 7, 2022
b10aa45
Rename to AbpDynamicComponents as DynamicLayoutComponent
EngincanV Jul 7, 2022
9271edc
Merge pull request #13266 from abpframework/enisn/exclude-abstract-bu…
enisn Jul 7, 2022
a4e1e9b
Merge pull request #13267 from abpframework/EngincanV/blazor-dynamic-…
enisn Jul 7, 2022
2233035
Merge pull request #13258 from abpframework/EngincanV/update-templates-1
EngincanV Jul 7, 2022
8fa9558
add x requested with header, (#13268)
muhammedaltug Jul 7, 2022
e593dad
Add missing Authorize attribute to setting-management
roc916 Jul 7, 2022
8651259
add public website parameter
ebicoglu Jul 7, 2022
b42ece5
Merge branch 'dev' into auto-merge/rel-5-3/1181
maliming Jul 8, 2022
557aa55
Merge pull request #13272 from abpframework/auto-merge/rel-5-3/1181
maliming Jul 8, 2022
a59e1ea
Merge pull request #13271 from roc916/setting-management
maliming Jul 8, 2022
bc24556
Merge branch 'dev' into auto-merge/rel-5-3/1182
maliming Jul 8, 2022
c1b2da0
Merge pull request #13273 from abpframework/auto-merge/rel-5-3/1182
maliming Jul 8, 2022
a35b9c8
Used insertText instead of set innerHtml
malikmasis Jul 8, 2022
c2c1643
Fixed on Page\Create
malikmasis Jul 8, 2022
016d32b
Update "swagger hide endpoints" article
EngincanV Jul 9, 2022
83b9870
Fixed the Blogpost's editor
malikmasis Jul 9, 2022
c3bf6d0
Fixed the Page's editor
malikmasis Jul 9, 2022
751d9ac
Made editorWidgetName required
malikmasis Jul 9, 2022
746c982
Added the required parameter to unit tests
malikmasis Jul 10, 2022
c501626
fix encoding
SecTex Jul 11, 2022
9e1257b
Create ContentAdminAppService_Tests.cs
malikmasis Jul 11, 2022
44b9ece
Merge pull request #13283 from SecTex/ms/patch-1
maliming Jul 12, 2022
9be9141
Remove duplicate resources
realLiangshiwei Jul 12, 2022
80e96ea
Update unit test
realLiangshiwei Jul 12, 2022
9e25502
Merge pull request #13286 from abpframework/liangshiwei/identityserver
maliming Jul 12, 2022
b040199
Merge pull request #13288 from abpframework/auto-merge/rel-5-3/1183
maliming Jul 12, 2022
ab1eacf
Update Getting-Started-AspNetCore-Application.md
maliming Jul 12, 2022
a66f38d
Merge pull request #13289 from abpframework/maliming-patch-1
realLiangshiwei Jul 12, 2022
a5ab700
Merge pull request #13290 from abpframework/auto-merge/rel-5-3/1184
maliming Jul 12, 2022
c2f4f00
Merge pull request #13278 from abpframework/EngincanV/post-update
EngincanV Jul 13, 2022
fc0e72f
Update theme.css
armgnunlu Jul 13, 2022
f048c3e
Merge pull request #13232 from abpframework/enisn/blazor-ui-improvements
armgnunlu Jul 13, 2022
adaba33
Merge branch 'dev' into berkan/cli-leptonx
EngincanV Jul 13, 2022
18a22d8
Convert to single editor in BlogPost create page
enisn Jul 13, 2022
adc5130
Merge branch 'dev' into CmsKit-Editor-Issue-10970
malikmasis Jul 13, 2022
83a9345
Converted to single editor in the Page feature
malikmasis Jul 13, 2022
36af3dd
Converted to single editor in the blogpost feature
malikmasis Jul 13, 2022
0642959
Used `change` instead of `click`
malikmasis Jul 13, 2022
dd7b28b
Add unit test for OpenIddict module
realLiangshiwei Jul 13, 2022
c98cc0f
Merge pull request #13279 from abpframework/CmsKit-Editor-Issue-10970
enisn Jul 13, 2022
10f2648
Merge pull request #13296 from abpframework/liangshiwei/openiddict_tests
maliming Jul 13, 2022
c5cf1e1
split install cli section
ebicoglu Jul 13, 2022
1fd624c
Update Index.md
ebicoglu Jul 13, 2022
9b6e682
Update MyProjectNameMongoDbContext.cs
ebicoglu Jul 13, 2022
3ac41f2
Merge pull request #13303 from abpframework/auto-merge/rel-5-3/1187
maliming Jul 14, 2022
36fb7e5
Update ProjectCreationCommandBase.cs
EngincanV Jul 14, 2022
36d2d23
CLI: Check if it's the default theme for templates
EngincanV Jul 14, 2022
3db32de
fix range error in permission directive (#13307)
muhammedaltug Jul 14, 2022
24ec31b
Fix issue #13006
mahmut-gundogdu Jul 14, 2022
ebc1170
Added some example widgets for doc
malikmasis Jul 14, 2022
e90c6df
Add dynamic parameters to dynamic widget
enisn Jul 14, 2022
ac36705
revert BlogPost/create.js changes
enisn Jul 14, 2022
c9b70a2
Merge pull request #13310 from abpframework/issue/13006
muhammedaltug Jul 14, 2022
2752586
Merge pull request #13311 from abpframework/dynamic-widget-dynamic-pa…
malikmasis Jul 14, 2022
e13446d
Add GetIssuer functon on EnvironmentService
mahmut-gundogdu Jul 14, 2022
3db6aaa
Merge pull request #13314 from abpframework/issue/10947
muhammedaltug Jul 14, 2022
1c5cfb7
Merge pull request #13312 from abpframework/auto-merge/rel-5-3/1189
maliming Jul 14, 2022
10454ec
CLI: Change theme by option for app-nolayers template
EngincanV Jul 14, 2022
a4b8c10
Fix the ITransientDependency naming.
hikalkan Jul 14, 2022
e5a0b4d
Merge pull request #13316 from abpframework/auto-merge/rel-5-3/1190
realLiangshiwei Jul 15, 2022
b2dd904
Add `CancelClosingModalWhenFocusLost` extension method.
maliming Jul 15, 2022
c4a1157
Update Object To Object Mapping document
realLiangshiwei Jul 15, 2022
90319ec
Merge pull request #13318 from abpframework/liangshiwei/patch-1
maliming Jul 15, 2022
2fe6128
Merge pull request #13319 from abpframework/auto-merge/rel-5-3/1191
maliming Jul 15, 2022
3d0df50
Merge pull request #13317 from abpframework/modal-closing
realLiangshiwei Jul 15, 2022
2fe984d
Merge pull request #13320 from abpframework/auto-merge/rel-5-3/1192
realLiangshiwei Jul 15, 2022
0b6619d
Do not add duplicated providers to PermissionDefinition.
hikalkan Jul 15, 2022
2bc83c9
Merge branch 'dev' of https://github.com/abpframework/abp into dev
hikalkan Jul 15, 2022
1167c78
Prevent duplicate providers in the list.
hikalkan Jul 15, 2022
80f907f
Fix method summaries
hikalkan Jul 15, 2022
761a218
Remove TODOs that we won't implement.
hikalkan Jul 15, 2022
3150bae
Merge branch 'dev' into berkan/cli-leptonx
EngincanV Jul 16, 2022
54e1bb7
Update DistributedCache.cs
hikalkan Jul 16, 2022
07bcf8a
Update ChangeThemeStep.cs
EngincanV Jul 16, 2022
bd003f1
Update ChangeThemeStep.cs
EngincanV Jul 16, 2022
fe61bc5
CLI: Refactor ChangeThemeStep.cs
EngincanV Jul 17, 2022
1b8557d
Update ChangeThemeStep.cs
EngincanV Jul 17, 2022
1b5f17d
Merge branch 'dev' into berkan/cli-leptonx
maliming Jul 18, 2022
d71d4c5
Merge pull request #13195 from abpframework/volo/pull/10943
gterdem Jul 18, 2022
db67755
Add missing localization
realLiangshiwei Jul 18, 2022
5762f91
Merge pull request #13327 from abpframework/liangshiwei/patch
maliming Jul 18, 2022
4ea5344
Merge pull request #13328 from abpframework/auto-merge/rel-5-3/1193
maliming Jul 18, 2022
c4ab282
CLI: Fix the switching theme to Lepton problems for nolayers template
EngincanV Jul 18, 2022
3ae013f
Update ChangeThemeStep.cs
EngincanV Jul 18, 2022
9d006f2
Update ChangeThemeStep.cs
EngincanV Jul 18, 2022
04a26b9
CLI: Fix wrong path for mvc nolayers template
EngincanV Jul 18, 2022
2df949f
Merge pull request #13306 from abpframework/berkan/cli-leptonx
maliming Jul 18, 2022
829d6d1
Update leptonx-lite packages to 1.0.0-beta.5
EngincanV Jul 18, 2022
169614b
app template: re-generate bundle for blazor
EngincanV Jul 18, 2022
98c5d4d
Enhance Console template
realLiangshiwei Jul 19, 2022
bdce4b0
Merge pull request #13332 from abpframework/liangshiwei/console
maliming Jul 19, 2022
f13c840
Merge pull request #13330 from abpframework/EngincanV/update-lepton-p…
EngincanV Jul 19, 2022
c3dc066
no more basic theme. migrating to LeptonX Lite
ebicoglu Jul 19, 2022
e684909
Basic theme is not default anymore (leptonx lite)
ebicoglu Jul 19, 2022
b87cfd8
Update Basic-Theme.md
ebicoglu Jul 19, 2022
6613a9d
Default theme is LeptonX Lite right now
ebicoglu Jul 19, 2022
3477496
Default theme is LeptonX Lite right now
ebicoglu Jul 19, 2022
7303a95
Default theme is LeptonX Lite right now
ebicoglu Jul 19, 2022
86d4b95
Added missing localization items to the en.json file
dlboutwe Jul 20, 2022
4ec7c18
Fixed styling issue
dlboutwe Jul 20, 2022
64bd96e
Update Background-Workers.md
xyfy Jul 20, 2022
900a515
Merge pull request #13344 from xyfy/patch-4
realLiangshiwei Jul 20, 2022
d7e6c3f
Update LeptonX Lite Theme Packages to 1.0.0-rc.1
EngincanV Jul 20, 2022
9c7e08a
Update LeptonX Lite Theme Packages to 1.0.0-rc.1 for nolayers template
EngincanV Jul 20, 2022
a18c6a3
Update Default.cshtml
EngincanV Jul 20, 2022
5f46e71
Merge pull request #13343 from dlboutwe/cmskit-fixes
EngincanV Jul 20, 2022
ce13a13
Merge pull request #12786 from vnetonline/patch-5
muhammedaltug Jul 20, 2022
8c2295b
Merge pull request #13345 from abpframework/EngincanV/update-leptonx-…
ismcagdas Jul 20, 2022
6209127
Added new test for IDistributedCache.
hikalkan Jul 21, 2022
ece3576
Rename test.
hikalkan Jul 21, 2022
7a77dc4
Fix wrong project reference path for appnolayers template
EngincanV Jul 21, 2022
5278679
Merge pull request #13358 from abpframework/EngincanV/appnolayers
maliming Jul 21, 2022
90a50a7
Fix/ng template bugs (#13361)
muhammedaltug Jul 21, 2022
855ef2b
issue #12579 implemented
mahmut-gundogdu Jul 21, 2022
6cb4ae8
Grammatically updated the contribution guide docs
IsmaelLiriano12 Jul 21, 2022
516fc3f
Merge pull request #13364 from IsmaelLiriano12/misspelling-docs
EngincanV Jul 22, 2022
37ef2cc
Check `TenantSideFeatures` only if tenant is available.
maliming Jul 22, 2022
f17dfdc
Merge pull request #13366 from abpframework/TenantSideFeatures
maliming Jul 22, 2022
0eaf709
update base branch to rel-6.0
muhammedaltug Jul 22, 2022
ecb6ad0
Update common.props
skoc10 Jul 22, 2022
e95cd04
Merge pull request #13368 from abpframework/skoc10/update-version-1
ebicoglu Jul 22, 2022
1527213
Update_NPM_Packages
voloagent Jul 22, 2022
b19f22c
Merge pull request #13378 from abpframework/rel-5.2
hikalkan Jul 22, 2022
03cccb1
Merge pull request #13381 from abpframework/rel-5.2
hikalkan Jul 22, 2022
520eec7
Merge branch 'rel-5.3' of https://github.com/abpframework/abp into me…
muhammedaltug Jul 22, 2022
5648a1b
Improve IMultiLingualObjectManager
ahmednfwela Jul 22, 2022
fc3697d
keep old format
ahmednfwela Jul 22, 2022
33740d3
Merge pull request #13383 from abpframework/merge/rel-5-3-to-rel-6-0
muhammedaltug Jul 22, 2022
73cb783
Merge pull request #13367 from abpframework/update-auto-pr-5-3
enisn Jul 22, 2022
df6e000
Merge pull request #13385 from abpframework/auto-merge/rel-5-3/1198
enisn Jul 22, 2022
4f0e20b
update base branch to dev
muhammedaltug Jul 22, 2022
ee3fede
Merge pull request #13386 from abpframework/auto-pr-rel-6
enisn Jul 22, 2022
81d7ee7
fix typo
hienlech Jul 24, 2022
6c8873d
Merge pull request #13393 from hienlech/patch-1
realLiangshiwei Jul 25, 2022
299aac6
Merge pull request #13394 from abpframework/auto-merge/rel-5-3/1200
realLiangshiwei Jul 25, 2022
7c045b4
Check `element.parentElement` not null.
maliming Jul 25, 2022
393528b
Merge pull request #13396 from abpframework/unblock
realLiangshiwei Jul 25, 2022
83f1ac0
Merge pull request #13397 from abpframework/auto-merge/rel-5-3/1202
maliming Jul 25, 2022
b101260
Migration Identity Server to OpenIddict Guides.
maliming Jul 25, 2022
c55fa45
made `editorWidgetName` is optional
malikmasis Jul 25, 2022
7e3e0a2
formating
malikmasis Jul 25, 2022
ac7704f
Merge pull request #13406 from abpframework/editor-parameters-optional
enisn Jul 25, 2022
5a1b4e1
remove duplicate slashes in url (#13409)
muhammedaltug Jul 25, 2022
5cc6928
add parameter for templates (#13410)
muhammedaltug Jul 25, 2022
b754d63
Update common.props
skoc10 Jul 26, 2022
4d4e56c
Merge pull request #13362 from abpframework/issue/12579
muhammedaltug Jul 26, 2022
29f7679
Merge pull request #13414 from abpframework/skoc10/update-version-1
ebicoglu Jul 26, 2022
acb7620
Update AbpExceptionFilter.cs
maliming Jul 26, 2022
fc1e795
Update AbpExceptionPageFilter.cs
maliming Jul 26, 2022
ac65f9d
Merge pull request #13384 from Bdaya-Dev/improve-multi-lingual
realLiangshiwei Jul 26, 2022
53c02f3
Merge pull request #13420 from abpframework/maliming-patch-1
realLiangshiwei Jul 26, 2022
c23833c
Create Abp-6_0.md
gterdem Jul 26, 2022
7838e7b
Update_NPM_Packages
voloagent Jul 26, 2022
9727817
Merge branch 'rel-6.0' of https://github.com/abpframework/abp into re…
voloagent Jul 26, 2022
6998182
Added LeptonX and OpenIddict headers
gterdem Jul 26, 2022
e76ccb8
Updated leptonx guide
gterdem Jul 26, 2022
3d7cd76
Delete the IdentityServer folder in the app template
realLiangshiwei Jul 27, 2022
a06271b
Merge pull request #13432 from abpframework/liangshiwei/patch-1
maliming Jul 27, 2022
e685d2a
Update IdentityServer_To_OpenIddict.md
maliming Jul 27, 2022
e0f3c51
Update IdentityServer_To_OpenIddict.md
maliming Jul 27, 2022
59abe9a
Init blog-post for 6.0-rc.1 release
EngincanV Jul 27, 2022
c4b10a4
Enhance startup templates for the OpenIddict
realLiangshiwei Jul 27, 2022
2461a70
Merge pull request #13435 from abpframework/liangshiwei/template
maliming Jul 27, 2022
642fc66
Update POST.md
EngincanV Jul 27, 2022
15d39ed
Update IdentityServer_To_OpenIddict.md
realLiangshiwei Jul 27, 2022
99f201b
Update IdentityServer_To_OpenIddict.md
maliming Jul 27, 2022
ab4ef50
Update Abp-6_0.md
gterdem Jul 27, 2022
ee35a64
Complete the ABP Framework section in blog-post for 6.0-rc
EngincanV Jul 27, 2022
5fac3c3
Add "Abp Commercial" section to blog-post for 6.0.0-rc.1
EngincanV Jul 27, 2022
10e5c6a
Complete the ABP Commercial section in blog-post for 6.0-rc
EngincanV Jul 28, 2022
c30a7e8
Update POST.md
EngincanV Jul 28, 2022
8b0fcb0
Merge pull request #13403 from abpframework/Migration-Identity-Server…
realLiangshiwei Jul 28, 2022
1ea4542
Update IdentityServer_To_OpenIddict.md
ebicoglu Jul 28, 2022
a0e2da3
Update IdentityServer_To_OpenIddict.md
ebicoglu Jul 28, 2022
1c4d914
Update IdentityServer_To_OpenIddict.md
ebicoglu Jul 28, 2022
dd086a1
Update IdentityServer_To_OpenIddict.md
ebicoglu Jul 28, 2022
a61658c
Refactor 6.0 RC1 blog post
ebicoglu Jul 28, 2022
d1cc1c2
Add 6.0 migration guide to Migration Guides list
EngincanV Jul 28, 2022
bab5f43
Update enum localization keys.
maliming Jul 28, 2022
285c220
Merge pull request #13451 from abpframework/enum
realLiangshiwei Jul 28, 2022
d56d2e9
Merge pull request #13425 from abpframework/gterdem/migration_guide_6_0
ebicoglu Jul 28, 2022
4590373
Complete v6.0-rc.1 blog-post
EngincanV Jul 28, 2022
65d149a
Merge pull request #13444 from abpframework/EngincanV/blog-post
EngincanV Jul 28, 2022
f8c83cf
Update Theming.md
EngincanV Jul 28, 2022
ebb0e29
Update Theming.md
ebicoglu Jul 28, 2022
e7a8c89
Merge pull request #13457 from abpframework/EngincanV/update-theming-…
ebicoglu Jul 28, 2022
fdfc39d
Removed unused usings
gterdem Jul 28, 2022
926e90a
Merge pull request #13462 from abpframework/gterdem/remove_unused_usings
maliming Jul 29, 2022
6436db9
Update environment.prod.ts
maliming Jul 29, 2022
5bb40ca
Merge pull request #13464 from abpframework/environment.prod.ts
realLiangshiwei Jul 29, 2022
6565e35
Update en.json
salihozkara Jul 29, 2022
893181d
Merge pull request #13469 from abpframework/volo/issue/11259
EngincanV Jul 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed loading the manual script files
  • Loading branch information
malikmasis committed Jul 4, 2022
commit 2163620a0e91a9bbefbea7f8739a11b41b557e0f
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,23 @@ $(function () {

var initModal = function () {

$('head').append('<script type="text/javascript" src="/Pages/CmsKit/Polls/Polls.js"></script>');
$('head').append('<script type="text/javascript" src="/client-proxies/cms-kit-pro-proxy.js"></script>');
$('head').append('<script type="text/javascript" src="/client-proxies/cms-kit-pro-admin-proxy.js"></script>');

let widgetType;
$("#ViewModel_Widget").change(function () {
widgetType = this.value;

$("#PropertySideId").html('');
$("#WidgetCode").attr("hidden", "true");
$("#WidgetCodeDiv").hide();

volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) {
var widgetTypes = data.items.filter(v => v.key === widgetType);
var firstWidgetType = widgetTypes[0];
if (firstWidgetType.key == "Poll") {
$("#polls").removeAttr("hidden");
$("#WidgetCode").removeAttr("hidden");
$("#WidgetCodeDiv").show();
}
else {

$("#WidgetCode").attr("hidden", "true");
$("#WidgetCodeDiv").hide();

for (const property of firstWidgetType.properties) {

Expand All @@ -39,7 +35,7 @@ $(function () {
});

$("#save-changes").click(function () {
var widgetKey = $('#WidgetCodes option').attr("data-key");
var widgetKey = $("#WidgetCode").val();
if (widgetKey != undefined) {
let html = " <input hidden class=\"properties form-control\" value=\"" + widgetKey + "\" id=\"Code\" type=\"text\" />"
$("#PropertySideId").append(html);
Expand Down