Skip to content

Commit

Permalink
Merge branch 'v18' into v18-fix-table-active-button-color
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/app/components/avatar/avatar.ts
#	src/app/components/avatargroup/avatargroup.ts
#	src/app/components/blockui/blockui.ts
#	src/app/components/card/card.ts
#	src/app/components/checkbox/checkbox.ts
#	src/app/components/chip/chip.ts
#	src/app/components/confirmdialog/confirmdialog.ts
#	src/app/components/dataview/dataview.ts
#	src/app/components/divider/divider.ts
#	src/app/components/dock/dock.ts
#	src/app/components/drawer/drawer.ts
#	src/app/components/fileupload/fileupload.ts
#	src/app/components/inplace/inplace.ts
#	src/app/components/inputgroup/inputgroup.ts
#	src/app/components/inputgroupaddon/inputgroupaddon.ts
#	src/app/components/inputicon/inputicon.ts
#	src/app/components/inputmask/inputmask.ts
#	src/app/components/inputswitch/inputswitch.ts
#	src/app/components/knob/knob.ts
#	src/app/components/listbox/listbox.ts
#	src/app/components/megamenu/megamenu.ts
#	src/app/components/message/message.ts
#	src/app/components/messages/messages.ts
#	src/app/components/organizationchart/organizationchart.ts
#	src/app/components/overlaypanel/overlaypanel.ts
#	src/app/components/paginator/paginator.ts
#	src/app/components/popover/popover.ts
#	src/app/components/progressbar/progressbar.ts
#	src/app/components/progressspinner/progressspinner.ts
#	src/app/components/radiobutton/radiobutton.ts
#	src/app/components/scrollpanel/scrollpanel.ts
#	src/app/components/selectbutton/selectbutton.ts
#	src/app/components/skeleton/skeleton.ts
#	src/app/components/slider/slider.ts
#	src/app/components/splitbutton/splitbutton.ts
#	src/app/components/splitter/splitter.ts
#	src/app/components/steps/steps.ts
#	src/app/components/table/table.ts
#	src/app/components/terminal/terminal.ts
#	src/app/components/timeline/timeline.ts
#	src/app/components/toast/toast.ts
#	src/app/components/togglebutton/togglebutton.ts
#	src/app/components/toggleswitch/toggleswitch.ts
#	src/app/components/virtualscroller/virtualscroller.ts
  • Loading branch information
EnricoMessall committed Nov 6, 2024
2 parents b74e1df + 11cd9a8 commit 754ad39
Show file tree
Hide file tree
Showing 1,478 changed files with 52,210 additions and 37,736 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true
"sourceMap": false
}
},
"defaultConfiguration": "production"
Expand Down
5 changes: 1 addition & 4 deletions api-generator/build-apidoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ async function main() {
const module_interface_group = module.groups.find((g) => g.title === 'Interface');
const module_service_group = module.groups.find((g) => g.title === 'Service');
const module_enums_group = module.groups.find((g) => g.title === 'Enumerations');

const module_types_group = module.groups.find((g) => g.title === 'Types');

if (isProcessable(module_types_group)) {
Expand Down Expand Up @@ -288,14 +287,12 @@ async function main() {
const templateType = template.type && template.type.toString();
let contextType = 'unknown';

// Regex ile TemplateRef<ContextType> kısmını yakalamak
const match = templateType && templateType.match(/TemplateRef<(.+)>/);
if (match && match[1]) {
contextType = match[1];
}

templates.values.push({
name: template.name,
name: template.name.replace(/Template$/, '').toLowerCase(),
description: template.comment && template.comment.summary.map((s) => s.text || '').join(' '),
type: templateType,
parameters: parameters(template).map((param) =>
Expand Down
34,068 changes: 18,827 additions & 15,241 deletions api-generator/themedoc.json

Large diffs are not rendered by default.

Loading

0 comments on commit 754ad39

Please sign in to comment.