Skip to content

Commit

Permalink
Merge branch 'development' into additional-date-range-event
Browse files Browse the repository at this point in the history
  • Loading branch information
lexasq authored Oct 24, 2024
2 parents 6eb64e1 + b56863d commit 8cde669
Show file tree
Hide file tree
Showing 38 changed files with 38 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
5 changes: 2 additions & 3 deletions apps/ngx-bootstrap-docs/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { environment } from '../environments/environment';
Expand All @@ -15,8 +14,8 @@ import { routes } from './app.routing';
],
bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
DocsModule,
RouterModule.forRoot(routes, { useHash: environment.useHash }),
BsDropdownModule], providers: [
RouterModule.forRoot(routes, { useHash: environment.useHash })
], providers: [
{ provide: NgApiDoc, useValue: ngdoc },
{ provide: DOCS_TOKENS, useValue: routes },
{ provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "18.1.1"
"version": "18.1.2"
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap-base",
"version": "18.1.1",
"version": "18.1.2",
"license": "MIT",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"schematics": "./schematics/src/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion src/accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/accordion",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/alert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/alert",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/buttons",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/carousel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/carousel",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/chronos/i18n/hr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const hrLocale: LocaleData = {
longDateFormat: {
LT: 'HH:mm',
LTS: 'HH:mm:ss',
L: 'DD/MM/YYYY',
L: 'DD.MM.YYYY.',
LL: 'D MMMM YYYY',
LLL: 'D MMMM YYYY HH:mm',
LLLL: 'dddd, D MMMM YYYY HH:mm'
Expand Down
2 changes: 1 addition & 1 deletion src/chronos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/chronos",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
4 changes: 2 additions & 2 deletions src/chronos/testing/locale/hr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ describe('locale: hr', () => {
['a A', 'pm PM'],
['[the] DDDo [day of the year]', 'the 45. day of the year'],
['LTS', '15:25:50'],
['L', '14/02/2010'],
['L', '14.02.2010.'],
['LL', '14 Veljača 2010'],
['LLL', '14 Veljača 2010 15:25'],
['LLLL', 'Nedjelja, 14 Veljača 2010 15:25'],
['l', '14/2/2010'],
['l', '14.2.2010.'],
['ll', '14 Velj 2010'],
['lll', '14 Velj 2010 15:25'],
['llll', 'Ned, 14 Velj 2010 15:25']
Expand Down
2 changes: 1 addition & 1 deletion src/collapse/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/collapse",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/component-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/component-loader",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
1 change: 0 additions & 1 deletion src/datepicker/bs-datepicker-input.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ const BS_DATEPICKER_VALIDATOR: Provider = {
@Directive({
selector: `input[bsDatepicker]`,
providers: [
BsLocaleService,
BS_DATEPICKER_VALUE_ACCESSOR,
BS_DATEPICKER_VALIDATOR
],
Expand Down
1 change: 0 additions & 1 deletion src/datepicker/bs-daterangepicker-input.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ const BS_DATERANGEPICKER_VALIDATOR: Provider = {
'(blur)': 'onBlur()'
},
providers: [
BsLocaleService,
BS_DATERANGEPICKER_VALUE_ACCESSOR,
BS_DATERANGEPICKER_VALIDATOR
],
Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/datepicker",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
1 change: 0 additions & 1 deletion src/dropdown/bs-dropdown-container.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import { NgClass } from '@angular/common';
[class.open]="isOpen"><ng-content></ng-content>
</div>
`,
providers: [BsDropdownState]
})
export class BsDropdownContainerComponent implements OnDestroy {
isOpen = false;
Expand Down
2 changes: 1 addition & 1 deletion src/dropdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/dropdown",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/focus-trap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/focus-trap",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/locale/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/locale",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/mini-ngrx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/mini-ngrx",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/modal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/modal",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/pagination/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/pagination",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/popover/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/popover",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/positioning/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/positioning",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/progressbar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/progressbar",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/rating/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/rating",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/root/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap",
"version": "18.1.1",
"version": "18.1.2",
"description": "Angular Bootstrap",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/schematics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "schematics",
"version": "18.1.1",
"version": "18.1.2",
"schematics": "./collection.json",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/schematics/src/utils/current_dependency_versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"NGX_BOOTSTRAP_VERSION": "18.1.1",
"NGX_BOOTSTRAP_VERSION": "18.1.2",
"BOOTSTRAP_VERSION": "^5.2.3"
}
2 changes: 1 addition & 1 deletion src/sortable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/sortable",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/tabs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/tabs",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/timepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/timepicker",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/tooltip/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/tooltip",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/typeahead/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/typeahead",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/typeahead/typeahead-container.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ export class TypeaheadContainerComponent implements OnDestroy {
`${itemStr.substring(0, startIdx)}<strong>${itemStr.substring(startIdx, startIdx + tokenLen)}</strong>` +
`${itemStr.substring(startIdx + tokenLen)}`;
itemStrHelper =
`${itemStrHelper.substring(0, startIdx)} ${' '.repeat(tokenLen)} ` +
`${itemStrHelper.substring(0, startIdx)}????????${'??'.repeat(tokenLen)}??????????` +
`${itemStrHelper.substring(startIdx + tokenLen)}`;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/utils",
"version": "18.1.1",
"version": "18.1.2",
"author": "Dmitriy Shekhovtsov <[email protected]>",
"license": "MIT"
}

0 comments on commit 8cde669

Please sign in to comment.