Skip to content

Commit abbd63d

Browse files
author
asiacomeau
committed
Merge branch 'master' of https://github.com/angular-ui/ui-select
2 parents c77301b + d8fed30 commit abbd63d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1907
-971
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
/.tmp
66
.DS_Store
77
npm-debug.log
8-
package-lock.json
8+
*~

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ env:
77
- GH_REF: github.com/angular-ui/ui-select.git
88
- GH_PAGES_BRANCH: gh-pages
99
- secure: "PkIhXXwrR5fHh7fH+2WizaY0MmK1l1Dr7PCqs112PkEimVPcntRJeA5pjTwGRwHm+RSkFVtfo38EY/GUwzhLSRTO7WZ+id+vIMGQLgiofqrOwi0nq93esG6qI8Jg5K0GUt8mzg5m9B2tgm2I91RAojEhIukKcbsDsq3hNAUy71Y="
10-
1110
addons:
11+
firefox: "31.0"
12+
1213
apt:
1314
sources:
1415
- ubuntu-toolchain-r-test
1516
packages:
1617
- g++-4.8
1718

19+
1820
before_script:
1921
- export DISPLAY=:99.0
2022
- sh -e /etc/init.d/xvfb start
@@ -23,7 +25,7 @@ before_script:
2325
script: "gulp test"
2426

2527
after_success:
26-
- "gulp changelog"
28+
- "gulp docs"
2729

2830
deploy:
2931

@@ -39,9 +41,6 @@ deploy:
3941
on:
4042
tags: true
4143

42-
after_success:
43-
- "deploy-docs"
44-
4544
sudo: false
4645

4746
git:

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
<a name="0.19.8"></a>
2+
## [0.19.8](https://github.com/angular-ui/ui-select/compare/v0.19.7...v0.19.8) (2017-04-15)
3+
4+
5+
6+
7+
<a name="0.19.6"></a>
8+
## [0.19.6](https://github.com/angular-ui/ui-select/compare/v0.19.6...v0.19.6) (2017-04-12)
9+
10+
11+
### Bug Fixes
12+
13+
* **lockedItems:** Properly unlock locked items when lock conditions change ([10ee076](https://github.com/angular-ui/ui-select/commit/10ee076)), closes [#1824](https://github.com/angular-ui/ui-select/issues/1824)
14+
* **select-spinner:** fix spec test ([2d62e0b](https://github.com/angular-ui/ui-select/commit/2d62e0b))
15+
* **spec:** Use exceptionHandler to test errors. (#1879) ([b549db9](https://github.com/angular-ui/ui-select/commit/b549db9)), closes [#1877](https://github.com/angular-ui/ui-select/issues/1877)
16+
* **spinner-class:** add glyphicon to default spinner class, update css. Fixes #1893. ([c8f69db](https://github.com/angular-ui/ui-select/commit/c8f69db)), closes [#1893](https://github.com/angular-ui/ui-select/issues/1893)
17+
* **uiSelectChoices:** prevent template element from being modified (#1850) ([7aabdc4](https://github.com/angular-ui/ui-select/commit/7aabdc4)), closes [#1851](https://github.com/angular-ui/ui-select/issues/1851)
18+
* **uiSelectCtrl:** Reset refreshing flag even if async request errors ([be60430](https://github.com/angular-ui/ui-select/commit/be60430)), closes [#1833](https://github.com/angular-ui/ui-select/issues/1833)
19+
* **uiSelectMatch:** set model value to `null` when cleared ([f711ec2](https://github.com/angular-ui/ui-select/commit/f711ec2)), closes [#863](https://github.com/angular-ui/ui-select/issues/863)
20+
* **uiSelectMultiple:** Don't call onSelectCallback if limit already reached ([b7ac99a](https://github.com/angular-ui/ui-select/commit/b7ac99a)), closes [#1836](https://github.com/angular-ui/ui-select/issues/1836)
21+
22+
### Features
23+
24+
* **Header & Footer:** Add header & footer to the dropdown list. ([f65bad1](https://github.com/angular-ui/ui-select/commit/f65bad1))
25+
* **uiSelectSingle:** add option to avoid backspace resetting the model ([7413321](https://github.com/angular-ui/ui-select/commit/7413321)), closes [#926](https://github.com/angular-ui/ui-select/issues/926) [#525](https://github.com/angular-ui/ui-select/issues/525)
26+
27+
28+
129
<a name="0.19.5"></a>
230
## [0.19.5](https://github.com/angular-ui/ui-select/compare/v0.19.5...v0.19.5) (2016-10-24)
331

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
4242
support for markdown and templating via @ngdoc tag). To see how we document our APIs, please check
4343
out the existing ngdocs and see [this wiki page][ngDocs].
4444

45+
**Working on your first Pull Request?** You can learn how from this *free* series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
46+
4547
## <a name="commit"></a> Git Commit Guidelines
4648

4749
We have very precise rules over how our git commit messages can be formatted for maintenance of the changelog and semvar versioning. This leads to **more

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# AngularJS ui-select [![Build Status](https://travis-ci.org/angular-ui/ui-select.svg?branch=master)](https://travis-ci.org/angular-ui/ui-select) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-select?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1+
# AngularJS ui-select [![Build Status](https://travis-ci.org/angular-ui/ui-select.svg?branch=master)](https://travis-ci.org/angular-ui/ui-select) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-select?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
2+
23

34
AngularJS-native version of [Select2](http://ivaynberg.github.io/select2/) and [Selectize](http://brianreavis.github.io/selectize.js/). [http://angular-ui.github.io/ui-select/](http://angular-ui.github.io/ui-select/)
45

dist/select.css

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* ui-select
33
* http://github.com/angular-ui/ui-select
4-
* Version: 0.19.6 - 2018-01-16T19:10:01.498Z
4+
* Version: 0.19.7 - 2017-04-15T14:28:36.790Z
55
* License: MIT
66
*/
77

@@ -325,19 +325,12 @@ body > .ui-select-bootstrap.open {
325325
}
326326

327327
/* Spinner */
328-
.ui-select-refreshing {
328+
.ui-select-refreshing.glyphicon {
329329
position: absolute;
330330
right: 0;
331331
padding: 8px 27px;
332-
top: 1px;
333-
display: inline-block;
334-
font-family: 'Glyphicons Halflings';
335-
font-style: normal;
336-
font-weight: normal;
337-
line-height: 1;
338-
-webkit-font-smoothing:antialiased;
339332
}
340-
333+
341334
@-webkit-keyframes ui-select-spin {
342335
0% {
343336
-webkit-transform: rotate(0deg);
@@ -366,4 +359,4 @@ body > .ui-select-bootstrap.open {
366359

367360
.ui-select-refreshing.ng-animate {
368361
-webkit-animation: none 0s;
369-
}
362+
}

0 commit comments

Comments
 (0)