manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'master' into develop

Browse source 
Conflicts:
	dist/libs.js
	dist/libs.min.js
This commit is contained in:
Manuel Friedli 2016-06-27 01:45:28 +02:00
commit eec51682ac
16 changed files with 2594 additions and 1989 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
8.0.2-dev.0
8.0.2

2
bower.json
View file

@ -1,6 +1,6 @@
{
"name": "uhr",
"version": "8.0.2-dev.0",
"version": "8.0.2",
"dependencies": {
"jquery": "~2.1.3",
"jquery-ui": "~1.11.2",

4
dist/jquery.uhr.base.js vendored
View file

@ -1,6 +1,6 @@
/*! uhr - v8.0.2-dev.0 - 2015-07-15
/*! uhr - v8.0.2 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {
'use strict';
var uhrGlobals = {

6
dist/jquery.uhr.base.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
dist/jquery.uhr.baselangs.js vendored
View file

@ -1,6 +1,6 @@
/*! uhr - v8.0.2-dev.0 - 2015-07-15
/*! uhr - v8.0.2 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {
'use strict';
var es_ist = {1: [1, 2, 4, 5, 6]};

4
dist/jquery.uhr.baselangs.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
dist/jquery.uhr.complete.js vendored
View file

@ -1,6 +1,6 @@
/*! uhr - v8.0.2-dev.0 - 2015-07-15
/*! uhr - v8.0.2 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {
'use strict';
var uhrGlobals = {

6
dist/jquery.uhr.complete.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
dist/jquery.uhr.langs.js vendored
View file

@ -1,6 +1,6 @@
/*! uhr - v8.0.2-dev.0 - 2015-07-15
/*! uhr - v8.0.2 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {
'use strict';
var es_ist = {1: [1, 2, 4, 5, 6]};

4
dist/jquery.uhr.langs.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
dist/jquery.uhr.main.js vendored
View file

@ -1,6 +1,6 @@
/*! uhr - v8.0.2-dev.0 - 2015-07-15
/*! uhr - v8.0.2 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {
'use strict';
var uhrGlobals = {

6
dist/jquery.uhr.main.min.js vendored
View file

File diff suppressed because one or more lines are too long

4518
dist/libs.js vendored
View file

File diff suppressed because it is too large Load diff

11
dist/libs.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# Version 8.0.2-dev.0
# Version 8.0.2
/
dist/jquery.uhr.base.min.js

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "uhr",
"version": "8.0.2-dev.0",
"version": "8.0.2",
"description": "jQuery QLOCKTWO plugin",
"keywords": [
"jquery-plugin",