Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
trentrichardson committed Nov 14, 2015
2 parents 95d3ec3 + f66f23c commit 17c4f29
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dist/i18n/jquery-ui-timepicker-addon-i18n.js
@@ -1,4 +1,4 @@
/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14
/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
* http://trentrichardson.com/examples/timepicker
* Copyright (c) 2015 Trent Richardson; Licensed MIT */

Expand Down
2 changes: 1 addition & 1 deletion dist/i18n/jquery-ui-timepicker-addon-i18n.min.js

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

22 changes: 22 additions & 0 deletions dist/i18n/jquery-ui-timepicker-mk.js
@@ -0,0 +1,22 @@
/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
/* Written by Vlatko Ristovski */
(function($) {
$.timepicker.regional['mk'] = {
timeOnlyTitle: 'Одберете време',
timeText: 'Време',
hourText: 'Час',
minuteText: 'Минути',
secondText: 'Секунди',
millisecText: 'Милисекунди',
microsecText: 'Микросекунди',
timezoneText: 'Временска зона',
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
};
$.timepicker.setDefaults($.timepicker.regional['mk']);
})(jQuery);
2 changes: 1 addition & 1 deletion dist/index.html
Expand Up @@ -113,7 +113,7 @@ <h3>Requirements</h3>

<br />
<h3>Version</h3>
<p>Version 1.5.6</p>
<p>Version 1.6.1</p>

<p>Last updated on 2015-11-14</p>
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
Expand Down
6 changes: 3 additions & 3 deletions dist/jquery-ui-timepicker-addon.js
@@ -1,4 +1,4 @@
/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14
/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
* http://trentrichardson.com/examples/timepicker
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
(function (factory) {
Expand All @@ -22,7 +22,7 @@
*/
$.extend($.ui, {
timepicker: {
version: "1.5.6"
version: "1.6.1"
}
});

Expand Down Expand Up @@ -2258,6 +2258,6 @@
/*
* Keep up with the version
*/
$.timepicker.version = "1.5.6";
$.timepicker.version = "1.6.1";

}));
2 changes: 1 addition & 1 deletion dist/jquery-ui-timepicker-addon.min.css

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

6 changes: 3 additions & 3 deletions dist/jquery-ui-timepicker-addon.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jquery-ui-timepicker-addon.json
Expand Up @@ -2,7 +2,7 @@
"name": "jquery-ui-timepicker-addon",
"title": "jQuery Timepicker Addon",
"description": "A timepicker addon for jQueryUI datepicker.",
"version": "1.5.6",
"version": "1.6.1",
"modified": "2015-11-14",
"homepage": "http://trentrichardson.com/examples/timepicker",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "jquery-ui-timepicker-addon",
"version": "1.6.0",
"version": "1.6.1",
"engines": {
"node": ">= 0.8.0"
},
Expand Down

0 comments on commit 17c4f29

Please sign in to comment.